diff --git a/hosts/andromeda/configuration.nix b/hosts/andromeda/configuration.nix
index 3594794..3c62125 100755
--- a/hosts/andromeda/configuration.nix
+++ b/hosts/andromeda/configuration.nix
@@ -17,19 +17,19 @@
 
     # Docker stacks
     ## Bootstrap
-    ./stacks/traefik/docker-compose.nix
-    ./stacks/caddy/docker-compose.nix
+    ./stacks/core/traefik/docker-compose.nix
+    ./stacks/core/caddy/docker-compose.nix
+    ./stacks/core/tailscale/docker-compose.nix
     ## Internal
-    ./stacks/tailscale/docker-compose.nix
-    ./stacks/portainer/docker-compose.nix
-    ./stacks/passbolt/docker-compose.nix
-    ./stacks/pterodactyl/docker-compose.nix
-    ./stacks/immich/docker-compose.nix
+    ./stacks/private/portainer.hofers.cloud/docker-compose.nix
+    ./stacks/private/passbolt.hofers.cloud/docker-compose.nix
+    ./stacks/private/pterodactyl.hofers.cloud/docker-compose.nix
+    ./stacks/private/immich.hofers.cloud/docker-compose.nix
     ## Public
-    ./stacks/terah.dev/docker-compose.nix
-    ./stacks/mcaptcha/docker-compose.nix
-    ./stacks/forgejo/docker-compose.nix
-    ./stacks/synapse/docker-compose.nix
+    ./stacks/public/terah.dev/docker-compose.nix
+    ./stacks/public/mcaptcha.terah.dev/docker-compose.nix
+    ./stacks/public/git.terah.dev/docker-compose.nix
+    ./stacks/public/matrix.terah.dev/docker-compose.nix
   ];
 
   users.mutableUsers = false;
diff --git a/hosts/andromeda/stacks/caddy/docker-compose.nix b/hosts/andromeda/stacks/core/caddy/docker-compose.nix
similarity index 100%
rename from hosts/andromeda/stacks/caddy/docker-compose.nix
rename to hosts/andromeda/stacks/core/caddy/docker-compose.nix
diff --git a/hosts/andromeda/stacks/caddy/volume/Caddyfile b/hosts/andromeda/stacks/core/caddy/volume/Caddyfile
similarity index 100%
rename from hosts/andromeda/stacks/caddy/volume/Caddyfile
rename to hosts/andromeda/stacks/core/caddy/volume/Caddyfile
diff --git a/hosts/andromeda/stacks/caddy/volume/Dockerfile b/hosts/andromeda/stacks/core/caddy/volume/Dockerfile
similarity index 100%
rename from hosts/andromeda/stacks/caddy/volume/Dockerfile
rename to hosts/andromeda/stacks/core/caddy/volume/Dockerfile
diff --git a/hosts/andromeda/stacks/tailscale/docker-compose.nix b/hosts/andromeda/stacks/core/tailscale/docker-compose.nix
similarity index 100%
rename from hosts/andromeda/stacks/tailscale/docker-compose.nix
rename to hosts/andromeda/stacks/core/tailscale/docker-compose.nix
diff --git a/hosts/andromeda/stacks/traefik/docker-compose.nix b/hosts/andromeda/stacks/core/traefik/docker-compose.nix
similarity index 93%
rename from hosts/andromeda/stacks/traefik/docker-compose.nix
rename to hosts/andromeda/stacks/core/traefik/docker-compose.nix
index 7df4c04..3cf5580 100644
--- a/hosts/andromeda/stacks/traefik/docker-compose.nix
+++ b/hosts/andromeda/stacks/core/traefik/docker-compose.nix
@@ -8,7 +8,7 @@
     volumes = [
       "/var/run/docker.sock:/var/run/docker.sock:rw"
     ];
-    cmd = [ "--api.insecure=true" "--entryPoints.web.address=:8000" "--providers.docker" ];
+    cmd = [ "--api.insecure=true" "--entryPoints.web.address=:8000" "--entryPoints.web.forwardedHeaders.trustedIPs=10.10.0.3" "--providers.docker" ];
     log-driver = "journald";
     extraOptions = [
       "--network=host"
diff --git a/hosts/andromeda/stacks/immich/docker-compose.nix b/hosts/andromeda/stacks/private/immich.hofers.cloud/docker-compose.nix
similarity index 100%
rename from hosts/andromeda/stacks/immich/docker-compose.nix
rename to hosts/andromeda/stacks/private/immich.hofers.cloud/docker-compose.nix
diff --git a/hosts/andromeda/stacks/passbolt/docker-compose.nix b/hosts/andromeda/stacks/private/passbolt.hofers.cloud/docker-compose.nix
similarity index 100%
rename from hosts/andromeda/stacks/passbolt/docker-compose.nix
rename to hosts/andromeda/stacks/private/passbolt.hofers.cloud/docker-compose.nix
diff --git a/hosts/andromeda/stacks/portainer/docker-compose.nix b/hosts/andromeda/stacks/private/portainer.hofers.cloud/docker-compose.nix
similarity index 100%
rename from hosts/andromeda/stacks/portainer/docker-compose.nix
rename to hosts/andromeda/stacks/private/portainer.hofers.cloud/docker-compose.nix
diff --git a/hosts/andromeda/stacks/pterodactyl/docker-compose.nix b/hosts/andromeda/stacks/private/pterodactyl.hofers.cloud/docker-compose.nix
similarity index 100%
rename from hosts/andromeda/stacks/pterodactyl/docker-compose.nix
rename to hosts/andromeda/stacks/private/pterodactyl.hofers.cloud/docker-compose.nix
diff --git a/hosts/andromeda/stacks/forgejo/docker-compose.nix b/hosts/andromeda/stacks/public/git.terah.dev/docker-compose.nix
similarity index 100%
rename from hosts/andromeda/stacks/forgejo/docker-compose.nix
rename to hosts/andromeda/stacks/public/git.terah.dev/docker-compose.nix
diff --git a/hosts/andromeda/stacks/synapse/docker-compose.nix b/hosts/andromeda/stacks/public/matrix.terah.dev/docker-compose.nix
similarity index 100%
rename from hosts/andromeda/stacks/synapse/docker-compose.nix
rename to hosts/andromeda/stacks/public/matrix.terah.dev/docker-compose.nix
diff --git a/hosts/andromeda/stacks/mcaptcha/docker-compose.nix b/hosts/andromeda/stacks/public/mcaptcha.terah.dev/docker-compose.nix
similarity index 100%
rename from hosts/andromeda/stacks/mcaptcha/docker-compose.nix
rename to hosts/andromeda/stacks/public/mcaptcha.terah.dev/docker-compose.nix
diff --git a/hosts/andromeda/stacks/terah.dev/docker-compose.nix b/hosts/andromeda/stacks/public/terah.dev/docker-compose.nix
similarity index 100%
rename from hosts/andromeda/stacks/terah.dev/docker-compose.nix
rename to hosts/andromeda/stacks/public/terah.dev/docker-compose.nix