diff --git a/quinn/etc/nixos/configuration.nix b/quinn/etc/nixos/configuration.nix
index 2c69efe..f149f31 100644
--- a/quinn/etc/nixos/configuration.nix
+++ b/quinn/etc/nixos/configuration.nix
@@ -241,7 +241,7 @@
   '';
   # Open ports in the firewall.
   networking.firewall = {
-    enable = true;
+    enable = false;
     allowPing = true;
     allowedTCPPorts = [ 80 443 ];
     allowedUDPPortRanges = [
@@ -280,17 +280,20 @@
   system.stateVersion = "24.05"; # Did you read the comment?
 
   systemd.network.enable = true;
-  systemd.network.netdevs."00-container-vlan" = {
+  systemd.network.netdevs."00-container-ipvlan" = {
     netdevConfig = {
-      Name = "podman-container-vlan";
-      Kind = "vlan";
+      Name = "podipvlan";
+      Kind = "ipvlan";
     };
-    vlanConfig = {
-      Id = 1;
+    ipvlanConfig = {
+      Mode = "L2";
     };
   };
   systemd.network.networks."10-wan" = {
     matchConfig.Name = "enp2s0";
+    dhcpV6Config = {
+      PrefixDelegationHint = "::/60";
+    };
     networkConfig = {
       # start a DHCP Client for IPv4 Addressing/Routing
       DHCP = "ipv4";
@@ -301,17 +304,38 @@
       addressConfig = {
         Address="fd00::2/64";
       };
-    } {
-      addressConfig = {
-        Address="::/0";
-        Scope="global";
-      };
     }];
+    ipv6PrefixDelegationConfig = {
+      Managed = true;
+    };
+    ipv6AcceptRAConfig = {
+      DHCPv6Client="always";
+      Token="prefixstable";
+    };
 
 
     # make routing on this interface a dependency for network-online.target
     linkConfig.RequiredForOnline = "routable";
   };
+  systemd.network.networks."20-container-ipvlan" = {
+    matchConfig = {
+      Name = "podipvlan";
+      Type = "ipvlan";
+    };
+    dhcpPrefixDelegationConfig = {
+      SubnetId=1;
+    };
+    dhcpV6Config = {
+      DUIDType="uuid";
+    };
+    networkConfig = {
+      IPv6DuplicateAddressDetection=1;
+      LinkLocalAddressing="ipv6";
+    };
+
+  };
+
+  systemd.services.systemd-networkd.environment.SYSTEMD_LOG_LEVEL = "debug";
 
   systemd.services.scan-uploader = {
     enable = true;
@@ -331,41 +355,7 @@
   ];
   # Enable podman since we are on NixOS 21.05
   virtualisation.docker.enable = false;
-  virtualisation.oci-containers.backend = "podman";
-  virtualisation.oci-containers.containers = {
-    pihole = {
-      autoStart = true;
-      environment = {
-        TZ = "America/Phoenix";
-        DNSMASQ_LISTENING = "all";
-      };
-      extraOptions = ["--network=bridge"];
-      image = "docker.io/pihole/pihole:2024.07.0";
-      ports = [
-        "53:53/tcp"
-        "53:53/udp"
-        "67:67"
-        "127.0.0.1:10000:80"
-      ];
-      volumes = [
-        "/etc/pihole/config:/etc/pihole"
-        "/etc/pihole/dnsmasq.d:/etc/dnsmasq.d"
-      ];
-    };
-  };
   virtualisation.podman.enable = true;
   virtualisation.podman.dockerSocket.enable = true;
-  virtualisation.podman.defaultNetwork.settings = {
-    dns_enabled = false;
-    ipv6_enabled = true;
-    subnets = [{
-      gateway = "10.88.0.1";
-      subnet = "10.88.0.0/16";
-    }
-    {
-      gateway = "fd00::1:8:1";
-      subnet = "fd00::1:8:0/122";
-    }];
-  };
 }