diff --git a/.drone.yml b/.drone.yml
index 55de85164aac..340cdfaf66cd 100644
--- a/.drone.yml
+++ b/.drone.yml
@@ -579,6 +579,12 @@ platform:
   os: linux
   arch: amd64
 
+clone:
+  retries: 3
+
+depends_on:
+- amd64
+
 steps:
 - name: build-e2e-image
   image: rancher/dapper:v0.5.0
@@ -604,7 +610,8 @@ steps:
   - mkdir -p dist/artifacts
   - cp /tmp/artifacts/* dist/artifacts/
   - docker stop registry && docker rm registry
-  # Cleanup any VMs running, happens if a previous test panics
+  # Cleanup VMs running, happens if a previous test panics
+  # Cleanup inactive domains, happens if previous test is canceled
   - |
     VMS=$(virsh list --name | grep '_server-\|_agent-' || true)
     if [ -n "$VMS" ]; then
@@ -614,6 +621,13 @@ steps:
         virsh undefine $vm --remove-all-storage
       done
     fi 
+    VMS=$(virsh list --name --inactive | grep '_server-\|_agent-' || true)
+    if [ -n "$VMS" ]; then
+      for vm in $VMS
+      do
+        virsh undefine $vm
+      done
+    fi 
   - docker run -d -p 5000:5000 -e REGISTRY_PROXY_REMOTEURL=https://registry-1.docker.io --name registry registry:2
   - cd tests/e2e/validatecluster
   - vagrant destroy -f
diff --git a/.github/workflows/cgroup.yaml b/.github/workflows/cgroup.yaml
index 3173afb7be76..9b54b0746911 100644
--- a/.github/workflows/cgroup.yaml
+++ b/.github/workflows/cgroup.yaml
@@ -57,6 +57,11 @@ jobs:
         run: vagrant plugin install vagrant-k3s vagrant-reload
       - name: "Vagrant Up"
         run: vagrant up
+      - name: On Failure, Dump VM logs
+        if: ${{ failure() }}
+        run: |
+          logsDir=$(vboxmanage list vms --long | grep Logs | awk '{print $3" "$4}')
+          cat "$logsDir"/VBox.log
       - name: "K3s Prepare"
         run: vagrant provision --provision-with=k3s-prepare
       - name: ⏬ "K3s Install"
diff --git a/.github/workflows/snapshotter.yaml b/.github/workflows/snapshotter.yaml
index 9470fff7aff1..72078e9e6eaf 100644
--- a/.github/workflows/snapshotter.yaml
+++ b/.github/workflows/snapshotter.yaml
@@ -59,6 +59,11 @@ jobs:
         run: vagrant plugin install vagrant-k3s
       - name: "Vagrant Up ⏩ Install K3s"
         run: vagrant up
+      - name: On Failure, Dump VM logs
+        if: ${{ failure() }}
+        run: |
+          logsDir=$(vboxmanage list vms --long | grep Logs | awk '{print $3" "$4}')
+          cat "$logsDir"/VBox.log
       - name: "⏳ Node"
         run: vagrant provision --provision-with=k3s-wait-for-node
       - name: "⏳ CoreDNS"
diff --git a/docs/adrs/add-dual-stack-support-to-netpol-agent.md b/docs/adrs/add-dual-stack-support-to-netpol-agent.md
index f9e1efc7c53d..e5fd186d301e 100644
--- a/docs/adrs/add-dual-stack-support-to-netpol-agent.md
+++ b/docs/adrs/add-dual-stack-support-to-netpol-agent.md
@@ -36,7 +36,7 @@ The motivation behind keeping a fork is that:
 
 * upstream might ask for implementing dual-stack in all kube-router
   components (which would be understandable)
-* acceepting a solution upstream might take long time
+* accepting a solution upstream might take long time
 
 Our fork of kube-router is going to be used as a vendored library inside k3s
 code. And the currently copied code in k3s in `pkg/agent/netpol` is going to