diff --git a/nix/hosts/lemp11/modules/nginx.nix b/nix/hosts/lemp11/modules/nginx.nix
index a4614f6..34ca2d8 100644
--- a/nix/hosts/lemp11/modules/nginx.nix
+++ b/nix/hosts/lemp11/modules/nginx.nix
@@ -1,13 +1,11 @@
+{ config, ... }:
+
 {
   services.nginx = {
     enable = true;
 
     virtualHosts = {
-      "gitea.localhost".locations."/".proxyPass = "http://localhost:2222/";
-      "immich.localhost".locations."/".proxyPass = "http://localhost:2283/";
-      "jellyfin.localhost".locations."/".proxyPass = "http://localhost:8096/";
       "syncthing.localhost".locations."/".proxyPass = "http://localhost:8384/";
-      "tubearchivist.localhost".locations."/".proxyPass = "http://localhost:8000/";
     };
   };
 }
diff --git a/nix/modules/nixos/features/homelab/audiobookshelf.nix b/nix/modules/nixos/features/homelab/audiobookshelf.nix
index 6f5dd96..a5919aa 100644
--- a/nix/modules/nixos/features/homelab/audiobookshelf.nix
+++ b/nix/modules/nixos/features/homelab/audiobookshelf.nix
@@ -4,14 +4,14 @@
   services.audiobookshelf = {
     enable = true;
 
-    host = "audiobookshelf.localhost";
+    host = "audiobookshelf.davies.home";
     port = 4001;
   };
 
   services.nginx = {
     enable = true;
 
-    virtualHosts."audiobookshelf.localhost" = {
+    virtualHosts."audiobookshelf.davies.home" = {
       locations."/" = {
         proxyPass = "http://localhost:${toString config.services.audiobookshelf.port}/";
         proxyWebsockets = true;
diff --git a/nix/modules/nixos/features/homelab/gitea.nix b/nix/modules/nixos/features/homelab/gitea.nix
index be0a1cf..d44f352 100644
--- a/nix/modules/nixos/features/homelab/gitea.nix
+++ b/nix/modules/nixos/features/homelab/gitea.nix
@@ -2,24 +2,35 @@
 
 with lib;
 
+let
+  port = 2222;
+in
 {
   options.features.homelab.gitea.enable = mkEnableOption "Enable gitea";
 
   config = mkIf config.features.homelab.gitea.enable {
-    services.gitea = {
-      enable = true;
-      group = "media";
-      stateDir = "/mnt/media/gitea";
+    services = {
+      gitea = {
+        enable = true;
+        group = "media";
+        stateDir = "/mnt/media/gitea";
 
-      settings = {
-        server = {
-          HTTP_PORT = 2222;
-        };
+        settings = {
+          server = {
+            HTTP_PORT = port;
+          };
 
-        service = {
-          DISABLE_REGISTRATION = true;
+          service = {
+            DISABLE_REGISTRATION = true;
+          };
         };
       };
+
+      nginx = {
+        enable = true;
+
+        virtualHosts."gitea.davies.home".locations."/".proxyPass = "http://localhost:${toString port}/";
+      };
     };
   };
 }
diff --git a/nix/modules/nixos/features/homelab/immich.nix b/nix/modules/nixos/features/homelab/immich.nix
index ec235c3..098be47 100644
--- a/nix/modules/nixos/features/homelab/immich.nix
+++ b/nix/modules/nixos/features/homelab/immich.nix
@@ -18,5 +18,11 @@ with lib;
     };
 
     environment.systemPackages = [ pkgs.immich-cli ];
+
+    services.nginx = {
+      enable = true;
+
+      virtualHosts."immich.davies.home".locations."/".proxyPass = "http://localhost:${toString config.services.immich.port}/";
+    };
   };
 }
diff --git a/nix/modules/nixos/features/homelab/jellyfin.nix b/nix/modules/nixos/features/homelab/jellyfin.nix
index 42c1602..12a79c9 100644
--- a/nix/modules/nixos/features/homelab/jellyfin.nix
+++ b/nix/modules/nixos/features/homelab/jellyfin.nix
@@ -12,5 +12,11 @@ with lib;
       group = "media";
       configDir = "/mnt/media/jellyfin";
     };
+
+    services.nginx = {
+      enable = true;
+
+      virtualHosts."jellyfin.davies.home".locations."/".proxyPass = "http://localhost:8096/";
+    };
   };
 }
diff --git a/nix/modules/nixos/features/homelab/pi-hole.nix b/nix/modules/nixos/features/homelab/pi-hole.nix
index 5d8801a..cce9039 100644
--- a/nix/modules/nixos/features/homelab/pi-hole.nix
+++ b/nix/modules/nixos/features/homelab/pi-hole.nix
@@ -7,6 +7,9 @@
 
 with lib;
 
+let
+  port = 8082;
+in
 {
   options.features.homelab.pihole.enable = mkEnableOption "Enable pihole";
 
@@ -36,7 +39,7 @@ with lib;
             "53:53/tcp"
             "53:53/udp"
             "67:67/udp"
-            "8082:80/tcp"
+            "${toString port}:80/tcp"
           ];
 
           log-driver = "journald";
@@ -94,7 +97,7 @@ with lib;
     };
 
     services.nginx.virtualHosts."pihole.localhost" = {
-      locations."/".proxyPass = "http://localhost:8082/";
+      locations."/".proxyPass = "http://localhost:${toString port}/";
     };
   };
 }
diff --git a/nix/modules/nixos/features/homelab/tubearchivist-container.nix b/nix/modules/nixos/features/homelab/tubearchivist-container.nix
index d944dc7..b3b5454 100644
--- a/nix/modules/nixos/features/homelab/tubearchivist-container.nix
+++ b/nix/modules/nixos/features/homelab/tubearchivist-container.nix
@@ -229,6 +229,7 @@ in
       wantedBy = [ "docker-compose-tubearchivist-root.target" ];
 
     };
+
     systemd.services."docker-volume-tubearchivist_es" = {
       path = [ pkgs.docker ];
 
@@ -284,5 +285,11 @@ in
 
       wantedBy = [ "multi-user.target" ];
     };
+
+    services.nginx = {
+      enable = true;
+
+      virtualHosts."tubearchivist.davies.home".locations."/".proxyPass = "http://localhost:${toString port}/";
+    };
   };
 }