diff --git a/machines/rigel/networking.nix b/machines/rigel/networking.nix
index 81659d4..130ecfc 100644
--- a/machines/rigel/networking.nix
+++ b/machines/rigel/networking.nix
@@ -1,5 +1,9 @@
+{ lib, config, ... }:
 let
   ata-interface = "enp2s0";
+
+  ipv6Subnet = lib.elemAt (lib.splitString "/" config.clan.core.vars.generators.yggdrasil.files.yggdrasil-subnet.value) 0;
+  ipv6Prefix = lib.elemAt (lib.splitString "/" config.clan.core.vars.generators.yggdrasil.files.yggdrasil-subnet.value) 1;
 in
 {
   # clan.core.vars.generators.networking.files.ata-interface.secret = false;
@@ -15,17 +19,14 @@ in
       ];
       ipv6.addresses = [
         {
-          address = "fdab:c002:36cb::1";
-          prefixLength = 64;
+          address = ipv6Subnet + "1";
+          prefixLength = lib.toInt ipv6Prefix;
         }
       ];
       ipv6.routes = [
         {
-          address = "fdab:c002:36cb::";
-          prefixLength = 64;
-        }
-        {
-          address = "";
+          address = ipv6Subnet;
+          prefixLength = lib.toInt ipv6Prefix;
         }
       ];
     };
@@ -45,7 +46,7 @@ in
       domain = "localhost";
       dhcp-range = [
         "192.168.254.10,192.168.254.240,255.255.255.0,24h"
-        "fdab:c002:36cb::10,fdab:c002:36cb::240,slaac"
+        "${ipv6Subnet}10,${ipv6Subnet}240,slaac"
       ];
       dhcp-option = [
         "3,192.168.254.1"