diff --git a/hosts/intuos/filesystems/default.nix b/hosts/intuos/filesystems/default.nix
index af061215..d0c4519d 100644
--- a/hosts/intuos/filesystems/default.nix
+++ b/hosts/intuos/filesystems/default.nix
@@ -1,7 +1,7 @@
 { config, ... }:
 {
   fileSystems."/home/${config.sysusers.main}/Midas" = {
-    device = "10.2.0.1:/";
+    device = "11.0.0.1:/";
     fsType = "nfs4";
     options = [ "x-systemd.automount" "noauto" "soft" "_netdev" ];
   };
diff --git a/hosts/kitty/default.nix b/hosts/kitty/default.nix
index 1e149dfe..82b244b8 100644
--- a/hosts/kitty/default.nix
+++ b/hosts/kitty/default.nix
@@ -18,7 +18,7 @@
       interface="eno1";
     };
     interfaces.internal.ipv4.addresses = [{
-      address = "11.0.0.1";
+      address = "11.0.0.2";
       prefixLength = 8;
     }];
   };
diff --git a/hosts/midas/filesystems/default.nix b/hosts/midas/filesystems/default.nix
index 86a0ebc5..ce937320 100644
--- a/hosts/midas/filesystems/default.nix
+++ b/hosts/midas/filesystems/default.nix
@@ -8,7 +8,7 @@
       options = [ "subvol=persist" "compress=zstd" "noatime" ];
     };
     "/kitty" = {
-      device = "10.2.0.2:/storage/bun";
+      device = "11.0.0.2:/storage/bun";
       fsType = "nfs4";
       options = [ "x-systemd.automount" "noauto" "soft" "_netdev" ];
     };
diff --git a/hosts/midas/firewall/default.nix b/hosts/midas/firewall/default.nix
index bc1fbcee..699e8cb1 100644
--- a/hosts/midas/firewall/default.nix
+++ b/hosts/midas/firewall/default.nix
@@ -5,17 +5,15 @@
     content = ''
       chain incoming {
         type nat hook prerouting priority dstnat; policy accept;
-        tcp dport 2211 dnat ip to 10.2.0.100:22 comment "SSH to Tower"
-        tcp dport 2222 dnat ip to 10.2.0.2:22 comment "SSH to Kitty"
-        tcp dport 2233 dnat ip to 10.2.0.101:22 comment "SSH to Intuos"
+        tcp dport 2211 dnat ip to 11.0.0.100:22 comment "Tower SSH"
+        tcp dport 2222 dnat ip to 11.0.0.2:22 comment "Kitty SSH"
+        tcp dport 2233 dnat ip to 11.0.0.101:22 comment "Envy SSH"
+        tcp dport 2244 dnat ip to 11.0.0.102:22 comment "Intuos SSH"
         
-        udp dport { 27005, 27015 } dnat ip to 10.2.0.100 comment "PC Hosted Games"
+        udp dport { 27005, 27015 } dnat ip to 11.0.0.100 comment "PC Hosted Games"
         
-        tcp dport { 48010, 47989, 47984 } dnat ip to 10.2.0.100 comment "PC Sunshine TCP"
-        udp dport { 47998, 47999, 48000 } dnat ip to 10.2.0.100 comment "PC Sunshine UDP"
-        
-        tcp dport { 38010, 37989, 37984 } dnat ip to 10.3.0.1 comment "VM Sunshine TCP"
-        udp dport { 37998, 37999, 38000 } dnat ip to 10.3.0.1 comment "VM Sunshine UDP"
+        tcp dport { 48010, 47989, 47984 } dnat ip to 11.0.0.100 comment "PC Sunshine TCP"
+        udp dport { 47998, 47999, 48000 } dnat ip to 11.0.0.100 comment "PC Sunshine UDP"
       }
 
       chain forward {
diff --git a/hosts/tower/filesystems/default.nix b/hosts/tower/filesystems/default.nix
index a795bf86..32d9076a 100644
--- a/hosts/tower/filesystems/default.nix
+++ b/hosts/tower/filesystems/default.nix
@@ -32,12 +32,12 @@
 
     # Network mounts
     "/home/${config.sysusers.main}/Network/Midas" = {
-      device = "10.2.0.1:/storage";
+      device = "11.0.0.1:/storage";
       fsType = "nfs4";
       options = [ "x-systemd.automount" "noauto" "soft" "_netdev" ];
     };
     "/home/${config.sysusers.main}/Network/Kitty" = {
-      device = "10.2.0.2:/storage/bun";
+      device = "11.0.0.2:/storage/bun";
       fsType = "nfs4";
       options = [ "x-systemd.automount" "noauto" "soft" "_netdev" ];
     };