diff --git a/hosts/fw.cloonar.com/modules/podman.nix b/hosts/fw.cloonar.com/modules/podman.nix
index 274b603..ed1e23a 100644
--- a/hosts/fw.cloonar.com/modules/podman.nix
+++ b/hosts/fw.cloonar.com/modules/podman.nix
@@ -25,27 +25,26 @@ in {
     };
   };
 
-  systemd.sockets."nv-proxy" = {
-    description = "DHCP Client for netavark";
+  systemd.sockets."netavark-dhcp-proxy" = {
+    description = "Netavark DHCP proxy socket";
     socketConfig = {
-      ListenStream = "/run/podman/nv-proxy.sock";
-      SocketMode = 0600;
+      ListenStream = "%t/podman/nv-proxy.sock";
+      SocketMode = 0660;
     };
     wantedBy = [ "sockets.target" ];
   };
 
-  systemd.services."nv-proxy" = {
-    description = "DHCP Client netavark Service";
-    after = [ "nv-proxy.socket" ];
-    requires = [ "nv-proxy.socket" ];
-    wantedBy = [ "multi-user.target" "nv-proxy.socket" ];
+  systemd.services."netavark-dhcp-proxy" = {
+    description = "Netavark DHCP proxy service";
+    after = [ "netavark-dhcp-proxy.socket" ];
+    requires = [ "netavark-dhcp-proxy.socket" ];
+    wantedBy = [ "multi-user.target" "netavark-dhcp-proxy.socket" ];
     path = [ pkgs.netavark ];
+    startLimitIntervalSec = 0;
 
     serviceConfig = {
-      Type = "simple";
-      ExecStart= "${pkgs.netavark}/bin/netavark-dhcp-proxy-client";
-      TimeoutStopSec = 30;
-      KillMode = "process";
+      Type = "exec";
+      ExecStart= "${pkgs.netavark}/bin/netavark dhcp-proxy -a 30";
     };
   };
 }