diff --git a/hosts/fw.cloonar.com/modules/dhcp4.nix b/hosts/fw.cloonar.com/modules/dhcp4.nix
index 16cf2e9..fd52759 100644
--- a/hosts/fw.cloonar.com/modules/dhcp4.nix
+++ b/hosts/fw.cloonar.com/modules/dhcp4.nix
@@ -39,7 +39,7 @@
             }
             {
               name = "domain-name-servers";
-              data = "10.42.97.2";
+              data = "10.42.97.10";
             }
           ];
           reservations = [
@@ -79,10 +79,15 @@
             }
             {
               name = "domain-name-servers";
-              data = "10.42.97.2";
+              data = "10.42.97.10";
             }
           ];
           reservations = [
+            {
+              hw-address = "1a:c4:04:6e:29:bd";
+              ip-address = "10.42.97.2";
+              server-hostname = "omada.cloonar.com";
+            }
           ];
         }
         {
@@ -104,7 +109,7 @@
             }
             {
               name = "domain-name-servers";
-              data = "10.42.97.2";
+              data = "10.42.97.10";
             }
           ];
           reservations = [
@@ -139,7 +144,7 @@
             }
             {
               name = "domain-name-servers";
-              data = "10.42.97.2";
+              data = "10.42.97.10";
             }
           ];
         }
@@ -177,7 +182,7 @@
             }
             {
               name = "domain-name-servers";
-              data = "10.42.100.1";
+              data = "10.42.97.10";
             }
           ];
           reservations = [
diff --git a/hosts/fw.cloonar.com/modules/networking.nix b/hosts/fw.cloonar.com/modules/networking.nix
index 4fb0a23..4df3644 100644
--- a/hosts/fw.cloonar.com/modules/networking.nix
+++ b/hosts/fw.cloonar.com/modules/networking.nix
@@ -24,13 +24,13 @@
   services.resolved = {
     enable = true;
     domains = [ "~." ];
-    fallbackDns = [ "10.42.97.2" ];
+    fallbackDns = [ "10.42.97.10" ];
   };
 
   networking = {
     useDHCP = false;
     # Define VLANS
-    nameservers = [ "10.42.97.2" ];
+    nameservers = [ "10.42.97.10" ];
     vlans = {
       infrastructure = {
          id = 101;
diff --git a/hosts/fw.cloonar.com/modules/omada.nix b/hosts/fw.cloonar.com/modules/omada.nix
index 47851cd..da261a3 100644
--- a/hosts/fw.cloonar.com/modules/omada.nix
+++ b/hosts/fw.cloonar.com/modules/omada.nix
@@ -18,8 +18,8 @@
           "/var/lib/omada/logs:/opt/tplink/EAPController/logs"
         ];
         extraOptions = [
-          "--ip=10.42.97.3"
           "--network=server"
+          "--mac-address=1a:c4:04:6e:29:bd"
         ];
       };
     };
diff --git a/hosts/fw.cloonar.com/modules/unbound.nix b/hosts/fw.cloonar.com/modules/unbound.nix
index b4d3857..9c4ceae 100644
--- a/hosts/fw.cloonar.com/modules/unbound.nix
+++ b/hosts/fw.cloonar.com/modules/unbound.nix
@@ -154,7 +154,7 @@ in {
         };
         interfaces.mv-vserver = {
           ipv4.addresses = [{
-            address = "10.42.97.2";
+            address = "10.42.97.10";
             prefixLength = 24;
           }];
         };