diff --git a/config/ansible/tasks/servers/services/caddy/Caddyfile.j2 b/config/ansible/tasks/servers/services/caddy/Caddyfile.j2
index 65457f9..03c9790 100644
--- a/config/ansible/tasks/servers/services/caddy/Caddyfile.j2
+++ b/config/ansible/tasks/servers/services/caddy/Caddyfile.j2
@@ -1,4 +1,9 @@
-hoarder.mvl.sh {
-    reverse_proxy hoarder:{{ hoarder_port }}
+photos.vleeuwen.me photos.mvl.sh {
+    reverse_proxy immich:2283
+    tls {{ caddy_email }}
+}
+
+hoarder.mvl.sh {
+    reverse_proxy hoarder:3000
     tls {{ caddy_email }}
 }
diff --git a/config/ansible/tasks/servers/services/caddy/caddy.yml b/config/ansible/tasks/servers/services/caddy/caddy.yml
index 7772763..6be26b5 100644
--- a/config/ansible/tasks/servers/services/caddy/caddy.yml
+++ b/config/ansible/tasks/servers/services/caddy/caddy.yml
@@ -5,7 +5,6 @@
         caddy_service_dir: "{{ ansible_env.HOME }}/services/caddy"
         caddy_data_dir: "/mnt/services/caddy"
         caddy_email: "{{ lookup('community.general.onepassword', 'qwvcr4cuumhqh3mschv57xdqka', vault='j7nmhqlsjmp2r6umly5t75hzb4', field='email') }}"
-        hoarder_port: 3000
 
     - name: Create Caddy directory
       ansible.builtin.file:
@@ -35,6 +34,10 @@
         mode: "0644"
       register: caddy_file
 
+    - name: Stop Caddy service
+      ansible.builtin.command: docker compose -f "{{ caddy_service_dir }}/docker-compose.yml" down --remove-orphans
+      when: caddy_compose.changed or caddy_file.changed
+
     - name: Start Caddy service
       ansible.builtin.command: docker compose -f "{{ caddy_service_dir }}/docker-compose.yml" up -d
       when: caddy_compose.changed or caddy_file.changed
diff --git a/config/ansible/tasks/servers/services/golink/golink.yml b/config/ansible/tasks/servers/services/golink/golink.yml
index 05ff0c8..64c9d6d 100644
--- a/config/ansible/tasks/servers/services/golink/golink.yml
+++ b/config/ansible/tasks/servers/services/golink/golink.yml
@@ -21,6 +21,10 @@
         mode: "0644"
       register: golink_compose
 
+    - name: Stop GoLink service
+      ansible.builtin.command: docker compose -f "{{ golink_service_dir }}/docker-compose.yml" down --remove-orphans
+      when: golink_compose.changed
+
     - name: Start GoLink service
       ansible.builtin.command: docker compose -f "{{ golink_service_dir }}/docker-compose.yml" up -d
       when: golink_compose.changed
diff --git a/config/ansible/tasks/servers/services/hoarder/dotenv.j2 b/config/ansible/tasks/servers/services/hoarder/dotenv.j2
index 8e4075e..acfaf00 100644
--- a/config/ansible/tasks/servers/services/hoarder/dotenv.j2
+++ b/config/ansible/tasks/servers/services/hoarder/dotenv.j2
@@ -3,7 +3,6 @@ MEILI_NO_ANALYTICS=true
 
 MEILI_ADDR=http://meilisearch:7700
 BROWSER_WEB_URL=http://chrome:9222
-NEXTAUTH_URL=http://localhost:3000
 
 DATA_DIR=/data
 
diff --git a/config/ansible/tasks/servers/services/hoarder/hoarder.yml b/config/ansible/tasks/servers/services/hoarder/hoarder.yml
index cb06689..ffeb44d 100644
--- a/config/ansible/tasks/servers/services/hoarder/hoarder.yml
+++ b/config/ansible/tasks/servers/services/hoarder/hoarder.yml
@@ -28,6 +28,10 @@
         mode: "0644"
       register: hoarder_compose
 
+    - name: Stop Hoarder service
+      ansible.builtin.command: docker compose -f "{{ hoarder_service_dir }}/docker-compose.yml" down --remove-orphans
+      when: hoarder_compose.changed
+
     - name: Start Hoarder service
       ansible.builtin.command: docker compose -f "{{ hoarder_service_dir }}/docker-compose.yml" up -d
       when: hoarder_compose.changed
diff --git a/config/ansible/tasks/servers/services/immich/docker-compose.yml.j2 b/config/ansible/tasks/servers/services/immich/docker-compose.yml.j2
index 4ef50d4..79f1c6e 100644
--- a/config/ansible/tasks/servers/services/immich/docker-compose.yml.j2
+++ b/config/ansible/tasks/servers/services/immich/docker-compose.yml.j2
@@ -1,6 +1,5 @@
-name: immich
 services:
-  server:
+  immich:
     image: ghcr.io/immich-app/immich-server:${IMMICH_VERSION:-release}
     volumes:
       - {{ immich_data_dir }}:/usr/src/app/upload
diff --git a/config/ansible/tasks/servers/services/immich/immich.yml b/config/ansible/tasks/servers/services/immich/immich.yml
index 85df013..9309f41 100644
--- a/config/ansible/tasks/servers/services/immich/immich.yml
+++ b/config/ansible/tasks/servers/services/immich/immich.yml
@@ -29,6 +29,10 @@
         mode: "0644"
       register: immich_compose
 
+    - name: Stop Immich service
+      ansible.builtin.command: docker compose -f "{{ immich_service_dir }}/docker-compose.yml" down --remove-orphans
+      when: immich_compose.changed
+
     - name: Start Immich service
       ansible.builtin.command: docker compose -f "{{ immich_service_dir }}/docker-compose.yml" up -d
       when: immich_compose.changed
diff --git a/config/ansible/tasks/servers/services/services.yml b/config/ansible/tasks/servers/services/services.yml
index 2cde176..d3a289d 100644
--- a/config/ansible/tasks/servers/services/services.yml
+++ b/config/ansible/tasks/servers/services/services.yml
@@ -1,5 +1,14 @@
+---
 - name: Deploy docker services
-  block:
+  hosts: all
+  become: true
+  vars:
+    caddy_enabled: "{{ caddy_enabled | default(false) }}"
+    golink_enabled: "{{ golink_enabled | default(false) }}"
+    hoarder_enabled: "{{ hoarder_enabled | default(false) }}"
+    immich_enabled: "{{ immich_enabled | default(false) }}"
+
+  tasks:
     - name: Include caddy tasks
       ansible.builtin.include_tasks: caddy/caddy.yml
       when: caddy_enabled|bool