diff --git a/system/services/0_TEMPLATE.nix b/system/services/0_TEMPLATE.nix
index fad6b6b2..395b1afb 100644
--- a/system/services/0_TEMPLATE.nix
+++ b/system/services/0_TEMPLATE.nix
@@ -32,8 +32,6 @@
       PUID = "1000";
       PGID = "1000";
       TZ = "Europe/Berlin";
-      # NVIDIA_VISIBLE_DEVICES = "all";
-      # NVIDIA_DRIVER_CAPABILITIES = "all";
     };
 
     environmentFiles = [
@@ -41,8 +39,9 @@
     ];
 
     extraOptions = [
+      # "--privileged"
+      # "--device=nvidia.com/gpu=all"
       "--net=behind-nginx"
-      # "--gpus=all"
     ];
   };
 }
diff --git a/system/services/formula11.nix b/system/services/formula11.nix
index 8eb14b7b..778b080f 100644
--- a/system/services/formula11.nix
+++ b/system/services/formula11.nix
@@ -23,7 +23,6 @@
     environment = {};
 
     extraOptions = [
-      # "--gpus=all"
       "--net=behind-nginx"
     ];
   };
@@ -58,7 +57,6 @@
     };
 
     extraOptions = [
-      # "--gpus=all"
       "--net=behind-nginx"
     ];
   };
diff --git a/system/services/immich.nix b/system/services/immich.nix
index 200b462a..1ba6239e 100644
--- a/system/services/immich.nix
+++ b/system/services/immich.nix
@@ -97,8 +97,8 @@
     };
 
     extraOptions = [
-      "--privileged"
-      "--gpus=all"
+      # "--privileged"
+      "--device=nvidia.com/gpu=all"
       "--net=behind-nginx"
     ];
   };
diff --git a/system/services/jellyfin.nix b/system/services/jellyfin.nix
index 9460ebec..af36cca7 100644
--- a/system/services/jellyfin.nix
+++ b/system/services/jellyfin.nix
@@ -37,14 +37,11 @@
       PUID = "3000";
       PGID = "3000";
       TZ = "Europe/Berlin";
-
-      NVIDIA_VISIBLE_DEVICES = "all";
-      NVIDIA_DRIVER_CAPABILITIES = "all";
     };
 
     extraOptions = [
-      "--privileged"
-      "--gpus=all"
+      # "--privileged"
+      "--device=nvidia.com/gpu=all"
       "--net=behind-nginx"
     ];
   };
diff --git a/system/services/paperless.nix b/system/services/paperless.nix
index 07be42b7..729a5947 100644
--- a/system/services/paperless.nix
+++ b/system/services/paperless.nix
@@ -98,7 +98,6 @@
     };
 
     extraOptions = [
-      # "--gpus=all"
       "--net=behind-nginx"
     ];
   };