diff --git a/modules/config/instances/config/audiobookshelf.nix b/modules/config/instances/config/audiobookshelf.nix
index 2a522a0..0774a7f 100755
--- a/modules/config/instances/config/audiobookshelf.nix
+++ b/modules/config/instances/config/audiobookshelf.nix
@@ -9,7 +9,6 @@ let
     sopsPath
     ;
   audiobookshelfSubdomain = "books";
-  audiobookshelfDomain = "${audiobookshelfSubdomain}.${domain0}";
 in
 {
   label = audiobookshelfLabel;
@@ -17,9 +16,6 @@ in
   sops = {
     path0 = "${sopsPath}/${audiobookshelfName}";
   };
-  domains = {
-    url0 = audiobookshelfDomain;
-  };
   subdomain = audiobookshelfSubdomain;
   paths = {
     path0 = "${servicePath}/${audiobookshelfLabel}";
diff --git a/modules/config/instances/config/forgejo.nix b/modules/config/instances/config/forgejo.nix
index 0caa43b..79ff43e 100755
--- a/modules/config/instances/config/forgejo.nix
+++ b/modules/config/instances/config/forgejo.nix
@@ -10,7 +10,6 @@ let
   forgejoLabel = "Forgejo";
   forgejoName = "forgejo";
   forgejoSubdomain = "source";
-  forgejoDomain = "${forgejoSubdomain}.${domain3}";
 in
 {
   label = forgejoLabel;
@@ -21,9 +20,6 @@ in
   sops = {
     path0 = "${sopsPath}/${forgejoName}";
   };
-  domains = {
-    url0 = forgejoDomain;
-  };
   subdomain = forgejoSubdomain;
   paths = {
     path0 = "${servicePath}/${forgejoLabel}";
diff --git a/modules/config/instances/config/glance.nix b/modules/config/instances/config/glance.nix
index de212ac..b2dd644 100755
--- a/modules/config/instances/config/glance.nix
+++ b/modules/config/instances/config/glance.nix
@@ -10,7 +10,6 @@ let
   glanceLabel = "Glance";
   glanceName = "glance";
   glanceSubdomain = "dashboard";
-  glanceDomain = "${glanceSubdomain}.${domain0}";
 in
 {
   label = glanceLabel;
@@ -21,9 +20,6 @@ in
   sops = {
     path0 = "${sopsPath}/${glanceName}";
   };
-  domains = {
-    url0 = glanceDomain;
-  };
   subdomain = glanceSubdomain;
   paths = {
     path0 = "${servicePath}/${glanceLabel}";
diff --git a/modules/config/instances/config/jellyfin.nix b/modules/config/instances/config/jellyfin.nix
index 7b39dc6..d4d7767 100755
--- a/modules/config/instances/config/jellyfin.nix
+++ b/modules/config/instances/config/jellyfin.nix
@@ -8,7 +8,6 @@ let
     sslPath
     sopsPath
     ;
-  jellyfinDomain = "${jellyfinName}.${domain0}";
 in
 {
   label = jellyfinLabel;
@@ -16,9 +15,6 @@ in
   sops = {
     path0 = "${sopsPath}/${jellyfinName}";
   };
-  domains = {
-    url0 = jellyfinDomain;
-  };
   subdomain = jellyfinName;
   paths = {
     path0 = "${servicePath}/${jellyfinLabel}";
diff --git a/modules/config/instances/config/kanboard.nix b/modules/config/instances/config/kanboard.nix
old mode 100755
new mode 100644
index 1f5d5c0..625e53c
--- a/modules/config/instances/config/kanboard.nix
+++ b/modules/config/instances/config/kanboard.nix
@@ -10,7 +10,6 @@ let
   kanboardLabel = "Kanboard";
   kanboardName = "kanboard";
   kanboardSubdomain = "todo";
-  kanboardDomain = "${kanboardSubdomain}.${domain0}";
 in
 {
   label = kanboardLabel;
@@ -21,9 +20,6 @@ in
   sops = {
     path0 = "${sopsPath}/${kanboardName}";
   };
-  domains = {
-    url0 = kanboardDomain;
-  };
   subdomain = kanboardSubdomain;
   paths = {
     path0 = "${servicePath}/${kanboardLabel}";
diff --git a/modules/config/instances/config/mastodon.nix b/modules/config/instances/config/mastodon.nix
index 96e82e9..b5afc59 100755
--- a/modules/config/instances/config/mastodon.nix
+++ b/modules/config/instances/config/mastodon.nix
@@ -10,7 +10,6 @@ let
   mastodonLabel = "Mastodon";
   mastodonName = "mastodon";
   mastodonSubdomain = "social";
-  mastodonDomain = "${mastodonSubdomain}.${domain3}";
 in
 {
   label = mastodonLabel;
@@ -18,9 +17,6 @@ in
   email = {
     address0 = "noreply@${domain3}";
   };
-  domains = {
-    url0 = mastodonDomain;
-  };
   subdomain = mastodonSubdomain;
   sops = {
     path0 = "${sopsPath}/${mastodonName}";
diff --git a/modules/config/instances/config/nextcloud.nix b/modules/config/instances/config/nextcloud.nix
index 76c83a1..b111c85 100755
--- a/modules/config/instances/config/nextcloud.nix
+++ b/modules/config/instances/config/nextcloud.nix
@@ -9,7 +9,6 @@ let
 
   nextcloudLabel = "Nextcloud";
   nextcloudName = "nextcloud";
-  nextcloudDomain = "${nextcloudName}.${domain0}";
 in
 {
   label = nextcloudLabel;
@@ -20,9 +19,6 @@ in
   sops = {
     path0 = "${sopsPath}/${nextcloudName}";
   };
-  domains = {
-    url0 = nextcloudDomain;
-  };
   subdomain = nextcloudName;
   paths = {
     path0 = "${servicePath}/${nextcloudLabel}";
diff --git a/modules/config/instances/config/ollama.nix b/modules/config/instances/config/ollama.nix
index ad5e009..0edf75d 100755
--- a/modules/config/instances/config/ollama.nix
+++ b/modules/config/instances/config/ollama.nix
@@ -9,7 +9,6 @@ let
 
   ollamaLabel = "Ollama";
   ollamaName = "ollama";
-  ollamaDomain = "${ollamaName}.${domain0}";
 in
 {
   label = ollamaLabel;
@@ -17,9 +16,6 @@ in
   sops = {
     path0 = "${sopsPath}/${ollamaName}";
   };
-  domains = {
-    url0 = ollamaDomain;
-  };
   subdomain = ollamaName;
   paths = {
     path0 = "${servicePath}/${ollamaLabel}";
diff --git a/modules/config/instances/config/owncast.nix b/modules/config/instances/config/owncast.nix
index 79484dc..3c9310a 100755
--- a/modules/config/instances/config/owncast.nix
+++ b/modules/config/instances/config/owncast.nix
@@ -10,7 +10,6 @@ let
   owncastLabel = "Owncast";
   owncastName = "owncast";
   owncastSubdomain = "stream";
-  owncastDomain = "${owncastSubdomain}.${domain1}";
 in
 {
   label = owncastLabel;
@@ -18,9 +17,6 @@ in
   sops = {
     path0 = "${sopsPath}/${owncastName}";
   };
-  domains = {
-    url0 = owncastDomain;
-  };
   subdomain = owncastSubdomain;
   paths = {
     path0 = "${servicePath}/${owncastLabel}";
diff --git a/modules/config/instances/config/peertube.nix b/modules/config/instances/config/peertube.nix
index a6daf36..ff2489c 100755
--- a/modules/config/instances/config/peertube.nix
+++ b/modules/config/instances/config/peertube.nix
@@ -10,7 +10,6 @@ let
   peertubeLabel = "PeerTube";
   peertubeName = "peertube";
   peertubeSubdomain = "video";
-  peertubeDomain = "${peertubeSubdomain}.${domain3}";
 in
 {
   label = peertubeLabel;
@@ -21,9 +20,6 @@ in
   sops = {
     path0 = "${sopsPath}/${peertubeName}";
   };
-  domains = {
-    url0 = peertubeDomain;
-  };
   subdomain = peertubeSubdomain;
   paths = {
     path0 = "${servicePath}/${peertubeLabel}";
diff --git a/modules/config/instances/config/postfix.nix b/modules/config/instances/config/postfix.nix
index d00765f..399b7f4 100755
--- a/modules/config/instances/config/postfix.nix
+++ b/modules/config/instances/config/postfix.nix
@@ -9,7 +9,6 @@ let
 
   postfixLabel = "Postfix";
   postfixName = "postfix";
-  postfixDomain = "${postfixName}.${domain3}";
 in
 {
   label = postfixLabel;
@@ -17,9 +16,6 @@ in
   sops = {
     path0 = "${sopsPath}/${postfixName}";
   };
-  domains = {
-    url0 = postfixDomain;
-  };
   subdomain = postfixName;
   paths = {
     path0 = "${servicePath}/${postfixLabel}";
diff --git a/modules/config/instances/config/searx.nix b/modules/config/instances/config/searx.nix
index d46e892..3fa6244 100755
--- a/modules/config/instances/config/searx.nix
+++ b/modules/config/instances/config/searx.nix
@@ -10,7 +10,6 @@ let
   searxLabel = "SearXNG";
   searxName = "searx";
   searxSubdomain = "search";
-  searxDomain = "${searxSubdomain}.${domain0}";
 in
 {
   label = searxLabel;
@@ -21,9 +20,6 @@ in
   sops = {
     path0 = "${sopsPath}/${searxName}";
   };
-  domains = {
-    url0 = searxDomain;
-  };
   subdomain = searxSubdomain;
   paths = {
     path0 = "${servicePath}/${searxLabel}";
diff --git a/modules/config/instances/config/syncthing.nix b/modules/config/instances/config/syncthing.nix
index 5d24953..1ca9d66 100755
--- a/modules/config/instances/config/syncthing.nix
+++ b/modules/config/instances/config/syncthing.nix
@@ -8,7 +8,6 @@ let
 
   syncthingLabel = "Syncthing";
   syncthingName = "syncthing";
-  syncthingDomain = "${syncthingName}.${domain0}";
 in
 {
   label = syncthingLabel;
@@ -16,9 +15,6 @@ in
   sops = {
     path0 = "${sopsPath}/${syncthingName}";
   };
-  domains = {
-    url0 = syncthingDomain;
-  };
   subdomain = syncthingName;
   ports = {
     port0 = 8388; # Syncthing (WebUI)
diff --git a/modules/config/instances/config/vaultwarden.nix b/modules/config/instances/config/vaultwarden.nix
index e84a5b3..801f3d4 100755
--- a/modules/config/instances/config/vaultwarden.nix
+++ b/modules/config/instances/config/vaultwarden.nix
@@ -9,7 +9,6 @@ let
 
   vaultwardenLabel = "Vaultwarden";
   vaultwardenName = "vaultwarden";
-  vaultwardenDomain = "${vaultwardenName}.${domain0}";
 in
 {
   label = vaultwardenLabel;
@@ -20,9 +19,6 @@ in
   sops = {
     path0 = "${sopsPath}/${vaultwardenName}";
   };
-  domains = {
-    url0 = vaultwardenDomain;
-  };
   subdomain = vaultwardenName;
   paths = {
     path0 = "${servicePath}/${vaultwardenLabel}/BackupDir";
diff --git a/modules/nixos/default.nix b/modules/nixos/default.nix
index cf32ac3..ec84c5a 100755
--- a/modules/nixos/default.nix
+++ b/modules/nixos/default.nix
@@ -46,7 +46,6 @@ in
           xserver
           espanso
           wireGuard
-          glance
           ;
       };
     };
@@ -90,7 +89,7 @@ in
           vaultwarden
           forgejo
           xserver
-          # kanboard
+          kanboard
           ;
       };
     };
diff --git a/modules/nixos/services/audiobookshelf/default.nix b/modules/nixos/services/audiobookshelf/default.nix
index 3ca62e4..3ac183b 100755
--- a/modules/nixos/services/audiobookshelf/default.nix
+++ b/modules/nixos/services/audiobookshelf/default.nix
@@ -3,7 +3,7 @@ let
   inherit (flake.config.services.instances) audiobookshelf web;
   inherit (flake.config.machines.devices) ceres;
   service = audiobookshelf;
-  host = service.domains.url0;
+  host = "${service.subdomain}.${web.domains.url0}";
   localhost = web.localhost.address0;
 in
 {
diff --git a/modules/nixos/services/forgejo/default.nix b/modules/nixos/services/forgejo/default.nix
index 3673b71..ef3c041 100755
--- a/modules/nixos/services/forgejo/default.nix
+++ b/modules/nixos/services/forgejo/default.nix
@@ -10,7 +10,7 @@ let
   inherit (flake.config.services.instances) smtp forgejo web;
   service = forgejo;
   localhost = web.localhost.address0;
-  host = service.domains.url0;
+  host = "${service.subdomain}.${web.domains.url3}";
 in
 {
   services = {
diff --git a/modules/nixos/services/jellyfin/default.nix b/modules/nixos/services/jellyfin/default.nix
index c4ade14..7153901 100755
--- a/modules/nixos/services/jellyfin/default.nix
+++ b/modules/nixos/services/jellyfin/default.nix
@@ -5,7 +5,7 @@ let
   inherit (flake.config.services.instances) jellyfin web;
   service = jellyfin;
   localhost = web.localhost.address0;
-  host = service.domains.url0;
+  host = "${service.subdomain}.${web.domains.url0}";
 in
 {
   services = {
diff --git a/modules/nixos/services/kanboard/default.nix b/modules/nixos/services/kanboard/default.nix
old mode 100755
new mode 100644
index 85de06d..2e4e512
--- a/modules/nixos/services/kanboard/default.nix
+++ b/modules/nixos/services/kanboard/default.nix
@@ -10,25 +10,24 @@ let
   inherit (flake.config.services.instances) smtp kanboard web;
   service = kanboard;
   localhost = web.localhost.address0;
-  host = service.domains.url0;
+  host = "${service.subdomain}.${web.domains.url0}";
 in
 {
   services = {
     kanboard = {
       enable = true;
       domain = host;
-      nginx = null;
       # dataDir = "/var/lib/${service.name}";
       # settings = {
       #   MAIL_FROM = service.email.address0;
       #   # HTTP_PROXY_HOSTNAME = host;
-      #   HTTP_PROXY_PORT = service.ports.port0;
+      #   HTTP_PROXY_PORT = service.ports.poract0;
       #   MAIL_TRANSPORT = "smtp";
       #   MAIL_SMTP_HOSTNAME = smtp.hostname;
       #   MAIL_SMTP_PORT = smtp.ports.port0;
       #   MAIL_SMTP_USERNAME = service.email.address0;
       #   MAIL_SMTP_PASSWORD = config.sops.secrets."${service.name}-smtp".path;
-      #   MAIL_SMTP_ENCRYPTION = "ssl";
+      #   MAIL_SMTP_ENCRYPTION = "null";
       # };
     };
     caddy = {
@@ -64,19 +63,19 @@ in
       );
     };
 
-  # fileSystems."/var/lib/${service.name}" = {
-  #   device = service.paths.path0;
-  #   fsType = "none";
-  #   options = [
-  #     "bind"
-  #   ];
-  #   depends = [
-  #     ceres.storage0.mount
-  #   ];
-  # };
+  fileSystems."/var/lib/${service.name}" = {
+    device = service.paths.path0;
+    fsType = "none";
+    options = [
+      "bind"
+    ];
+    depends = [
+      ceres.storage0.mount
+    ];
+  };
 
   systemd.tmpfiles.rules = [
-    # "Z ${service.paths.path0} 755 ${service.name} ${service.name} -"
+    "Z ${service.paths.path0} 755 ${service.name} ${service.name} -"
     "Z ${service.sops.path0} 755 ${service.name} ${service.name} -"
   ];
 
diff --git a/modules/nixos/services/mastodon/default.nix b/modules/nixos/services/mastodon/default.nix
index eed56bb..62da572 100755
--- a/modules/nixos/services/mastodon/default.nix
+++ b/modules/nixos/services/mastodon/default.nix
@@ -11,7 +11,7 @@ let
     ;
   inherit (flake.config.services.instances) smtp mastodon web;
   service = mastodon;
-  host = service.domains.url0;
+  host = "${mastodon.subdomain}.${web.domains.url3}";
   localhost = web.localhost.address0;
 in
 {
diff --git a/modules/nixos/services/nextcloud/default.nix b/modules/nixos/services/nextcloud/default.nix
index e51bbff..7439560 100755
--- a/modules/nixos/services/nextcloud/default.nix
+++ b/modules/nixos/services/nextcloud/default.nix
@@ -16,7 +16,7 @@ let
     ;
   service = nextcloud;
   localhost = web.localhost.address0;
-  host = service.domains.url0;
+  host = "${service.subdomain}.${web.domains.url0}";
 in
 {
   services = {
diff --git a/modules/nixos/services/ollama/default.nix b/modules/nixos/services/ollama/default.nix
index d82ccd0..b9b4f91 100755
--- a/modules/nixos/services/ollama/default.nix
+++ b/modules/nixos/services/ollama/default.nix
@@ -17,7 +17,7 @@ let
   localhost1 = web.localhost.address0;
   localhost2 = web.localhost.address1;
   hostname = config.networking.hostName;
-  host = service.domains.url0;
+  host = "${service.subdomain}.${web.domains.url0}";
 
   localhostLogic = if hostname == mars.name then localhost2 else localhost1;
   caddyLogic =
diff --git a/modules/nixos/services/owncast/default.nix b/modules/nixos/services/owncast/default.nix
index 84654e0..b35ed40 100755
--- a/modules/nixos/services/owncast/default.nix
+++ b/modules/nixos/services/owncast/default.nix
@@ -6,7 +6,7 @@ let
     ;
   service = owncast;
   localhost = web.localhost.address1;
-  host = service.domains.url0;
+  host = "${service.subdomain}.${web.domains.url1}";
 in
 {
   services = {
diff --git a/modules/nixos/services/peertube/default.nix b/modules/nixos/services/peertube/default.nix
index 8510cba..091cd90 100755
--- a/modules/nixos/services/peertube/default.nix
+++ b/modules/nixos/services/peertube/default.nix
@@ -16,7 +16,7 @@ let
     ;
   service = peertube;
   localhost = web.localhost.address0;
-  host = service.domains.url0;
+  host = "${service.subdomain}.${web.domains.url3}";
 in
 {
   services = {
diff --git a/modules/nixos/services/searx/default.nix b/modules/nixos/services/searx/default.nix
index c3d286a..48a577a 100755
--- a/modules/nixos/services/searx/default.nix
+++ b/modules/nixos/services/searx/default.nix
@@ -10,7 +10,7 @@ let
   service = searx;
   hostname = config.networking.hostName;
   localhost = web.localhost.address0;
-  host = service.domains.url0;
+  host = "${service.subdomain}.${web.domains.url0}";
 in
 {
   services =
diff --git a/modules/nixos/services/vaultwarden/default.nix b/modules/nixos/services/vaultwarden/default.nix
index 751c066..7dd8d4d 100755
--- a/modules/nixos/services/vaultwarden/default.nix
+++ b/modules/nixos/services/vaultwarden/default.nix
@@ -7,7 +7,7 @@ let
   inherit (flake.config.services.instances) smtp vaultwarden web;
   service = vaultwarden;
   localhost = web.localhost.address0;
-  host = service.domains.url0;
+  host = "${service.subdomain}.${web.domains.url0}";
 in
 {
   services = {