diff --git a/modules/system/homelab/ai.nix b/modules/system/homelab/ai.nix
index 135d86e..dc6b291 100644
--- a/modules/system/homelab/ai.nix
+++ b/modules/system/homelab/ai.nix
@@ -1,10 +1,9 @@
-{ homelab, ... }: {
+{ ... }: {
   services = {
     ollama = {
       enable = true;
       host = "127.0.0.1";
       port = 11434;
-      home = "${homelab.disks.data}/ollama";
       # loadModels = [ "gemma3n:e4b" "gemma3n:e2b"  ];
     };
     open-webui = {
diff --git a/modules/system/homelab/auth.nix b/modules/system/homelab/auth.nix
index ca451a6..dd4fad9 100644
--- a/modules/system/homelab/auth.nix
+++ b/modules/system/homelab/auth.nix
@@ -1,8 +1,7 @@
 { homelab, ... }: {
   services.pocket-id = {
     enable = true;
-    credentials.ENCRYPTION_KEY = "${homelab.disks.data}/pocketid/encryption-key";
-    dataDir = "${homelab.disks.data}/pocketid/data";
+    credentials.ENCRYPTION_KEY = "/var/lib/pocket-id/encryption-key";
     settings = {
       PORT = "1411";
       HOST = "127.0.0.1";
diff --git a/modules/system/homelab/containers.nix b/modules/system/homelab/containers.nix
index d8222d5..0f22798 100644
--- a/modules/system/homelab/containers.nix
+++ b/modules/system/homelab/containers.nix
@@ -1,5 +1,5 @@
-{ lib, homelab, ... }: let
-  stacks-dir = "${homelab.disks.data}/dockge/stacks";
+{ lib, ... }: let
+  stacks-dir = "/opt/stacks";
 in {
   virtualisation.oci-containers.containers."dockge" = {
     image = "louislam/dockge:latest";
diff --git a/modules/system/homelab/gallery.nix b/modules/system/homelab/gallery.nix
index 6ae8b3e..968e397 100644
--- a/modules/system/homelab/gallery.nix
+++ b/modules/system/homelab/gallery.nix
@@ -1,4 +1,4 @@
-{ homelab, ... }: {
+{ ... }: {
   users.users.immich.extraGroups = [ "video" "render" ];
 
   services = {
@@ -6,7 +6,7 @@
       enable = true;
       port = 2283;
       host = "127.0.0.1";
-      mediaLocation = "${homelab.disks.data}/immich";
+      mediaLocation = "/var/lib/immich";
       accelerationDevices = null;
       machine-learning.enable = true;
     };
diff --git a/modules/system/homelab/git.nix b/modules/system/homelab/git.nix
index 460bbbe..7ae8396 100644
--- a/modules/system/homelab/git.nix
+++ b/modules/system/homelab/git.nix
@@ -1,8 +1,6 @@
 { homelab, ... }: {
   services.forgejo = {
     enable = true;
-    lfs.enable = true;
-    stateDir = "${homelab.disks.data}/forgejo";
     settings = {
       server = {
         DISABLE_SSH = true;
diff --git a/modules/system/homelab/remote.nix b/modules/system/homelab/remote.nix
index 2eae11e..dff61a1 100644
--- a/modules/system/homelab/remote.nix
+++ b/modules/system/homelab/remote.nix
@@ -7,12 +7,13 @@
     };
     guacamole-client = {
       enable = true;
+      host = "127.0.0.1";
+      port = 8085;
       enableWebserver = true;
       settings = {
         guacd-hostname = "127.0.0.1";
         guacd-port = 4822;
       };
     };
-    tomcat.port = 8085;
   };
 }
\ No newline at end of file
diff --git a/modules/system/server.nix b/modules/system/server.nix
index 3670d62..51aa927 100644
--- a/modules/system/server.nix
+++ b/modules/system/server.nix
@@ -1,5 +1,5 @@
-{ lib, ... }: {
-  imports = [
+{ config, lib, ... }: {
+  imports = lib.mkIf (config.specialisation != {}) [
     ./homelab/containers.nix
     ./homelab/gallery.nix
     ./homelab/remote.nix