diff --git a/.github/workflows/bootstrap.yaml b/.github/workflows/bootstrap.yaml
index 9c4b711b24e617e7d74c89332eb6aa66ee6f339a..afe26b7b688863ce29c4097a8b3eff4094e06e9b 100644
--- a/.github/workflows/bootstrap.yaml
+++ b/.github/workflows/bootstrap.yaml
@@ -26,6 +26,9 @@ jobs:
           go-version: 1.16.x
       - name: Setup Kubernetes
         uses: engineerd/setup-kind@v0.5.0
+        with:
+          version: v0.11.1
+          image: kindest/node:v1.21.1@sha256:69860bda5563ac81e3c0057d654b5253219618a22ec3a346306239bba8cfa1a6
       - name: Setup Kustomize
         uses: fluxcd/pkg//actions/kustomize@main
       - name: Build
diff --git a/.github/workflows/e2e-arm64.yaml b/.github/workflows/e2e-arm64.yaml
index 4179b5c0e6ac26472a6683a318c098d5c30bc726..c8d724ea7c3a1bb08fa9552bfb6d46325d8f8288 100644
--- a/.github/workflows/e2e-arm64.yaml
+++ b/.github/workflows/e2e-arm64.yaml
@@ -100,6 +100,7 @@ jobs:
         if: failure()
         run: |
           kubectl --context ${{ steps.prep.outputs.CONTEXT }} -n flux-system get all
+          kubectl --context ${{ steps.prep.outputs.CONTEXT }} -n flux-system describe pods
           /tmp/flux logs --all-namespaces
       - name: Cleanup
         if: always()
diff --git a/.github/workflows/e2e.yaml b/.github/workflows/e2e.yaml
index f5e9b2f2568ef615a6426d24cae640cafd6e2e62..3dadbc35a6889cb689466d9331ff390c110db368 100644
--- a/.github/workflows/e2e.yaml
+++ b/.github/workflows/e2e.yaml
@@ -26,8 +26,8 @@ jobs:
       - name: Setup Kubernetes
         uses: engineerd/setup-kind@v0.5.0
         with:
-          version: "v0.10.0"
-          image: kindest/node:v1.20.2@sha256:8f7ea6e7642c0da54f04a7ee10431549c0257315b3a634f6ef2fecaaedb19bab
+          version: v0.11.1
+          image: kindest/node:v1.21.1@sha256:69860bda5563ac81e3c0057d654b5253219618a22ec3a346306239bba8cfa1a6
           config: .github/kind/config.yaml # disable KIND-net
       - name: Setup Calico for network policy
         run: |
@@ -211,6 +211,7 @@ jobs:
         run: |
           kubectl version --client --short
           kubectl -n flux-system get all
+          kubectl -n flux-system describe pods
           kubectl -n flux-system get kustomizations -oyaml
           kubectl -n flux-system logs deploy/source-controller
           kubectl -n flux-system logs deploy/kustomize-controller