diff --git a/.drone.jsonnet b/.drone.jsonnet
index a76aa5524..04e9c96d0 100644
--- a/.drone.jsonnet
+++ b/.drone.jsonnet
@@ -441,7 +441,14 @@ local creds_env_vars = {
   PACKET_AUTH_TOKEN: {from_secret: "packet_auth_token"},
 };
 
-local capi_docker = Step("e2e-docker", depends_on=[load_artifacts], target="e2e-docker", environment={"SHORT_INTEGRATION_TEST": "yes", "IMAGE_REGISTRY": local_registry});
+local capi_docker = Step("e2e-docker", depends_on=[load_artifacts], target="e2e-docker", environment={
+  "IMAGE_REGISTRY": local_registry,
+  "SHORT_INTEGRATION_TEST": "yes",
+
+  # See https://github.com/talos-systems/talos/issues/4046
+  "K8S_VERSION": "1.21.3",
+  "INTEGRATION_TEST_RUN": "XXX",
+});
 local e2e_capi = Step("e2e-capi", depends_on=[capi_docker], environment=creds_env_vars);
 local e2e_aws = Step("e2e-aws", depends_on=[e2e_capi], environment=creds_env_vars);
 local e2e_azure = Step("e2e-azure", depends_on=[e2e_capi], environment=creds_env_vars);
diff --git a/hack/test/e2e-capi.sh b/hack/test/e2e-capi.sh
index b97b297ee..047f6bb9f 100755
--- a/hack/test/e2e-capi.sh
+++ b/hack/test/e2e-capi.sh
@@ -4,10 +4,10 @@ set -eou pipefail
 
 source ./hack/test/e2e.sh
 
-export CAPI_VERSION="0.3.19"
+export CAPI_VERSION="0.3.22"
 export CABPT_VERSION="0.2.0"
-export CACPPT_VERSION="0.1.0"
-export CAPA_VERSION="0.6.5"
+export CACPPT_VERSION="0.1.1"
+export CAPA_VERSION="0.6.8"
 export CAPG_VERSION="0.3.1"
 
 # We need to override this here since e2e.sh will set it to ${TMP}/capi/kubeconfig.
