diff --git a/docker-compose.yml b/docker-compose.yml
index 28b855f32..9732b5f24 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -416,6 +416,7 @@ services:
     pid: host
     network_mode: host
     privileged: true
+    restart: on-failure
     command:
       - sh
       - -c
@@ -427,7 +428,8 @@ services:
         # Safe to attach to all veth interfaces on the host
         for dev in $$VETHS; do
           echo "Attaching XDP to: $$dev"
-          ip link set dev $$dev xdpdrv obj /xdp/xdp_pass.o sec xdp 2>/dev/null
+          ip link set dev $$dev xdpdrv off # Clear any existing XDP program.
+          ip link set dev $$dev xdpdrv obj /xdp/xdp_pass.o sec xdp
         done
 
         echo "Done configuring $$(echo "$$VETHS" | wc -w) veth interfaces"