diff --git a/config/net/upstream.nix b/config/net/upstream.nix
index 916c151..de9fd39 100644
--- a/config/net/upstream.nix
+++ b/config/net/upstream.nix
@@ -1,57 +1,62 @@
+{ config, ... }:
+let
+  servHosts = config.site.net.serv.hosts4;
+  inherit (config.site.net.c3d2.hosts4) dn42;
+in
 {
   site.hosts = {
     upstream1 = {
       forwardPorts = [
         {
-          destination = "172.20.73.45:80";
+          destination = "${servHosts.public-access-proxy}:80";
           proto = "tcp";
           reflect = true;
           sourcePort = 80;
         }
         {
-          destination = "172.20.73.45:443";
+          destination = "${servHosts.public-access-proxy}:443";
           proto = "tcp";
           reflect = true;
           sourcePort = 443;
         }
         {
-          destination = "172.22.99.253";
+          destination = dn42;
           proto = "udp";
           reflect = true;
           sourcePort = 2325;
         }
         {
-          destination = "172.22.99.253";
+          destination = dn42;
           proto = "udp";
           reflect = true;
           sourcePort = 2399;
         }
         {
-          destination = "172.22.99.253";
+          destination = dn42;
           proto = "udp";
           reflect = true;
           sourcePort = 2327;
         }
         {
-          destination = "172.22.99.253";
+          destination = dn42;
           proto = "udp";
           reflect = true;
           sourcePort = 2338;
         }
         {
-          destination = "172.22.99.253";
+          destination = dn42;
           proto = "udp";
           reflect = true;
           sourcePort = 2339;
         }
         {
-          destination = "172.22.99.253";
+          destination = dn42;
           proto = "udp";
           reflect = true;
           sourcePort = 40533;
         }
         {
-          destination = "172.22.99.253";
+          destination = dn42;
           proto = "udp";
           reflect = true;
           sourcePort = 61699;
@@ -193,59 +198,60 @@
           sourcePort = 53;
         }
         {
-          destination = "172.22.99.253";
+          destination = dn42;
           proto = "udp";
           reflect = true;
           sourcePort = 2325;
         }
         {
-          destination = "172.22.99.253";
+          destination = dn42;
           proto = "udp";
           reflect = true;
           sourcePort = 2399;
         }
         {
-          destination = "172.22.99.253";
+          destination = dn42;
           proto = "udp";
           reflect = true;
           sourcePort = 2327;
         }
         {
-          destination = "172.22.99.253";
+          destination = dn42;
           proto = "udp";
           reflect = true;
           sourcePort = 2338;
         }
         {
-          destination = "172.22.99.253";
+          destination = dn42;
           proto = "udp";
           reflect = true;
           sourcePort = 2339;
         }
         {
-          destination = "172.22.99.253";
+          destination = dn42;
           proto = "udp";
           reflect = true;
           sourcePort = 40533;
         }
         {
-          destination = "172.22.99.253";
+          destination = dn42;
           proto = "udp";
           reflect = true;
           sourcePort = 61699;
         }
         {
-          destination = "172.20.73.47:22";
+          destination = "${servHosts.leonos}:22";
           proto = "tcp";
           reflect = true;
           sourcePort = 2223;
         }
         {
-          destination = "172.20.73.48";
+          destination = servHosts.minetest;
           proto = "udp";
           reflect = true;
           sourcePort = 30000;
         }
+        # ?
         {
           destination = "172.22.99.175:22";
           proto = "tcp";
@@ -253,107 +259,110 @@
           sourcePort = 2224;
         }
         {
-          destination = "172.20.73.53";
+          destination = servHosts.gitea;
           proto = "tcp";
           reflect = true;
           sourcePort = 22;
         }
         {
-          destination = "172.20.73.55";
+          destination = servHosts.jabber;
           proto = "tcp";
           reflect = true;
           sourcePort = 5222;
         }
         {
-          destination = "172.20.73.55";
+          destination = servHosts.jabber;
           proto = "tcp";
           reflect = true;
           sourcePort = 5223;
         }
         {
-          destination = "172.20.73.55";
+          destination = servHosts.jabber;
           proto = "tcp";
           reflect = true;
           sourcePort = 5269;
         }
         {
-          destination = "172.20.73.55";
+          destination = servHosts.jabber;
           proto = "tcp";
           reflect = true;
           sourcePort = 3478;
         }
         {
-          destination = "172.20.73.55";
+          destination = servHosts.jabber;
           proto = "tcp";
           reflect = true;
           sourcePort = 3479;
         }
         {
-          destination = "172.20.73.55";
+          destination = servHosts.jabber;
           proto = "udp";
           reflect = true;
           sourcePort = 3478;
         }
         {
-          destination = "172.20.73.55";
+          destination = servHosts.jabber;
           proto = "udp";
           reflect = true;
           sourcePort = 3479;
         }
+        # leon's vps1
         {
-          destination = "172.20.73.51:22";
+          destination = "${servHosts.vps1}:22";
           proto = "tcp";
           reflect = true;
           sourcePort = 2225;
         }
         {
-          destination = "172.20.73.58";
+          destination = servHosts.mail;
           proto = "tcp";
           reflect = true;
           sourcePort = 25;
         }
         {
-          destination = "172.20.73.58";
+          destination = servHosts.mail;
           proto = "tcp";
           reflect = true;
           sourcePort = 465;
         }
         {
-          destination = "172.20.73.58";
+          destination = servHosts.mail;
           proto = "tcp";
           reflect = true;
           sourcePort = 587;
         }
         {
-          destination = "172.20.73.58";
+          destination = servHosts.mail;
           proto = "tcp";
           reflect = true;
           sourcePort = 110;
         }
         {
-          destination = "172.20.73.58";
+          destination = servHosts.mail;
           proto = "tcp";
           reflect = true;
           sourcePort = 143;
         }
         {
-          destination = "172.20.73.58";
+          destination = servHosts.mail;
           proto = "tcp";
           reflect = true;
           sourcePort = 993;
         }
         {
-          destination = "172.20.73.58";
+          destination = servHosts.mail;
           proto = "tcp";
           reflect = true;
           sourcePort = 995;
         }
+        # poelzi
         {
           destination = "172.20.73.162:22";
           proto = "tcp";
           reflect = true;
           sourcePort = 2323;
         }
+        # zw-ev RDP
         {
           destination = "172.20.75.222:3389";
           proto = "tcp";