diff --git a/hack/test/e2e-docker.sh b/hack/test/e2e-docker.sh
index 2be0d9dde..1f519657e 100755
--- a/hack/test/e2e-docker.sh
+++ b/hack/test/e2e-docker.sh
@@ -11,14 +11,15 @@ function create_cluster {
   build_registry_mirrors
 
   "${TALOSCTL}" cluster create \
-    --provisioner "${PROVISIONER}" \
-    --name "${CLUSTER_NAME}" \
-    --image "${IMAGE}" \
+    --provisioner="${PROVISIONER}" \
+    --name="${CLUSTER_NAME}" \
+    --kubernetes-version=${K8S_VERSION} \
+    --image="${IMAGE}" \
     --masters=1 \
     --workers=1 \
-    --mtu 1450 \
-    --memory 2048 \
-    --cpus 2.0 \
+    --mtu=1450 \
+    --memory=2048 \
+    --cpus=2.0 \
     --with-init-node=false \
     --docker-host-ip=127.0.0.1 \
     --endpoint=127.0.0.1 \
diff --git a/hack/test/e2e-firecracker.sh b/hack/test/e2e-firecracker.sh
index a632a7013..2383a6b55 100755
--- a/hack/test/e2e-firecracker.sh
+++ b/hack/test/e2e-firecracker.sh
@@ -35,14 +35,15 @@ function create_cluster {
   build_registry_mirrors
 
   "${TALOSCTL}" cluster create \
-    --provisioner "${PROVISIONER}" \
-    --name "${CLUSTER_NAME}" \
+    --provisioner="${PROVISIONER}" \
+    --name="${CLUSTER_NAME}" \
+    --kubernetes-version=${K8S_VERSION} \
     --masters=3 \
-    --mtu 1450 \
-    --memory 2048 \
-    --cpus 2.0 \
-    --cidr 172.20.0.0/24 \
-    --install-image ${REGISTRY:-ghcr.io}/talos-systems/installer:${INSTALLER_TAG} \
+    --mtu=1450 \
+    --memory=2048 \
+    --cpus=2.0 \
+    --cidr=172.20.0.0/24 \
+    --install-image=${REGISTRY:-ghcr.io}/talos-systems/installer:${INSTALLER_TAG} \
     --with-init-node=false \
     --crashdump \
     ${REGISTRY_MIRROR_FLAGS} \
diff --git a/hack/test/e2e-iso.sh b/hack/test/e2e-iso.sh
index c508da134..01e40e3fc 100755
--- a/hack/test/e2e-iso.sh
+++ b/hack/test/e2e-iso.sh
@@ -13,18 +13,19 @@ function create_cluster {
   build_registry_mirrors
 
   "${TALOSCTL}" cluster create \
+    --provisioner="${PROVISIONER}" \
+    --name="${CLUSTER_NAME}" \
+    --kubernetes-version=${K8S_VERSION} \
     --iso-path=${ARTIFACTS}/talos-amd64.iso \
-    --provisioner "${PROVISIONER}" \
-    --name "${CLUSTER_NAME}" \
     --masters=1 \
     --workers=0 \
-    --mtu 1450 \
-    --memory 2048 \
-    --cpus 2.0 \
-    --cidr 172.20.2.0/24 \
+    --mtu=1450 \
+    --memory=2048 \
+    --cpus=2.0 \
+    --cidr=172.20.2.0/24 \
     --with-apply-config \
-    --install-image ${REGISTRY:-ghcr.io}/talos-systems/installer:${TAG} \
-    --cni-bundle-url ${ARTIFACTS}/talosctl-cni-bundle-'${ARCH}'.tar.gz \
+    --install-image=${REGISTRY:-ghcr.io}/talos-systems/installer:${TAG} \
+    --cni-bundle-url=${ARTIFACTS}/talosctl-cni-bundle-'${ARCH}'.tar.gz \
     ${REGISTRY_MIRROR_FLAGS}
 
   "${TALOSCTL}" config node "${NODE}"
diff --git a/hack/test/e2e-qemu.sh b/hack/test/e2e-qemu.sh
index 07cf2e330..2d10ece41 100755
--- a/hack/test/e2e-qemu.sh
+++ b/hack/test/e2e-qemu.sh
@@ -64,19 +64,20 @@ function create_cluster {
   build_registry_mirrors
 
   "${TALOSCTL}" cluster create \
-    --provisioner "${PROVISIONER}" \
-    --name "${CLUSTER_NAME}" \
+    --provisioner="${PROVISIONER}" \
+    --name="${CLUSTER_NAME}" \
+    --kubernetes-version=${K8S_VERSION} \
     --masters=3 \
     --workers="${QEMU_WORKERS:-1}" \
-    --mtu 1450 \
-    --memory 2048 \
-    --cpus "${QEMU_CPUS:-2}" \
-    --cidr 172.20.1.0/24 \
-    --user-disk /var/lib/extra:100MB \
-    --user-disk /var/lib/p1:100MB:/var/lib/p2:100MB \
-    --install-image ${INSTALLER_IMAGE} \
+    --mtu=1450 \
+    --memory=2048 \
+    --cpus="${QEMU_CPUS:-2}" \
+    --cidr=172.20.1.0/24 \
+    --user-disk=/var/lib/extra:100MB \
+    --user-disk=/var/lib/p1:100MB:/var/lib/p2:100MB \
+    --install-image=${INSTALLER_IMAGE} \
     --with-init-node=false \
-    --cni-bundle-url ${ARTIFACTS}/talosctl-cni-bundle-'${ARCH}'.tar.gz \
+    --cni-bundle-url=${ARTIFACTS}/talosctl-cni-bundle-'${ARCH}'.tar.gz \
     --crashdump \
     ${DISK_IMAGE_FLAG} \
     ${DISK_ENCRYPTION_FLAG} \
diff --git a/hack/test/e2e.sh b/hack/test/e2e.sh
index ab2f960b5..db2080e33 100755
--- a/hack/test/e2e.sh
+++ b/hack/test/e2e.sh
@@ -31,7 +31,7 @@ export TALOS_VERSION=v0.11
 # Kubernetes
 
 export KUBECONFIG="${TMP}/kubeconfig"
-export K8S_VERSION=1.22.0
+export K8S_VERSION=${K8S_VERSION:-1.22.0}
 
 # Sonobuoy