diff --git a/services/caddy/Caddyfile b/services/caddy/Caddyfile
index 824fa40..5963593 100644
--- a/services/caddy/Caddyfile
+++ b/services/caddy/Caddyfile
@@ -13,7 +13,7 @@
 }
 
 auth.{$public_domain} {
-        reverse_proxy ${main_server_ip} {
+	reverse_proxy {$main_server_ip} {
                 transport http {
                         tls_insecure_skip_verify
                 }
@@ -23,17 +23,17 @@ auth.{$public_domain} {
 }
 
 audiobookshelf.{$public_domain} {
-        reverse_proxy ${main_server_ip} {
+	reverse_proxy {$main_server_ip} {
                 transport http {
                         tls_insecure_skip_verify
-                        }
+                }
         }
         tls {$email}
         import forward_headers
 }
 
 gitea.{$public_domain} {
-        reverse_proxy ${main_server_ip} {
+        reverse_proxy {$main_server_ip} {
                 transport http {
                         tls_insecure_skip_verify
                 }
@@ -43,18 +43,13 @@ gitea.{$public_domain} {
 }
 
 headscale.{$public_domain} {
-        reverse_proxy ${main_server_ip} {
-                transport http {
-                        tls_insecure_skip_verify
-                }
-        }
+        reverse_proxy headscale:8080
         tls {$email}
         import forward_headers
 }
 
-
 immich.{$public_domain} {
-        reverse_proxy ${main_server_ip} {
+	reverse_proxy {$main_server_ip} {
                 transport http {
                         tls_insecure_skip_verify
                 }
@@ -64,7 +59,7 @@ immich.{$public_domain} {
 }
 
 ldap.{$public_domain} {
-        reverse_proxy ${main_server_ip} {
+	reverse_proxy {$main_server_ip} {
                 transport http {
                         tls_insecure_skip_verify
                 }
@@ -74,7 +69,7 @@ ldap.{$public_domain} {
 }
 
 linkwarden.{$public_domain} {
-        reverse_proxy ${main_server_ip} {
+	reverse_proxy {$main_server_ip} {
                 transport http {
                         tls_insecure_skip_verify
                 }
@@ -84,7 +79,7 @@ linkwarden.{$public_domain} {
 }
 
 mealie.{$public_domain} {
-        reverse_proxy ${main_server_ip} {
+	reverse_proxy {$main_server_ip} {
                 transport http {
                         tls_insecure_skip_verify
                 }
@@ -94,7 +89,7 @@ mealie.{$public_domain} {
 }
 
 paperless.{$public_domain} {
-        reverse_proxy ${main_server_ip} {
+	reverse_proxy {$main_server_ip} {
                 transport http {
                         tls_insecure_skip_verify
                 }
@@ -104,7 +99,7 @@ paperless.{$public_domain} {
 }
 
 radicale.{$public_domain} {
-        reverse_proxy ${main_server_ip} {
+	reverse_proxy {$main_server_ip} {
                 transport http {
                         tls_insecure_skip_verify
                 }
@@ -114,7 +109,7 @@ radicale.{$public_domain} {
 }
 
 shlink.{$public_domain} {
-        reverse_proxy ${main_server_ip} {
+	reverse_proxy {$main_server_ip} {
                 transport http {
                         tls_insecure_skip_verify
                 }
@@ -124,7 +119,7 @@ shlink.{$public_domain} {
 }
 
 stirling-pdf.{$public_domain} {
-        reverse_proxy ${main_server_ip} {
+	reverse_proxy {$main_server_ip} {
                 transport http {
                         tls_insecure_skip_verify
                 }
@@ -134,7 +129,7 @@ stirling-pdf.{$public_domain} {
 }
 
 superset.{$public_domain} {
-        reverse_proxy ${main_server_ip} {
+	reverse_proxy {$main_server_ip} {
                 transport http {
                         tls_insecure_skip_verify
                 }
@@ -144,17 +139,17 @@ superset.{$public_domain} {
 }
 
 vaultwarden.{$public_domain} {
-        reverse_proxy ${main_server_ip} {
+	reverse_proxy {$main_server_ip} {
                 transport http {
                         tls_insecure_skip_verify
-                        }
+                }
         }
         tls {$email}
         import forward_headers
 }
 
 vikunja.{$public_domain} {
-        reverse_proxy ${main_server_ip} {
+	reverse_proxy {$main_server_ip} {
                 transport http {
                         tls_insecure_skip_verify
                 }
@@ -164,7 +159,7 @@ vikunja.{$public_domain} {
 }
 
 {$public_domain} {
-        reverse_proxy ${main_server_ip} {
+        reverse_proxy {$main_server_ip} {
                 transport http {
                         tls_insecure_skip_verify
                 }
diff --git a/services/headscale/headscale.yml b/services/headscale/headscale.yml
index b3ff7bd..4872208 100644
--- a/services/headscale/headscale.yml
+++ b/services/headscale/headscale.yml
@@ -10,8 +10,8 @@ services:
       - ${SERVICE_PATH}/headscale/lib:/var/lib/headscale
       - ${SERVICE_PATH}/headscale/run:/var/run/headscale
     ports:
-      - 0.0.0.0:1000:8080 # api 
-      - 0.0.0.0:1001:9090 # metrics
+      - 127.0.0.1:8080:8080 # api 
+      - 127.0.0.1:9090:9090 # metrics
     command: serve
     environment:
     networks: