diff --git a/cni-plugin/integration/run.sh b/cni-plugin/integration/run.sh
index 3b51339a..a99152bd 100755
--- a/cni-plugin/integration/run.sh
+++ b/cni-plugin/integration/run.sh
@@ -60,7 +60,7 @@ function wait_rollout() {
   fi
 }
 
-trap cleanup EXIT
+#trap cleanup EXIT
 
 if k get ns/cni-plugin-test >/dev/null 2>&1 ; then
   echo 'ns/cni-plugin-test already exists' >&2
@@ -94,7 +94,7 @@ k run linkerd-proxy \
     -- \
     /usr/lib/linkerd/linkerd2-network-validator --log-format plain \
     --log-level debug --connect-addr 1.1.1.1:20001 \
-    --listen-addr 0.0.0.0:4140 --timeout 10s
+    --listen-addr 0.0.0.0:4140 --timeout 20s
 
 echo 'PASS: Network Validator'
 
diff --git a/proxy-init/integration/iptables/iptablestest-lab.yaml b/proxy-init/integration/iptables/iptablestest-lab.yaml
index a10726d6..cbc32d5a 100644
--- a/proxy-init/integration/iptables/iptablestest-lab.yaml
+++ b/proxy-init/integration/iptables/iptablestest-lab.yaml
@@ -73,7 +73,7 @@ spec:
   - name: iptables-test
     image: test.l5d.io/linkerd/proxy-init:test
     imagePullPolicy: Never
-    args: ["-p", "8080",  "-o", "8080", "-u", "2102", "-g", "2102", "ipv6", "false"]
+    args: ["-p", "8080",  "-o", "8080", "-u", "2102", "-g", "2102", "--ipv6=false"]
     securityContext:
       allowPrivilegeEscalation: false
       capabilities:
@@ -90,7 +90,7 @@ spec:
   - name: linkerd-init
     image: test.l5d.io/linkerd/proxy-init:test
     imagePullPolicy: Never
-    args: ["-p", "8080",  "-o", "8080", "-u", "2102", "-g", "2102", "ipv6", "false"]
+    args: ["-p", "8080",  "-o", "8080", "-u", "2102", "-g", "2102", "--ipv6=false"]
     securityContext:
       allowPrivilegeEscalation: false
       capabilities:
@@ -144,7 +144,7 @@ spec:
   - name: linkerd-init
     image: test.l5d.io/linkerd/proxy-init:test
     imagePullPolicy: Never
-    args: ["-p", "8080",  "-o", "8080", "-u", "2102", "-g", "2102", "ipv6", "false"]
+    args: ["-p", "8080",  "-o", "8080", "-u", "2102", "-g", "2102", "--ipv6=false"]
     securityContext:
       allowPrivilegeEscalation: false
       capabilities:
@@ -201,7 +201,7 @@ spec:
   - name: linkerd-init
     image: test.l5d.io/linkerd/proxy-init:test
     imagePullPolicy: Never
-    args: ["-p", "8080",  "-o", "8080", "-u", "2102", "-g", "2102", "-r", "9090", "-r", "9099", "ipv6", "false"]
+    args: ["-p", "8080",  "-o", "8080", "-u", "2102", "-g", "2102", "-r", "9090", "-r", "9099", "--ipv6=false"]
     securityContext:
       allowPrivilegeEscalation: false
       capabilities:
@@ -264,7 +264,7 @@ spec:
   - name: linkerd-init
     image: test.l5d.io/linkerd/proxy-init:test
     imagePullPolicy: Never
-    args: ["-p", "8080",  "-o", "8080", "-u", "2102", "-g", "2102", "--inbound-ports-to-ignore", "6000-8000", "ipv6", "false"]
+    args: ["-p", "8080",  "-o", "8080", "-u", "2102", "-g", "2102", "--inbound-ports-to-ignore", "6000-8000", "--ipv6=false"]
     securityContext:
       allowPrivilegeEscalation: false
       capabilities:
@@ -318,7 +318,7 @@ spec:
   - name: linkerd-init
     image: test.l5d.io/linkerd/proxy-init:test
     imagePullPolicy: Never
-    args: ["-p", "8080",  "-o", "8080", "-u", "2102", "-g", "2102", "--subnets-to-ignore", "0.0.0.0/0", "ipv6", "false"]
+    args: ["-p", "8080",  "-o", "8080", "-u", "2102", "-g", "2102", "--subnets-to-ignore", "0.0.0.0/0", "--ipv6=false"]
     securityContext:
       allowPrivilegeEscalation: false
       capabilities: