diff --git a/contrib/bundle/test-e2e b/contrib/bundle/test-e2e
index 996e61b70bb..49e822c5eb7 100755
--- a/contrib/bundle/test-e2e
+++ b/contrib/bundle/test-e2e
@@ -7,6 +7,19 @@ if [[ $EUID -ne 0 ]]; then
     exit 1
 fi
 
+# Bypass local DNS
+sudo ln -sf /run/systemd/resolve/resolv.conf /etc/resolv.conf
+
+# Prepare the system
+ufw disable
+ip6tables --list >/dev/null
+iptables -F
+sysctl -w net.ipv4.conf.all.route_localnet=1
+sysctl -w net.ipv4.ip_forward=1
+sysctl -w net.bridge.bridge-nf-call-iptables=1
+sysctl -w fs.inotify.max_user_watches=1048576
+iptables -t nat -I POSTROUTING -s 127.0.0.0/8 ! -d 127.0.0.0/8 -j MASQUERADE
+
 # Assume we're running on this arch
 ARCH=amd64
 
@@ -82,7 +95,6 @@ echo "Using IP: $IP"
 export DNS_SERVER_IP=$IP
 export API_HOST_IP=$IP
 
-iptables -F
 hack/install-etcd.sh
 export PATH="$GOPATH/src/k8s.io/kubernetes/third_party/etcd:$PATH"
 
diff --git a/go.sum b/go.sum
index 6da41013132..f9a3522194d 100644
--- a/go.sum
+++ b/go.sum
@@ -92,7 +92,6 @@ github.com/Microsoft/go-winio v0.4.15-0.20190919025122-fc70bd9a86b5/go.mod h1:tT
 github.com/Microsoft/go-winio v0.4.15/go.mod h1:tTuCMEN+UleMWgg9dVx4Hu52b1bJo+59jBh3ajtinzw=
 github.com/Microsoft/go-winio v0.4.16-0.20201130162521-d1ffc52c7331/go.mod h1:XB6nPKklQyQ7GC9LdcBEcBl8PF76WugXOPRXwdLnMv0=
 github.com/Microsoft/go-winio v0.4.16/go.mod h1:XB6nPKklQyQ7GC9LdcBEcBl8PF76WugXOPRXwdLnMv0=
-github.com/Microsoft/go-winio v0.4.17-0.20210211115548-6eac466e5fa3 h1:mw6pDQqv38/WGF1cO/jF5t/jyAJ2yi7CmtFLLO5tGFI=
 github.com/Microsoft/go-winio v0.4.17-0.20210211115548-6eac466e5fa3/go.mod h1:JPGBdM1cNvN/6ISo+n8V5iA4v8pBzdOpzfwIujj1a84=
 github.com/Microsoft/go-winio v0.4.17-0.20210324224401-5516f17a5958/go.mod h1:JPGBdM1cNvN/6ISo+n8V5iA4v8pBzdOpzfwIujj1a84=
 github.com/Microsoft/go-winio v0.4.17 h1:iT12IBVClFevaf8PuVyi3UmZOVh4OqnaLxDTW2O6j3w=
@@ -104,7 +103,6 @@ github.com/Microsoft/hcsshim v0.8.9/go.mod h1:5692vkUqntj1idxauYlpoINNKeqCiG6Sg3
 github.com/Microsoft/hcsshim v0.8.10-0.20200715222032-5eafd1556990/go.mod h1:ay/0dTb7NsG8QMDfsRfLHgZo/6xAJShLe1+ePPflihk=
 github.com/Microsoft/hcsshim v0.8.14/go.mod h1:NtVKoYxQuTLx6gEq0L96c9Ju4JbRJ4nY2ow3VK6a9Lg=
 github.com/Microsoft/hcsshim v0.8.15/go.mod h1:x38A4YbHbdxJtc0sF6oIz+RG0npwSCAvn69iY6URG00=
-github.com/Microsoft/hcsshim v0.8.16 h1:8/auA4LFIZFTGrqfKhGBSXwM6/4X1fHa/xniyEHu8ac=
 github.com/Microsoft/hcsshim v0.8.16/go.mod h1:o5/SZqmR7x9JNKsW3pu+nqHm0MF8vbA+VxGOoXdC600=
 github.com/Microsoft/hcsshim v0.8.17 h1:yFHH5bghP9ij5Y34PPaMOE8g//oXZ0uJQeMENVo2zcI=
 github.com/Microsoft/hcsshim v0.8.17/go.mod h1:+w2gRZ5ReXQhFOrvSQeNfhrYB/dg3oDwTOcER2fw4I4=
@@ -213,7 +211,6 @@ github.com/chzyer/test v0.0.0-20180213035817-a1ea475d72b1/go.mod h1:Q3SI9o4m/ZMn
 github.com/cilium/ebpf v0.0.0-20200110133405-4032b1d8aae3/go.mod h1:MA5e5Lr8slmEg9bt0VpxxWqJlO4iwu3FBdHUzV7wQVg=
 github.com/cilium/ebpf v0.0.0-20200507155900-a9f01edf17e3/go.mod h1:XT+cAw5wfvsodedcijoh1l9cf7v1x9FlFB/3VmF/O8s=
 github.com/cilium/ebpf v0.0.0-20200702112145-1c8d4c9ef775/go.mod h1:7cR51M8ViRLIdUjrmSXlK9pkrsDlLHbO8jiB8X8JnOc=
-github.com/cilium/ebpf v0.2.0 h1:Fv93L3KKckEcEHR3oApXVzyBTDA8WAm6VXhPE00N3f8=
 github.com/cilium/ebpf v0.2.0/go.mod h1:To2CFviqOWL/M0gIMsvSMlqe7em/l1ALkX1PyjrX2Qs=
 github.com/cilium/ebpf v0.4.0/go.mod h1:4tRaxcgiL706VnOzHOdBlY8IEAIdxINsQBcU4xJJXRs=
 github.com/cilium/ebpf v0.5.0 h1:E1KshmrMEtkMP2UjlWzfmUV1owWY+BnbL5FxxuatnrU=
diff --git a/internal/resourcestore/resourcecleaner_test.go b/internal/resourcestore/resourcecleaner_test.go
index 54048ad93d0..3511d5598f0 100644
--- a/internal/resourcestore/resourcecleaner_test.go
+++ b/internal/resourcestore/resourcecleaner_test.go
@@ -79,27 +79,4 @@ var _ = t.Describe("ResourceCleaner", func() {
 		Expect(err).NotTo(BeNil())
 		Expect(failureCnt).To(Equal(3))
 	})
-
-	It("should run in parallel", func() {
-		// Given
-		sut := resourcestore.NewResourceCleaner()
-		testChan := make(chan bool, 1)
-		succ := false
-		sut.Add(context.Background(), "test1", func() error {
-			testChan <- true
-			return nil
-		})
-		sut.Add(context.Background(), "test2", func() error {
-			<-testChan
-			succ = true
-			return nil
-		})
-
-		// When
-		err := sut.Cleanup()
-
-		// Then
-		Expect(err).To(BeNil())
-		Expect(succ).To(BeTrue())
-	})
 })
diff --git a/scripts/versions b/scripts/versions
index b1d77d3a43e..cedef947ad2 100755
--- a/scripts/versions
+++ b/scripts/versions
@@ -7,7 +7,7 @@ declare -A VERSIONS=(
     ["conmon"]=v2.0.26
     ["cri-tools"]=v1.21.0
     ["runc"]=v1.0.0-rc93
-    ["crun"]=0.18
+    ["crun"]=0.20
     ["bats"]=v1.3.0
 )
 export VERSIONS