diff --git a/machines/akhaten/default.nix b/machines/akhaten/default.nix
index 7ca1cbd..e85d073 100644
--- a/machines/akhaten/default.nix
+++ b/machines/akhaten/default.nix
@@ -10,9 +10,9 @@
     arch = "x86_64-linux";
     nixpkgs_version = inputs.unstable;
     hm_version = inputs.home-manager-unstable;
-    ipv4 = {
-      public = "163.172.91.82";
-      vpn = "100.100.45.33";
+    ips = {
+      public.ipv4 = "163.172.91.82";
+      vpn.ipv4 = "100.100.45.33";
     };
   };
 
diff --git a/machines/core-data/default.nix b/machines/core-data/default.nix
index 0640950..56d61ce 100644
--- a/machines/core-data/default.nix
+++ b/machines/core-data/default.nix
@@ -15,14 +15,12 @@
     arch = "x86_64-linux";
     nixpkgs_version = inputs.nixpkgs;
     hm_version = inputs.home-manager;
-    ipv4 = {
-      public = "82.67.34.230";
-      local = "192.168.0.66";
-      vpn = "100.100.45.26";
-    };
-    ipv6 = {
-      public = "2a01:e0a:de4:a0e1:be24:11ff:fe09:638d";
-      vpn = "fd7a:115c:a1e0::1a";
+    ips = {
+      public.ipv4 = "82.67.34.230";
+      local.ipv4 = "192.168.0.66";
+      vpn.ipv4 = "100.100.45.26";
+      public.ipv6 = "2a01:e0a:de4:a0e1:be24:11ff:fe09:638d";
+      vpn.ipv6 = "fd7a:115c:a1e0::1a";
     };
 
   };
diff --git a/machines/core-security/default.nix b/machines/core-security/default.nix
index fc4c202..7ac399b 100644
--- a/machines/core-security/default.nix
+++ b/machines/core-security/default.nix
@@ -16,16 +16,13 @@
     arch = "x86_64-linux";
     nixpkgs_version = inputs.nixpkgs;
     hm_version = inputs.home-manager;
-    ipv4 = {
-      public = "82.67.34.230";
-      local = "192.168.0.175";
-      vpn = "100.100.45.14";
+    ips = {
+      public.ipv4 = "82.67.34.230";
+      local.ipv4 = "192.168.0.175";
+      vpn.ipv4 = "100.100.45.14";
+      public.ipv6 = "2a01:e0a:de4:a0e1:40f0:8cff:fe31:3e94";
+      vpn.ipv6 = "fd7a:115c:a1e0::e";
     };
-    ipv6 = {
-      public = "2a01:e0a:de4:a0e1:40f0:8cff:fe31:3e94";
-      vpn = "fd7a:115c:a1e0::e";
-    };
-
   };
 
   boot.loader.grub.enable = true;
diff --git a/machines/enigma/default.nix b/machines/enigma/default.nix
index 5867070..1b4524d 100644
--- a/machines/enigma/default.nix
+++ b/machines/enigma/default.nix
@@ -15,8 +15,7 @@
     arch = "aarch64-linux";
     nixpkgs_version = inputs.nixpkgs;
     hm_version = inputs.home-manager;
-    ipv4.vpn = "100.100.45.21";
-
+    ips.vpn.ipv4 = "100.100.45.21";
   };
 
   networking.hostName = "enigma";
diff --git a/machines/fischer/default.nix b/machines/fischer/default.nix
index 8dfb4ae..98a2cce 100644
--- a/machines/fischer/default.nix
+++ b/machines/fischer/default.nix
@@ -16,7 +16,7 @@
     nixpkgs_version = inputs.nixpkgs_patched;
     hm_version = inputs.home-manager-unstable;
     # TODO: Fix colmena deployment
-    ipv4.public = "127.0.0.1";
+    ips.public.ipv4 = "127.0.0.1";
   };
 
   # Boot stuff
diff --git a/machines/gustave/default.nix b/machines/gustave/default.nix
index 09105a2..c436522 100644
--- a/machines/gustave/default.nix
+++ b/machines/gustave/default.nix
@@ -12,14 +12,12 @@
     arch = "x86_64-linux";
     nixpkgs_version = inputs.nixpkgs;
     hm_version = inputs.home-manager;
-    ipv4 = {
-      public = "82.67.34.230";
-      local = "192.168.0.90";
-      vpn = "100.100.45.24";
-    };
-    ipv6 = {
-      public = "2a01:e0a:de4:a0e1:eb2:aaaa::45";
-      vpn = "fd7a:115c:a1e0::18";
+    ips = {
+      public.ipv4 = "82.67.34.230";
+      local.ipv4 = "192.168.0.90";
+      vpn.ipv4 = "100.100.45.24";
+      public.ipv6 = "2a01:e0a:de4:a0e1:eb2:aaaa::45";
+      vpn.ipv6 = "fd7a:115c:a1e0::18";
     };
 
   };
