diff --git a/machines/akhaten/default.nix b/machines/akhaten/default.nix
index b210359..7ca1cbd 100644
--- a/machines/akhaten/default.nix
+++ b/machines/akhaten/default.nix
@@ -1,4 +1,4 @@
-{ ... }:
+{ inputs, ... }:
 {
   imports = [
     ./hardware.nix
@@ -6,6 +6,16 @@
     ./stalwart.nix
   ];
 
+  machine.meta = {
+    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";
+    };
+  };
+
   deployment.tags = [ "server" ];
 
   disko = import ./disko.nix;
diff --git a/machines/core-data/default.nix b/machines/core-data/default.nix
index 974d527..0640950 100644
--- a/machines/core-data/default.nix
+++ b/machines/core-data/default.nix
@@ -1,4 +1,9 @@
-{ pkgs, lib, ... }:
+{
+  pkgs,
+  lib,
+  inputs,
+  ...
+}:
 
 {
   imports = [
@@ -6,6 +11,22 @@
     ./home-julien.nix
   ];
 
+  machine.meta = {
+    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";
+    };
+
+  };
+
   # Bootloader.
   boot.loader.systemd-boot.enable = true;
   deployment.tags = [ "server" ];
diff --git a/machines/core-security/default.nix b/machines/core-security/default.nix
index 5ef63b7..fc4c202 100644
--- a/machines/core-security/default.nix
+++ b/machines/core-security/default.nix
@@ -2,6 +2,7 @@
   config,
   pkgs,
   lib,
+  inputs,
   ...
 }:
 
@@ -11,6 +12,22 @@
     ./home-julien.nix
   ];
 
+  machine.meta = {
+    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";
+    };
+    ipv6 = {
+      public = "2a01:e0a:de4:a0e1:40f0:8cff:fe31:3e94";
+      vpn = "fd7a:115c:a1e0::e";
+    };
+
+  };
+
   boot.loader.grub.enable = true;
   boot.loader.grub.device = "/dev/sda";
   boot.loader.grub.useOSProber = true;
diff --git a/machines/enigma/default.nix b/machines/enigma/default.nix
index aa1b370..5867070 100644
--- a/machines/enigma/default.nix
+++ b/machines/enigma/default.nix
@@ -1,4 +1,9 @@
-{ config, pkgs, ... }:
+{
+  config,
+  pkgs,
+  inputs,
+  ...
+}:
 
 {
   imports = [
@@ -6,6 +11,14 @@
     ./home-julien.nix
   ];
 
+  machine.meta = {
+    arch = "aarch64-linux";
+    nixpkgs_version = inputs.nixpkgs;
+    hm_version = inputs.home-manager;
+    ipv4.vpn = "100.100.45.21";
+
+  };
+
   networking.hostName = "enigma";
   boot.loader.systemd-boot.enable = true;
   boot.loader.efi.canTouchEfiVariables = true;
diff --git a/machines/fischer/default.nix b/machines/fischer/default.nix
index 895fbcb..8dfb4ae 100644
--- a/machines/fischer/default.nix
+++ b/machines/fischer/default.nix
@@ -2,6 +2,7 @@
   config,
   pkgs,
   lib,
+  inputs,
   ...
 }:
 {
@@ -10,6 +11,14 @@
     ./home-julien.nix
   ];
 
+  machine.meta = {
+    arch = "x86_64-linux";
+    nixpkgs_version = inputs.nixpkgs_patched;
+    hm_version = inputs.home-manager-unstable;
+    # TODO: Fix colmena deployment
+    ipv4.public = "127.0.0.1";
+  };
+
   # Boot stuff
   boot.loader.systemd-boot.enable = lib.mkForce false;
   boot.lanzaboote = {
diff --git a/machines/gustave/default.nix b/machines/gustave/default.nix
index 786199c..09105a2 100644
--- a/machines/gustave/default.nix
+++ b/machines/gustave/default.nix
@@ -1,4 +1,4 @@
-{ pkgs, ... }:
+{ pkgs, inputs, ... }:
 
 {
   imports = [
@@ -8,6 +8,22 @@
     ./home-julien.nix
   ];
 
+  machine.meta = {
+    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";
+    };
+
+  };
+
   boot.loader.systemd-boot.enable = true;
   boot.loader.efi.canTouchEfiVariables = true;
 
diff --git a/machines/lambda/default.nix b/machines/lambda/default.nix
index 3ff9dcc..2a55051 100644
--- a/machines/lambda/default.nix
+++ b/machines/lambda/default.nix
@@ -1,4 +1,4 @@
-{ pkgs, ... }:
+{ pkgs, inputs, ... }:
 
 {
   imports = [
@@ -6,6 +6,21 @@
     ./home-julien.nix
   ];
 
+  machine.meta = {
+    arch = "aarch64-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";
+    };
+
+  };
+
   boot.loader.systemd-boot.enable = true;
   boot.loader.efi.canTouchEfiVariables = true;
 
diff --git a/machines/lisa/default.nix b/machines/lisa/default.nix
index b4ea2ef..60ee564 100644
--- a/machines/lisa/default.nix
+++ b/machines/lisa/default.nix
@@ -1,4 +1,4 @@
-{ modulesPath, ... }:
+{ modulesPath, inputs, ... }:
 {
   imports = [
     (modulesPath + "/profiles/qemu-guest.nix")
@@ -6,6 +6,21 @@
     ./home-julien.nix
   ];
 
+  machine.meta = {
+    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";
+    };
+
+  };
+
   luj = {
     docs = {
       enable = true;
diff --git a/machines/nuage/default.nix b/machines/nuage/default.nix
index 9b845f5..8197829 100644
--- a/machines/nuage/default.nix
+++ b/machines/nuage/default.nix
@@ -1,4 +1,9 @@
-{ config, pkgs, ... }:
+{
+  config,
+  pkgs,
+  inputs,
+  ...
+}:
 
 {
   imports = [
@@ -8,6 +13,22 @@
     ./home-julien.nix
   ];
 
+  machine.meta = {
+    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";
+    };
+
+  };
+
   boot.loader.grub.enable = true;
   boot.loader.grub.device = "/dev/sda";
   boot.loader.grub.useOSProber = true;
diff --git a/machines/tower/default.nix b/machines/tower/default.nix
index 9945579..1c26df4 100644
--- a/machines/tower/default.nix
+++ b/machines/tower/default.nix
@@ -1,4 +1,4 @@
-{ pkgs, ... }:
+{ pkgs, inputs, ... }:
 
 {
   imports = [
@@ -7,6 +7,22 @@
     ./forgejo-runner.nix
   ];
 
+  machine.meta = {
+    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";
+    };
+
+  };
+
   boot.loader.grub.enable = true;
   boot.loader.grub.device = "/dev/sda";
   boot.loader.grub.useOSProber = true;
diff --git a/machines/x2100/default.nix b/machines/x2100/default.nix
index 40a00aa..35344c7 100644
--- a/machines/x2100/default.nix
+++ b/machines/x2100/default.nix
@@ -2,6 +2,7 @@
   config,
   pkgs,
   lib,
+  inputs,
   ...
 }:
 
@@ -11,6 +12,15 @@
     ./home-julien.nix
   ];
 
+  machine.meta = {
+    arch = "x86_64-linux";
+    nixpkgs_version = inputs.nixpkgs_patched;
+    hm_version = inputs.home-manager-unstable;
+    # TODO: Fix colmena deployment
+    ipv4.public = "127.0.0.1";
+
+  };
+
   # Lanzaboote 
   boot.loader.systemd-boot.enable = lib.mkForce false;
   boot.lanzaboote = {