diff --git a/lib/luj.nix b/lib/luj.nix
index 20c1985..f67ad11 100644
--- a/lib/luj.nix
+++ b/lib/luj.nix
@@ -22,17 +22,16 @@ inputs: lib: with lib; let
 
         domain = "julienmalka.me";
         internalDomain = "luj";
+        tld = "luj";
 
         machines = {
           lisa = {
+            inherit tld;
             arch = "x86_64-linux";
             nixpkgs_version = inputs.nixpkgs;
             hm_version = inputs.home-manager;
-          };
-          newton = {
-            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"; };
           };
           macintosh = {
             arch = "aarch64-linux";
@@ -40,26 +39,72 @@ inputs: lib: with lib; let
             hm_version = inputs.home-manager;
           };
           lambda = {
+            inherit tld;
             arch = "aarch64-linux";
             nixpkgs_version = inputs.nixpkgs;
             hm_version = inputs.home-manager;
-          };
-          tower = {
-            arch = "x86_64-linux";
-            nixpkgs_version = inputs.nixpkgs;
-            hm_version = inputs.home-manager;
+            ipv4 = { public = "141.145.197.219"; vpn = "100.100.45.13"; };
+            ipv6 = { public = "2603:c027:c001:89aa:aad9:34b3:f3c9:924f"; vpn = "fd7a:115c:a1e0::d"; };
           };
 
-          bin-cache = {
+          tower = {
+            inherit tld;
             arch = "x86_64-linux";
             nixpkgs_version = inputs.nixpkgs;
             hm_version = inputs.home-manager;
+            ipv4 = { public = "78.194.168.230"; local = "192.168.0.103"; vpn = "100.100.45.9"; };
+            ipv6 = { public = "2a01:e34:ec2a:8e60:8ec7:b5d2:f663:a67a"; vpn = "fd7a:115c:a1e0::9"; };
+
           };
 
           core-security = {
+            inherit tld;
             arch = "x86_64-linux";
             nixpkgs_version = inputs.nixpkgs;
             hm_version = inputs.home-manager;
+            ipv4 = { public = "78.194.168.230"; local = "192.168.0.175"; vpn = "100.100.45.14"; };
+            ipv6 = { public = "2a01:e34:ec2a:8e60:40f0:8cff:fe31:3e94"; vpn = "fd7a:115c:a1e0::e"; };
+
+          };
+
+          nuage = {
+            inherit tld;
+            subdomains = [ "nuage.malka.family" ];
+            ipv4 = { public = "78.194.168.230"; local = "192.168.0.101"; };
+            ipv6 = { public = "2a01:e34:ec2a:8e60:4ab8:c3d0:a0fe:525f"; };
+          };
+          pve1 = {
+            inherit tld;
+            ipv4 = { public = "78.194.168.230"; local = "192.168.1.1"; vpn = "100.100.45.3"; };
+            ipv6 = { public = "2a01:e34:ec2a:8e60:d250:99ff:fefa:b62"; vpn = "fd7a:115c:a1e0::3"; };
+          };
+          pve2 = {
+            inherit tld;
+            ipv4 = { public = "78.194.168.230"; local = "192.168.1.2"; vpn = "100.100.45.15"; };
+            ipv6 = { public = "2a01:e34:ec2a:8e60:aaa1:59ff:fec7:1d6"; vpn = "fd7a:115c:a1e0::f"; };
+          };
+          pve3 = {
+            inherit tld;
+            ipv4 = { public = "78.194.168.230"; local = "192.168.1.3"; vpn = "100.100.45.16"; };
+            ipv6 = { public = "2a01:e34:ec2a:8e60:aaa1:59ff:fec1:aa10"; vpn = "fd7a:115c:a1e0::10"; };
+          };
+          pve4 = {
+            inherit tld;
+            ipv4 = { public = "78.194.168.230"; local = "192.168.1.4"; vpn = "100.100.45.17"; };
+            ipv6 = { public = "2a01:e34:ec2a:8e60:d250:99ff:fefa:b76"; vpn = "fd7a:115c:a1e0::11"; };
+          };
+          saves-paris = {
+            inherit tld;
+            subdomains = [ "saves-paris.luj" ];
+            ipv4 = { public = "78.194.168.230"; local = "192.168.4.5"; vpn = "100.100.45.4"; };
+            ipv6 = { public = "2a01:e34:ec2a:8e60:3af3:abff:fe6a:1f54"; vpn = "fd7a:115c:a1e0::4"; };
+          };
+
+          saves-lyon = {
+            inherit tld;
+            subdomains = [ "saves-lyon.luj" ];
+            ipv4 = { vpn = "100.100.45.20"; };
+            ipv6 = { vpn = "fd7a:115c:a1e0::14"; };
           };