diff --git a/config/ansible/tasks/servers/server.yml b/config/ansible/tasks/servers/server.yml
index 5c0c74a..6630e30 100644
--- a/config/ansible/tasks/servers/server.yml
+++ b/config/ansible/tasks/servers/server.yml
@@ -46,43 +46,14 @@
 
   vars:
     services:
-      - name: caddy
-        enabled: true
-        hosts:
-          - mennos-cloud-server
-          - mennos-cachyos-desktop
       - name: karakeep
         enabled: true
         hosts:
           - mennos-cloud-server
-      - name: golink
-        enabled: true
-        hosts:
-          - mennos-cachyos-desktop
-      - name: immich
-        enabled: true
-        hosts:
-          - mennos-cloud-server
       - name: gitea
         enabled: true
         hosts:
           - mennos-cloud-server
-      - name: plex
-        enabled: true
-        hosts:
-          - mennos-cachyos-desktop
-      - name: tautulli
-        enabled: true
-        hosts:
-          - mennos-cachyos-desktop
-      - name: stash
-        enabled: true
-        hosts:
-          - mennos-cachyos-desktop
-      - name: seafile
-        enabled: true
-        hosts:
-          - mennos-cloud-server
       - name: uptime-kuma
         enabled: true
         hosts:
@@ -99,6 +70,30 @@
         enabled: true
         hosts:
           - mennos-cloud-server
+      - name: caddy
+        enabled: true
+        hosts:
+          - mennos-cachyos-desktop
+      - name: golink
+        enabled: true
+        hosts:
+          - mennos-cachyos-desktop
+      - name: immich
+        enabled: true
+        hosts:
+          - mennos-cachyos-desktop
+      - name: plex
+        enabled: true
+        hosts:
+          - mennos-cachyos-desktop
+      - name: tautulli
+        enabled: true
+        hosts:
+          - mennos-cachyos-desktop
+      - name: stash
+        enabled: true
+        hosts:
+          - mennos-cachyos-desktop
       - name: downloaders
         enabled: true
         hosts:
@@ -106,7 +101,7 @@
       - name: wireguard
         enabled: true
         hosts:
-          - mennos-cloud-server
+          - mennos-cachyos-desktop
       - name: nextcloud
         enabled: true
         hosts:
@@ -114,12 +109,11 @@
       - name: echoip
         enabled: true
         hosts:
-          - mennos-cloud-server
           - mennos-cachyos-desktop
       - name: arr-stack
         enabled: false
         hosts:
-          - mennos-cloud-server
+          - mennos-cachyos-desktop
       - name: home-assistant
         enabled: true
         hosts:
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 48836a3..5c2db55 100644
--- a/config/ansible/tasks/servers/services/immich/docker-compose.yml.j2
+++ b/config/ansible/tasks/servers/services/immich/docker-compose.yml.j2
@@ -15,24 +15,45 @@ services:
       - TZ=Europe/Amsterdam
       - PUID=1000
       - PGID=100
+      - NVIDIA_VISIBLE_DEVICES=all
+      - NVIDIA_DRIVER_CAPABILITIES=all
     restart: unless-stopped
     healthcheck:
       disable: false
     networks:
       - immich
       - caddy_network
+    runtime: nvidia
+    deploy:
+      resources:
+        reservations:
+          devices:
+            - driver: nvidia
+              count: all
+              capabilities: [gpu]
 
   machine-learning:
-    image: ghcr.io/immich-app/immich-machine-learning:${IMMICH_VERSION:-release}
+    image: ghcr.io/immich-app/immich-machine-learning:${IMMICH_VERSION:-release}-cuda
     volumes:
       - model-cache:/cache
     env_file:
       - .env
+    environment:
+      - NVIDIA_VISIBLE_DEVICES=all
+      - NVIDIA_DRIVER_CAPABILITIES=all
     restart: unless-stopped
     healthcheck:
       disable: false
     networks:
       - immich
+    runtime: nvidia
+    deploy:
+      resources:
+        reservations:
+          devices:
+            - driver: nvidia
+              count: all
+              capabilities: [gpu]
 
   redis:
     container_name: immich_redis
@@ -54,7 +75,6 @@ services:
       POSTGRES_DB: ${DB_DATABASE_NAME}
       POSTGRES_INITDB_ARGS: '--data-checksums'
     volumes:
-      # Do not edit the next line. If you want to change the database storage location on your system, edit the value of DB_DATA_LOCATION in the .env file
       - {{ immich_database_dir }}:/var/lib/postgresql/data
     healthcheck:
       test: pg_isready --dbname='${DB_DATABASE_NAME}' --username='${DB_USERNAME}' || exit 1; Chksum="$$(psql --dbname='${DB_DATABASE_NAME}' --username='${DB_USERNAME}' --tuples-only --no-align --command='SELECT COALESCE(SUM(checksum_failures), 0) FROM pg_stat_database')"; echo "checksum failure count is $$Chksum"; [ "$$Chksum" = '0' ] || exit 1
diff --git a/config/ansible/tasks/servers/services/immich/immich.yml b/config/ansible/tasks/servers/services/immich/immich.yml
index 8739c93..50b63f0 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/object_storage/photos/immich-library"
-        immich_database_dir: "/mnt/object_storage/services/immich/postgres"
+        immich_data_dir: "/mnt/data/photos/immich-library"
+        immich_database_dir: "/mnt/services/immich/postgres"
         immich_service_dir: "{{ ansible_env.HOME }}/services/immich"
 
     - name: Create Immich directories