diff --git a/config/ansible/tasks/servers/services/caddy/caddy.yml b/config/ansible/tasks/servers/services/caddy/caddy.yml
index 852efd6..cf8de0e 100644
--- a/config/ansible/tasks/servers/services/caddy/caddy.yml
+++ b/config/ansible/tasks/servers/services/caddy/caddy.yml
@@ -4,7 +4,7 @@
     - name: Set Caddy directories
       ansible.builtin.set_fact:
         caddy_service_dir: "{{ ansible_env.HOME }}/services/caddy"
-        caddy_data_dir: "/mnt/services/caddy"
+        caddy_data_dir: "/mnt/object_storage/services/caddy"
         caddy_email: "{{ lookup('community.general.onepassword', 'qwvcr4cuumhqh3mschv57xdqka', vault='j7nmhqlsjmp2r6umly5t75hzb4', field='email') }}"
 
     - name: Create Caddy directory
diff --git a/config/ansible/tasks/servers/services/caddy/docker-compose.yml.j2 b/config/ansible/tasks/servers/services/caddy/docker-compose.yml.j2
index ae9b343..60323ab 100644
--- a/config/ansible/tasks/servers/services/caddy/docker-compose.yml.j2
+++ b/config/ansible/tasks/servers/services/caddy/docker-compose.yml.j2
@@ -1,15 +1,14 @@
 services:
   caddy:
     image: caddy:2.9.1-alpine
-    container_name: caddy
     restart: unless-stopped
     ports:
       - "80:80"
       - "443:443"
     volumes:
-      - ./Caddyfile:/etc/caddy/Caddyfile:ro
-      - {{caddy_data_dir}}/data:/data
-      - {{caddy_data_dir}}/config:/config
+      - {{ caddy_data_dir }}/data:/data
+      - {{ caddy_data_dir }}/config:/config
+      - {{ caddy_service_dir }}/Caddyfile:/etc/caddy/Caddyfile
     environment:
       - TZ=Europe/Amsterdam
       - PUID=1000
@@ -20,4 +19,4 @@ services:
 networks:
   caddy_network:
     external: true
-    name: caddy_default
+    name: caddy_default
\ No newline at end of file
diff --git a/config/ansible/tasks/servers/services/gitea/gitea.yml b/config/ansible/tasks/servers/services/gitea/gitea.yml
index a9087e9..655bca1 100644
--- a/config/ansible/tasks/servers/services/gitea/gitea.yml
+++ b/config/ansible/tasks/servers/services/gitea/gitea.yml
@@ -3,7 +3,7 @@
   block:
     - name: Set Gitea directories
       ansible.builtin.set_fact:
-        gitea_data_dir: "/mnt/services/gitea"
+        gitea_data_dir: "/mnt/object_storage/services/gitea"
         gitea_service_dir: "{{ ansible_env.HOME }}/services/gitea"
 
     - name: Create Gitea directories
diff --git a/config/ansible/tasks/servers/services/golink/golink.yml b/config/ansible/tasks/servers/services/golink/golink.yml
index a06dca8..12a34ea 100644
--- a/config/ansible/tasks/servers/services/golink/golink.yml
+++ b/config/ansible/tasks/servers/services/golink/golink.yml
@@ -3,7 +3,7 @@
   block:
     - name: Set GoLink directories
       ansible.builtin.set_fact:
-        golink_data_dir: "/mnt/services/golink"
+        golink_data_dir: "/mnt/object_storage/services/golink"
         golink_service_dir: "{{ ansible_env.HOME }}/services/golink"
 
     - name: Create GoLink directories
diff --git a/config/ansible/tasks/servers/services/hoarder/hoarder.yml b/config/ansible/tasks/servers/services/hoarder/hoarder.yml
index 717df48..6381d27 100644
--- a/config/ansible/tasks/servers/services/hoarder/hoarder.yml
+++ b/config/ansible/tasks/servers/services/hoarder/hoarder.yml
@@ -3,7 +3,7 @@
   block:
     - name: Set Hoarder directories
       ansible.builtin.set_fact:
-        hoarder_data_dir: "/mnt/services/hoarder"
+        hoarder_data_dir: "/mnt/object_storage/services/hoarder"
         hoarder_service_dir: "{{ ansible_env.HOME }}/services/hoarder"
 
     - name: Create Hoarder directories
diff --git a/config/ansible/tasks/servers/services/immich/immich.yml b/config/ansible/tasks/servers/services/immich/immich.yml
index fa54b6b..fa03eda 100644
--- a/config/ansible/tasks/servers/services/immich/immich.yml
+++ b/config/ansible/tasks/servers/services/immich/immich.yml
@@ -3,8 +3,8 @@
   block:
     - name: Set Immich directories
       ansible.builtin.set_fact:
-        immich_data_dir: "/mnt/photos/immich-library"
-        immich_database_dir: "/mnt/services/immich/postgres"
+        immich_data_dir: "/mnt/object_storage/photos/immich-library"
+        immich_database_dir: "/mnt/object_storage/services/immich/postgres"
         immich_service_dir: "{{ ansible_env.HOME }}/services/immich"
 
     - name: Create Immich directories
diff --git a/config/ansible/tasks/servers/services/jellyfin/jellyfin.yml b/config/ansible/tasks/servers/services/jellyfin/jellyfin.yml
index 4b80df2..1b4d835 100644
--- a/config/ansible/tasks/servers/services/jellyfin/jellyfin.yml
+++ b/config/ansible/tasks/servers/services/jellyfin/jellyfin.yml
@@ -3,7 +3,7 @@
   block:
     - name: Set Jellyfin directories
       ansible.builtin.set_fact:
-        jellyfin_data_dir: "/mnt/services/jellyfin"
+        jellyfin_data_dir: "/mnt/object_storage/services/jellyfin"
         jellyfin_service_dir: "{{ ansible_env.HOME }}/services/jellyfin"
 
     - name: Create Jellyfin directories
diff --git a/config/ansible/tasks/servers/services/plex/plex.yml b/config/ansible/tasks/servers/services/plex/plex.yml
index da0a7ce..03b32db 100644
--- a/config/ansible/tasks/servers/services/plex/plex.yml
+++ b/config/ansible/tasks/servers/services/plex/plex.yml
@@ -3,7 +3,7 @@
   block:
     - name: Set Plex directories
       ansible.builtin.set_fact:
-        plex_data_dir: "/mnt/services/plex"
+        plex_data_dir: "/mnt/object_storage/services/plex"
         plex_service_dir: "{{ ansible_env.HOME }}/services/plex"
 
     - name: Create Plex directories