diff --git a/flake.lock b/flake.lock
new file mode 100644
index 0000000..fb23715
--- /dev/null
+++ b/flake.lock
@@ -0,0 +1,202 @@
+{
+  "nodes": {
+    "agenix": {
+      "inputs": {
+        "darwin": "darwin",
+        "home-manager": "home-manager",
+        "nixpkgs": [
+          "nixpkgs"
+        ],
+        "systems": "systems"
+      },
+      "locked": {
+        "lastModified": 1770165109,
+        "narHash": "sha256-9VnK6Oqai65puVJ4WYtCTvlJeXxMzAp/69HhQuTdl/I=",
+        "owner": "ryantm",
+        "repo": "agenix",
+        "rev": "b027ee29d959fda4b60b57566d64c98a202e0feb",
+        "type": "github"
+      },
+      "original": {
+        "owner": "ryantm",
+        "repo": "agenix",
+        "type": "github"
+      }
+    },
+    "darwin": {
+      "inputs": {
+        "nixpkgs": [
+          "agenix",
+          "nixpkgs"
+        ]
+      },
+      "locked": {
+        "lastModified": 1744478979,
+        "narHash": "sha256-dyN+teG9G82G+m+PX/aSAagkC+vUv0SgUw3XkPhQodQ=",
+        "owner": "lnl7",
+        "repo": "nix-darwin",
+        "rev": "43975d782b418ebf4969e9ccba82466728c2851b",
+        "type": "github"
+      },
+      "original": {
+        "owner": "lnl7",
+        "ref": "master",
+        "repo": "nix-darwin",
+        "type": "github"
+      }
+    },
+    "deploy-rs": {
+      "inputs": {
+        "flake-compat": "flake-compat",
+        "nixpkgs": [
+          "nixpkgs"
+        ],
+        "utils": "utils"
+      },
+      "locked": {
+        "lastModified": 1770019181,
+        "narHash": "sha256-hwsYgDnby50JNVpTRYlF3UR/Rrpt01OrxVuryF40CFY=",
+        "owner": "serokell",
+        "repo": "deploy-rs",
+        "rev": "77c906c0ba56aabdbc72041bf9111b565cdd6171",
+        "type": "github"
+      },
+      "original": {
+        "owner": "serokell",
+        "repo": "deploy-rs",
+        "type": "github"
+      }
+    },
+    "disko": {
+      "inputs": {
+        "nixpkgs": [
+          "nixpkgs"
+        ]
+      },
+      "locked": {
+        "lastModified": 1772699110,
+        "narHash": "sha256-jkyo/9fZVB3F/PHk3fVK1ImxJBZ71DCOYZvAz4R4v4E=",
+        "owner": "nix-community",
+        "repo": "disko",
+        "rev": "42affa9d33750ac0a0a89761644af20d8d03e6ee",
+        "type": "github"
+      },
+      "original": {
+        "owner": "nix-community",
+        "repo": "disko",
+        "type": "github"
+      }
+    },
+    "flake-compat": {
+      "flake": false,
+      "locked": {
+        "lastModified": 1733328505,
+        "narHash": "sha256-NeCCThCEP3eCl2l/+27kNNK7QrwZB1IJCrXfrbv5oqU=",
+        "owner": "edolstra",
+        "repo": "flake-compat",
+        "rev": "ff81ac966bb2cae68946d5ed5fc4994f96d0ffec",
+        "type": "github"
+      },
+      "original": {
+        "owner": "edolstra",
+        "repo": "flake-compat",
+        "type": "github"
+      }
+    },
+    "home-manager": {
+      "inputs": {
+        "nixpkgs": [
+          "agenix",
+          "nixpkgs"
+        ]
+      },
+      "locked": {
+        "lastModified": 1745494811,
+        "narHash": "sha256-YZCh2o9Ua1n9uCvrvi5pRxtuVNml8X2a03qIFfRKpFs=",
+        "owner": "nix-community",
+        "repo": "home-manager",
+        "rev": "abfad3d2958c9e6300a883bd443512c55dfeb1be",
+        "type": "github"
+      },
+      "original": {
+        "owner": "nix-community",
+        "repo": "home-manager",
+        "type": "github"
+      }
+    },
+    "nixpkgs": {
+      "locked": {
+        "lastModified": 1751274312,
+        "narHash": "sha256-/bVBlRpECLVzjV19t5KMdMFWSwKLtb5RyXdjz3LJT+g=",
+        "owner": "NixOS",
+        "repo": "nixpkgs",
+        "rev": "50ab793786d9de88ee30ec4e4c24fb4236fc2674",
+        "type": "github"
+      },
+      "original": {
+        "owner": "NixOS",
+        "ref": "nixos-24.11",
+        "repo": "nixpkgs",
+        "type": "github"
+      }
+    },
+    "root": {
+      "inputs": {
+        "agenix": "agenix",
+        "deploy-rs": "deploy-rs",
+        "disko": "disko",
+        "nixpkgs": "nixpkgs"
+      }
+    },
+    "systems": {
+      "locked": {
+        "lastModified": 1681028828,
+        "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=",
+        "owner": "nix-systems",
+        "repo": "default",
+        "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e",
+        "type": "github"
+      },
+      "original": {
+        "owner": "nix-systems",
+        "repo": "default",
+        "type": "github"
+      }
+    },
+    "systems_2": {
+      "locked": {
+        "lastModified": 1681028828,
+        "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=",
+        "owner": "nix-systems",
+        "repo": "default",
+        "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e",
+        "type": "github"
+      },
+      "original": {
+        "owner": "nix-systems",
+        "repo": "default",
+        "type": "github"
+      }
+    },
+    "utils": {
+      "inputs": {
+        "systems": "systems_2"
+      },
+      "locked": {
+        "lastModified": 1731533236,
+        "narHash": "sha256-l0KFg5HjrsfsO/JpG+r7fRrqm12kzFHyUHqHCVpMMbI=",
+        "owner": "numtide",
+        "repo": "flake-utils",
+        "rev": "11707dc2f618dd54ca8739b309ec4fc024de578b",
+        "type": "github"
+      },
+      "original": {
+        "owner": "numtide",
+        "repo": "flake-utils",
+        "type": "github"
+      }
+    }
+  },
+  "root": "root",
+  "version": 7
+}
diff --git a/hosts/xlab-gateway/disko.nix b/hosts/xlab-gateway/disko.nix
index 590d987..ca67e45 100644
--- a/hosts/xlab-gateway/disko.nix
+++ b/hosts/xlab-gateway/disko.nix
@@ -1,11 +1,11 @@
 # Disko: System disk partitioning for xlab-gateway
