diff --git a/defaults/meta/network-virtual.nix b/defaults/meta/network-virtual.nix
index d69be2b..4cf70d1 100644
--- a/defaults/meta/network-virtual.nix
+++ b/defaults/meta/network-virtual.nix
@@ -93,7 +93,7 @@
 
       cyprianspitz-vms-nat = {
         v4 = {
-          id = "10.248.0.0";
+          id = "10.247.0.0";
           prefixLength = 24;
         };
         domain = "cyprianspitz-vms-nat.net.qo.is";
diff --git a/nixos-configurations/calanda/networking.nix b/nixos-configurations/calanda/networking.nix
index a96757d..5d3ba48 100644
--- a/nixos-configurations/calanda/networking.nix
+++ b/nixos-configurations/calanda/networking.nix
@@ -54,14 +54,6 @@ in
     };
   };
 
-  # Assign the static address to cyprianspitz (required for ssh luks unlock at this time)
-  services.dnsmasq.settings.dhcp-host =
-    let
-      cyprianspitzEnp0s31f6Mac = "9c:6b:00:58:6e:90";
-      inherit (plessur-lan-net.hosts.cyprianspitz.v4) ip;
-    in
-    "${cyprianspitzEnp0s31f6Mac},${ip}";
-
   # DMZ
   services.unbound.settings.server = {
     interface = [ plessur-dmz-net.hosts.calanda.v4.ip ];
diff --git a/nixos-configurations/cyprianspitz/README.md b/nixos-configurations/cyprianspitz/README.md
index d6369f9..e957926 100644
--- a/nixos-configurations/cyprianspitz/README.md
+++ b/nixos-configurations/cyprianspitz/README.md
@@ -11,13 +11,6 @@ sops decrypt --extract '["system"]["hdd"]' private/nixos-configurations/cyprians
 ssh -p 8223 root@calanda.plessur-ext.net.qo.is
 ```
 
-
-Direct remote ssh access:
-
-```
-ssh -p 8222 root@calanda.plessur-ext.net.qo.is
-```
-
 ## Hardware
 
 TODO
@@ -36,4 +29,4 @@ TODO
 
 ### HDD Bay
 
-Note that the slot in the middle of the SATA bay is not connected due to the mainboard only having 4 SATA plugs.
+Note that slot 5 (the leftmost) SATA bay is not connected due to the mainboard only having 4 SATA plugs.
diff --git a/nixos-configurations/cyprianspitz/networking.nix b/nixos-configurations/cyprianspitz/networking.nix
index 469c598..b3b570e 100644
--- a/nixos-configurations/cyprianspitz/networking.nix
+++ b/nixos-configurations/cyprianspitz/networking.nix
@@ -6,30 +6,21 @@ let
     address = net.hosts.cyprianspitz.v4.ip;
     prefixLength = net.v4.prefixLength;
   };
-  calandaIp = meta.network.physical.plessur-lan.hosts.calanda.v4.ip;
 in
 {
-  networking.enableIPv6 = false;
   networking.hostName = meta.hosts.cyprianspitz.hostName;
 
-  networking.nameservers = [ calandaIp ];
   networking.useDHCP = false;
   networking.interfaces.enp0s31f6.ipv4.addresses = [
     (getNetV4Ip meta.network.physical.plessur-lan)
   ];
-
-  networking.defaultGateway = {
-    address = calandaIp;
-    interface = "enp0s31f6";
-  };
+  networking.interfaces.enp2s0.useDHCP = true;
 
   # Virtualization
-  networking.interfaces.vms-nat = {
-    useDHCP = false;
-    ipv4.addresses = [
-      (getNetV4Ip meta.network.virtual.cyprianspitz-vms-nat)
-    ];
-  };
+  networking.interfaces.vms-nat.useDHCP = false;
+  networking.interfaces.vms-nat.ipv4.addresses = [
+    (getNetV4Ip meta.network.virtual.cyprianspitz-vms-nat)
+  ];
 
   networking.bridges.vms-nat.interfaces = [ ];
   networking.nat = {
@@ -48,7 +39,6 @@ in
       enable = true;
       resolveLocalQueries = true;
       settings = {
-        server = [ calandaIp ];
         interface = "vms-nat";
         bind-interfaces = true;
 
@@ -73,10 +63,11 @@ in
   };
 
   # Boot
+  boot.initrd.network.udhcpc.enable = true;
+
   services.qois.luks-ssh = {
     enable = true;
     interface = "eth0";
-
     sshPort = 2222;
     sshHostKey = "/secrets/system/initrd-ssh-key";
     # TODO Solve sops dependency porblem: config.sops.secrets."system/initrd-ssh-key".path;
diff --git a/nixos-modules/qois/vpn-server/default.nix b/nixos-modules/qois/vpn-server/default.nix
index d813532..25ef0a0 100644
--- a/nixos-modules/qois/vpn-server/default.nix
+++ b/nixos-modules/qois/vpn-server/default.nix
@@ -80,9 +80,9 @@ in
           dns = {
             base_domain = vpnNet.domain;
             magic_dns = true;
-            nameservers.global = [ "127.0.0.1" ];
+            nameservers.global = [ vnet.backplane.hosts.calanda.v4.ip ];
             search_domains = [
-              # First is base_domain by default with magic_dns
+              # vpnNet.domain # First by default with magic_dns
               vnet.backplane.domain
             ];
             extra_records = pipe cfg.dnsRecords [