diff --git a/container-config/nginx/nginx.conf b/container-config/nginx/nginx.conf
index 5c23351..a686c20 100644
--- a/container-config/nginx/nginx.conf
+++ b/container-config/nginx/nginx.conf
@@ -27,7 +27,7 @@ http {
   proxy_read_timeout 600;
   proxy_send_timeout 600;
   resolver host.containers.internal;
-  include /etc/nginx-sites/*;
+  include /etc/nginx/sites/*;
   server {
     listen 80;
     listen [::]:80;
diff --git a/container-config/nginx-home/auth b/container-config/nginx/sites/auth
similarity index 100%
rename from container-config/nginx-home/auth
rename to container-config/nginx/sites/auth
diff --git a/container-config/nginx-home/base b/container-config/nginx/sites/base
similarity index 100%
rename from container-config/nginx-home/base
rename to container-config/nginx/sites/base
diff --git a/container-config/nginx-home/chat b/container-config/nginx/sites/chat
similarity index 100%
rename from container-config/nginx-home/chat
rename to container-config/nginx/sites/chat
diff --git a/container-config/nginx-home/cloud b/container-config/nginx/sites/cloud
similarity index 100%
rename from container-config/nginx-home/cloud
rename to container-config/nginx/sites/cloud
diff --git a/container-config/nginx-home/code b/container-config/nginx/sites/code
similarity index 100%
rename from container-config/nginx-home/code
rename to container-config/nginx/sites/code
diff --git a/container-config/nginx-home/git b/container-config/nginx/sites/git
similarity index 100%
rename from container-config/nginx-home/git
rename to container-config/nginx/sites/git
diff --git a/container-config/nginx-home/llm b/container-config/nginx/sites/llm
similarity index 100%
rename from container-config/nginx-home/llm
rename to container-config/nginx/sites/llm
diff --git a/container-config/nginx-home/matrix b/container-config/nginx/sites/matrix
similarity index 100%
rename from container-config/nginx-home/matrix
rename to container-config/nginx/sites/matrix
diff --git a/container-config/nginx-home/metrics b/container-config/nginx/sites/metrics
similarity index 100%
rename from container-config/nginx-home/metrics
rename to container-config/nginx/sites/metrics
diff --git a/container-config/nginx-home/monitoring b/container-config/nginx/sites/monitoring
similarity index 100%
rename from container-config/nginx-home/monitoring
rename to container-config/nginx/sites/monitoring
diff --git a/container-config/nginx-home/mta-sts b/container-config/nginx/sites/mta-sts
similarity index 100%
rename from container-config/nginx-home/mta-sts
rename to container-config/nginx/sites/mta-sts
diff --git a/container-config/nginx-home/network b/container-config/nginx/sites/network
similarity index 100%
rename from container-config/nginx-home/network
rename to container-config/nginx/sites/network
diff --git a/container-config/nginx-home/office b/container-config/nginx/sites/office
similarity index 100%
rename from container-config/nginx-home/office
rename to container-config/nginx/sites/office
diff --git a/container-config/nginx-home/photos b/container-config/nginx/sites/photos
similarity index 100%
rename from container-config/nginx-home/photos
rename to container-config/nginx/sites/photos
diff --git a/container-config/nginx-home/push b/container-config/nginx/sites/push
similarity index 100%
rename from container-config/nginx-home/push
rename to container-config/nginx/sites/push
diff --git a/container-config/nginx-home/remote-desktop b/container-config/nginx/sites/remote-desktop
similarity index 90%
rename from container-config/nginx-home/remote-desktop
rename to container-config/nginx/sites/remote-desktop
index 2dc3fba..9b22c8c 100644
--- a/container-config/nginx-home/remote-desktop
+++ b/container-config/nginx/sites/remote-desktop
@@ -6,7 +6,7 @@ server {
   include snippets/local-only.conf;
   add_header Content-Security-Policy "default-src 'self'; script-src 'self' 'unsafe-eval' 'unsafe-inline'; style-src 'self' 'unsafe-inline'" always;
   location / {
-    set $upstream gaming-vm.server.home.arpa;
+    set $upstream gpu-vm.server.home.arpa;
     proxy_pass https://$upstream:47990;
     proxy_ssl_verify off;
     include snippets/proxy.conf;
diff --git a/container-config/nginx-home/vault b/container-config/nginx/sites/vault
similarity index 100%
rename from container-config/nginx-home/vault
rename to container-config/nginx/sites/vault
diff --git a/container-config/nginx-home/www b/container-config/nginx/sites/www
similarity index 100%
rename from container-config/nginx-home/www
rename to container-config/nginx/sites/www
diff --git a/container-config/nginx-home/xmr b/container-config/nginx/sites/xmr
similarity index 100%
rename from container-config/nginx-home/xmr
rename to container-config/nginx/sites/xmr
diff --git a/infra/etc/containers/systemd/nginx.container b/infra/etc/containers/systemd/nginx.container
index c2b0b1d..0c7444f 100644
--- a/infra/etc/containers/systemd/nginx.container
+++ b/infra/etc/containers/systemd/nginx.container
@@ -2,7 +2,6 @@
 Image=cgr.dev/chainguard/nginx
 Network=nginx.network
 Volume=/var/lib/system-config/container-config/nginx:/etc/nginx:z,ro
-Volume=/var/lib/system-config/container-config/nginx-home:/etc/nginx-sites:z,ro
 Volume=/var/lib/system-config/container-config/site:/var/www:z,ro
 Volume=/etc/certificates/certificates:/etc/certificates:z,ro
 Tmpfs=/var/lib/nginx/tmp