-# Intel Optane MEMPEK1W016GA 13.4GB NVMe
+# Intel Optane MEMPEK1J016GAD 13.4GB NVMe
 { ... }:
 
 {
   disko.devices = {
     disk.system = {
-      device = "/dev/disk/by-id/nvme-INTEL_MEMPEK1W016GA_PHBT713102AA016D";
+      device = "/dev/disk/by-id/nvme-INTEL_MEMPEK1J016GAD_BTBT83661K20016N";
       type = "disk";
       content = {
         type = "gpt";
diff --git a/secrets/skydick-wg.age b/secrets/skydick-wg.age
new file mode 100644
index 0000000..2c03b5c
--- /dev/null
+++ b/secrets/skydick-wg.age
Binary files differ
diff --git a/secrets/xlab-wg-skyworks.age b/secrets/xlab-wg-skyworks.age
new file mode 100644
index 0000000..8b08385
--- /dev/null
+++ b/secrets/xlab-wg-skyworks.age
Binary files differ
diff --git a/secrets/xlab-wg-warp.age b/secrets/xlab-wg-warp.age
new file mode 100644
index 0000000..08bc5f0
--- /dev/null
+++ b/secrets/xlab-wg-warp.age
Binary files differ
diff --git a/secrets/xlab-wg-wgnet-psk.age b/secrets/xlab-wg-wgnet-psk.age
new file mode 100644
index 0000000..8fcc4c2
--- /dev/null
+++ b/secrets/xlab-wg-wgnet-psk.age
@@ -0,0 +1,7 @@
+age-encryption.org/v1
+-> X25519 GdXG/sr7VeV5EdoDVOiK48/x3k82mStCK5OLs9ecVjM
+MtnfzYcop8AgYYuz9JV8PSoSQa29JO7Y5BVuLCURg4A
+-> X25519 9CNkjpAm5girUfueNWK61CcouS/DFsINJgsBHgx29VY
+czKFijU69jGpO00bMRgdHX/qAxYtavvkUKcB6c2D9l4
+--- Vuq+SrKXDF2YUkfjoH9CEUksarL3yMNgGdFbjC67jGs
+�v�C'���׶�7@�-\�/Ҁ�G�ӌ5q��>���Ȃ��}�Έ(5���}I.4�W 0�b�^[N
\ No newline at end of file
diff --git a/secrets/xlab-wg-wgnet.age b/secrets/xlab-wg-wgnet.age
new file mode 100644
index 0000000..f79683c
--- /dev/null
+++ b/secrets/xlab-wg-wgnet.age
Binary files differ