diff --git a/machines/lambda/default.nix b/machines/lambda/default.nix
index 2a55051..b16fc4f 100644
--- a/machines/lambda/default.nix
+++ b/machines/lambda/default.nix
@@ -10,15 +10,12 @@
     arch = "aarch64-linux";
     nixpkgs_version = inputs.nixpkgs;
     hm_version = inputs.home-manager;
-    ipv4 = {
-      public = "141.145.197.219";
-      vpn = "100.100.45.13";
+    ips = {
+      public.ipv4 = "141.145.197.219";
+      vpn.ipv4 = "100.100.45.13";
+      public.ipv6 = "2603:c027:c001:89aa:aad9:34b3:f3c9:924f";
+      vpn.ipv6 = "fd7a:115c:a1e0::d";
     };
-    ipv6 = {
-      public = "2603:c027:c001:89aa:aad9:34b3:f3c9:924f";
-      vpn = "fd7a:115c:a1e0::d";
-    };
-
   };
 
   boot.loader.systemd-boot.enable = true;
diff --git a/machines/lisa/default.nix b/machines/lisa/default.nix
index 60ee564..7e63c94 100644
--- a/machines/lisa/default.nix
+++ b/machines/lisa/default.nix
@@ -10,13 +10,11 @@
     arch = "x86_64-linux";
     nixpkgs_version = inputs.nixpkgs;
     hm_version = inputs.home-manager;
-    ipv4 = {
-      public = "212.129.40.11";
-      vpn = "100.100.45.12";
-    };
-    ipv6 = {
-      public = "2a01:e0a:5f9:9681:5880:c9ff:fe9f:3dfb";
-      vpn = "fd7a:115c:a1e0::c";
+    ips = {
+      public.ipv4 = "212.129.40.11";
+      vpn.ipv4 = "100.100.45.12";
+      public.ipv6 = "2a01:e0a:5f9:9681:5880:c9ff:fe9f:3dfb";
+      vpn.ipv6 = "fd7a:115c:a1e0::c";
     };
 
   };
diff --git a/machines/nuage/default.nix b/machines/nuage/default.nix
index 8197829..f2793d9 100644
--- a/machines/nuage/default.nix
+++ b/machines/nuage/default.nix
@@ -17,14 +17,12 @@
     arch = "x86_64-linux";
     nixpkgs_version = inputs.nixpkgs;
     hm_version = inputs.home-manager;
-    ipv4 = {
-      public = "82.67.34.230";
-      local = "192.168.0.101";
-      vpn = "100.100.45.28";
-    };
-    ipv6 = {
-      public = "2a01:e0a:de4:a0e1:95c9:b2e2:e999:1a45";
-      vpn = "fd7a:115c:a1e0::1c";
+    ips = {
+      public.ipv4 = "82.67.34.230";
+      local.ipv4 = "192.168.0.101";
+      vpn.ipv4 = "100.100.45.28";
+      public.ipv6 = "2a01:e0a:de4:a0e1:95c9:b2e2:e999:1a45";
+      vpn.ipv6 = "fd7a:115c:a1e0::1c";
     };
 
   };
diff --git a/machines/tower/default.nix b/machines/tower/default.nix
index 1c26df4..10bd912 100644
--- a/machines/tower/default.nix
+++ b/machines/tower/default.nix
@@ -11,14 +11,12 @@
     arch = "x86_64-linux";
     nixpkgs_version = inputs.nixpkgs;
     hm_version = inputs.home-manager;
-    ipv4 = {
-      public = "82.67.34.230";
-      local = "192.168.0.103";
-      vpn = "100.100.45.9";
-    };
-    ipv6 = {
-      public = "2a01:e0a:de4:a0e1:8ec7:b5d2:f663:a67a";
-      vpn = "fd7a:115c:a1e0::9";
+    ips = {
+      public.ipv4 = "82.67.34.230";
+      local.ipv4 = "192.168.0.103";
+      vpn.ipv4 = "100.100.45.9";
+      public.ipv6 = "2a01:e0a:de4:a0e1:8ec7:b5d2:f663:a67a";
+      vpn.ipv6 = "fd7a:115c:a1e0::9";
     };
 
   };
diff --git a/machines/x2100/default.nix b/machines/x2100/default.nix
index 35344c7..b08fbae 100644
--- a/machines/x2100/default.nix
+++ b/machines/x2100/default.nix
@@ -17,7 +17,7 @@
     nixpkgs_version = inputs.nixpkgs_patched;
     hm_version = inputs.home-manager-unstable;
     # TODO: Fix colmena deployment
-    ipv4.public = "127.0.0.1";
+    ips.public.ipv4 = "127.0.0.1";
 
   };