diff --git a/.prow.yaml b/.prow.yaml
index dc2e12248..52493ac2b 100644
--- a/.prow.yaml
+++ b/.prow.yaml
@@ -116,9 +116,9 @@ presubmits:
             limits:
               memory: 2Gi
   #########################################################
-  # E2E/Conformance tests (AWS, 1.18-1.21)
+  # E2E/Conformance tests (AWS, 1.19-1.22)
   #########################################################
-  - name: pull-kubeone-e2e-aws-containerd-conformance-1.18
+  - name: pull-kubeone-e2e-aws-containerd-conformance-1.19
     run_if_changed: "(pkg/|examples/terraform/aws|hack/|test/|addons/)"
     decorate: true
     clone_uri: "ssh://git@github.com/kubermatic/kubeone.git"
@@ -127,7 +127,7 @@ presubmits:
       preset-aws: "true"
     spec:
       containers:
-        - image: kubermatic/kubeone-e2e:v0.1.16
+        - image: kubermatic/kubeone-e2e:v0.1.17
           imagePullPolicy: Always
           command:
             - make
@@ -141,13 +141,13 @@ presubmits:
             - name: TF_VAR_initial_machinedeployment_spotinstances
               value: "true"
             - name: TEST_CLUSTER_TARGET_VERSION
-              value: "1.18.20"
+              value: "1.19.14"
             - name: KUBEONE_TEST_RUN
               value: "TestClusterConformance"
           resources:
             requests:
               cpu: 1
-  - name: pull-kubeone-e2e-aws-flatcar-containerd-conformance-1.18
+  - name: pull-kubeone-e2e-aws-flatcar-containerd-conformance-1.19
     run_if_changed: "(pkg/|examples/terraform/aws|hack/|test/|addons/)"
     decorate: true
     clone_uri: "ssh://git@github.com/kubermatic/kubeone.git"
@@ -156,7 +156,7 @@ presubmits:
       preset-aws: "true"
     spec:
       containers:
-        - image: kubermatic/kubeone-e2e:v0.1.16
+        - image: kubermatic/kubeone-e2e:v0.1.17
           imagePullPolicy: Always
           command:
             - make
@@ -167,6 +167,8 @@ presubmits:
               value: "aws"
             - name: CONTAINER_RUNTIME
               value: containerd
+            - name: TF_VAR_worker_deploy_ssh_key
+              value: "false"
             - name: TEST_OS_CONTROL_PLANE
               value: "flatcar"
             - name: TEST_OS_WORKERS
@@ -176,7 +178,7 @@ presubmits:
             - name: TF_VAR_bastion_user
               value: "core"
             - name: TEST_CLUSTER_TARGET_VERSION
-              value: "1.18.20"
+              value: "1.19.14"
             - name: KUBEONE_TEST_RUN
               value: "TestClusterConformance"
           resources:
@@ -191,7 +193,7 @@ presubmits:
       preset-aws: "true"
     spec:
       containers:
-        - image: kubermatic/kubeone-e2e:v0.1.16
+        - image: kubermatic/kubeone-e2e:v0.1.17
           imagePullPolicy: Always
           command:
             - make
@@ -203,7 +205,7 @@ presubmits:
             - name: TF_VAR_initial_machinedeployment_spotinstances
               value: "true"
             - name: TEST_CLUSTER_TARGET_VERSION
-              value: "1.19.12"
+              value: "1.19.14"
             - name: KUBEONE_TEST_RUN
               value: "TestClusterConformance"
           resources:
@@ -218,7 +220,7 @@ presubmits:
       preset-aws: "true"
     spec:
       containers:
-        - image: kubermatic/kubeone-e2e:v0.1.16
+        - image: kubermatic/kubeone-e2e:v0.1.17
           imagePullPolicy: Always
           command:
             - make
@@ -230,7 +232,7 @@ presubmits:
             - name: TF_VAR_initial_machinedeployment_spotinstances
               value: "true"
             - name: TEST_CLUSTER_TARGET_VERSION
-              value: "1.20.8"
+              value: "1.20.10"
             - name: KUBEONE_TEST_RUN
               value: "TestClusterConformance"
           resources:
@@ -245,7 +247,7 @@ presubmits:
       preset-aws: "true"
     spec:
       containers:
-        - image: kubermatic/kubeone-e2e:v0.1.16
+        - image: kubermatic/kubeone-e2e:v0.1.17
           imagePullPolicy: Always
           command:
             - make
@@ -255,14 +257,41 @@ presubmits:
             - name: PROVIDER
               value: "aws"
             - name: TEST_CLUSTER_TARGET_VERSION
-              value: "1.21.2"
+              value: "1.21.4"
+            - name: KUBEONE_TEST_RUN
+              value: "TestClusterConformance"
+          resources:
+            requests:
+              cpu: 1
+  - name: pull-kubeone-e2e-aws-conformance-1.22
+    run_if_changed: "(pkg/|examples/terraform/aws|hack/|test/|addons/)"
+    decorate: true
+    clone_uri: "ssh://git@github.com/kubermatic/kubeone.git"
+    labels:
+      preset-goproxy: "true"
+      preset-aws: "true"
+    spec:
+      containers:
+        - image: kubermatic/kubeone-e2e:v0.1.17
+          imagePullPolicy: Always
+          command:
+            - make
+          args:
+            - e2e-test
+          env:
+            - name: PROVIDER
+              value: "aws"
+            - name: CONTAINER_RUNTIME
+              value: containerd
+            - name: TEST_CLUSTER_TARGET_VERSION
+              value: "1.22.0"
             - name: KUBEONE_TEST_RUN
               value: "TestClusterConformance"
           resources:
             requests:
               cpu: 1
   #########################################################
-  # E2E/Conformance tests (DigitalOcean, 1.19-1.21)
+  # E2E/Conformance tests (DigitalOcean, 1.19-1.22)
   #########################################################
   - name: pull-kubeone-e2e-digitalocean-conformance-1.19
     always_run: false
@@ -273,7 +302,7 @@ presubmits:
       preset-digitalocean: "true"
     spec:
       containers:
-        - image: kubermatic/kubeone-e2e:v0.1.16
+        - image: kubermatic/kubeone-e2e:v0.1.17
           imagePullPolicy: Always
           command:
             - make
@@ -283,7 +312,7 @@ presubmits:
             - name: PROVIDER
               value: "digitalocean"
             - name: TEST_CLUSTER_TARGET_VERSION
-              value: "1.19.12"
+              value: "1.19.14"
             - name: KUBEONE_TEST_RUN
               value: "TestClusterConformance"
           resources:
@@ -298,7 +327,7 @@ presubmits:
       preset-digitalocean: "true"
     spec:
       containers:
-        - image: kubermatic/kubeone-e2e:v0.1.16
+        - image: kubermatic/kubeone-e2e:v0.1.17
           imagePullPolicy: Always
           command:
             - make
@@ -308,7 +337,7 @@ presubmits:
             - name: PROVIDER
               value: "digitalocean"
             - name: TEST_CLUSTER_TARGET_VERSION
-              value: "1.20.8"
+              value: "1.20.10"
             - name: KUBEONE_TEST_RUN
               value: "TestClusterConformance"
           resources:
@@ -323,7 +352,7 @@ presubmits:
       preset-digitalocean: "true"
     spec:
       containers:
-        - image: kubermatic/kubeone-e2e:v0.1.16
+        - image: kubermatic/kubeone-e2e:v0.1.17
           imagePullPolicy: Always
           command:
             - make
@@ -333,14 +362,41 @@ presubmits:
             - name: PROVIDER
               value: "digitalocean"
             - name: TEST_CLUSTER_TARGET_VERSION
-              value: "1.21.2"
+              value: "1.21.4"
+            - name: KUBEONE_TEST_RUN
+              value: "TestClusterConformance"
+          resources:
+            requests:
+              cpu: 1
+  - name: pull-kubeone-e2e-digitalocean-conformance-1.22
+    always_run: false
+    decorate: true
+    clone_uri: "ssh://git@github.com/kubermatic/kubeone.git"
+    labels:
+      preset-goproxy: "true"
+      preset-digitalocean: "true"
+    spec:
+      containers:
+        - image: kubermatic/kubeone-e2e:v0.1.17
+          imagePullPolicy: Always
+          command:
+            - make
+          args:
+            - e2e-test
+          env:
+            - name: PROVIDER
+              value: "digitalocean"
+            - name: CONTAINER_RUNTIME
+              value: containerd
+            - name: TEST_CLUSTER_TARGET_VERSION
+              value: "1.22.0"
             - name: KUBEONE_TEST_RUN
               value: "TestClusterConformance"
           resources:
             requests:
               cpu: 1
   #########################################################
-  # E2E/Conformance tests (Hetzner, 1.19-1.21)
+  # E2E/Conformance tests (Hetzner, 1.19-1.22)
   #########################################################
   - name: pull-kubeone-e2e-hetzner-conformance-1.19
     always_run: false
@@ -351,7 +407,7 @@ presubmits:
       preset-hetzner: "true"
     spec:
       containers:
-        - image: kubermatic/kubeone-e2e:v0.1.16
+        - image: kubermatic/kubeone-e2e:v0.1.17
           imagePullPolicy: Always
           command:
             - make
@@ -361,7 +417,7 @@ presubmits:
             - name: PROVIDER
               value: "hetzner"
             - name: TEST_CLUSTER_TARGET_VERSION
-              value: "1.19.12"
+              value: "1.19.14"
             - name: KUBEONE_TEST_RUN
               value: "TestClusterConformance"
           resources:
@@ -376,7 +432,7 @@ presubmits:
       preset-hetzner: "true"
     spec:
       containers:
-        - image: kubermatic/kubeone-e2e:v0.1.16
+        - image: kubermatic/kubeone-e2e:v0.1.17
           imagePullPolicy: Always
           command:
             - make
@@ -386,7 +442,7 @@ presubmits:
             - name: PROVIDER
               value: "hetzner"
             - name: TEST_CLUSTER_TARGET_VERSION
-              value: "1.20.8"
+              value: "1.20.10"
             - name: KUBEONE_TEST_RUN
               value: "TestClusterConformance"
           resources:
@@ -401,7 +457,32 @@ presubmits:
       preset-hetzner: "true"
     spec:
       containers:
-        - image: kubermatic/kubeone-e2e:v0.1.16
+        - image: kubermatic/kubeone-e2e:v0.1.17
+          imagePullPolicy: Always
+          command:
+            - make
+          args:
+            - e2e-test
+          env:
+            - name: PROVIDER
+              value: "hetzner"
+            - name: TEST_CLUSTER_TARGET_VERSION
+              value: "1.21.4"
+            - name: KUBEONE_TEST_RUN
+              value: "TestClusterConformance"
+          resources:
+            requests:
+              cpu: 1
+  - name: pull-kubeone-e2e-hetzner-conformance-1.22
+    always_run: false
+    decorate: true
+    clone_uri: "ssh://git@github.com/kubermatic/kubeone.git"
+    labels:
+      preset-goproxy: "true"
+      preset-hetzner: "true"
+    spec:
+      containers:
+        - image: kubermatic/kubeone-e2e:v0.1.17
           imagePullPolicy: Always
           command:
             - make
@@ -410,15 +491,17 @@ presubmits:
           env:
             - name: PROVIDER
               value: "hetzner"
+            - name: CONTAINER_RUNTIME
+              value: containerd
             - name: TEST_CLUSTER_TARGET_VERSION
-              value: "1.21.2"
+              value: "1.22.0"
             - name: KUBEONE_TEST_RUN
               value: "TestClusterConformance"
           resources:
             requests:
               cpu: 1
   #########################################################
-  # E2E/Conformance tests (GCE, 1.19-1.21)
+  # E2E/Conformance tests (GCE, 1.19-1.22)
   #########################################################
   - name: pull-kubeone-e2e-gce-conformance-1.19
     always_run: false
@@ -429,7 +512,7 @@ presubmits:
       preset-gce: "true"
     spec:
       containers:
-        - image: kubermatic/kubeone-e2e:v0.1.16
+        - image: kubermatic/kubeone-e2e:v0.1.17
           imagePullPolicy: Always
           command:
             - make
@@ -439,7 +522,7 @@ presubmits:
             - name: PROVIDER
               value: "gce"
             - name: TEST_CLUSTER_TARGET_VERSION
-              value: "1.19.12"
+              value: "1.19.14"
             - name: KUBEONE_TEST_RUN
               value: "TestClusterConformance"
             - name: TF_VAR_project
@@ -456,7 +539,7 @@ presubmits:
       preset-gce: "true"
     spec:
       containers:
-        - image: kubermatic/kubeone-e2e:v0.1.16
+        - image: kubermatic/kubeone-e2e:v0.1.17
           imagePullPolicy: Always
           command:
             - make
@@ -466,7 +549,7 @@ presubmits:
             - name: PROVIDER
               value: "gce"
             - name: TEST_CLUSTER_TARGET_VERSION
-              value: "1.20.8"
+              value: "1.20.10"
             - name: KUBEONE_TEST_RUN
               value: "TestClusterConformance"
             - name: TF_VAR_project
@@ -483,7 +566,34 @@ presubmits:
       preset-gce: "true"
     spec:
       containers:
-        - image: kubermatic/kubeone-e2e:v0.1.16
+        - image: kubermatic/kubeone-e2e:v0.1.17
+          imagePullPolicy: Always
+          command:
+            - make
+          args:
+            - e2e-test
+          env:
+            - name: PROVIDER
+              value: "gce"
+            - name: TEST_CLUSTER_TARGET_VERSION
+              value: "1.21.4"
+            - name: KUBEONE_TEST_RUN
+              value: "TestClusterConformance"
+            - name: TF_VAR_project
+              value: "kubeone-terraform-test"
+          resources:
+            requests:
+              cpu: 1
+  - name: pull-kubeone-e2e-gce-conformance-1.22
+    always_run: false
+    decorate: true
+    clone_uri: "ssh://git@github.com/kubermatic/kubeone.git"
+    labels:
+      preset-goproxy: "true"
+      preset-gce: "true"
+    spec:
+      containers:
+        - image: kubermatic/kubeone-e2e:v0.1.17
           imagePullPolicy: Always
           command:
             - make
@@ -492,8 +602,10 @@ presubmits:
           env:
             - name: PROVIDER
               value: "gce"
+            - name: CONTAINER_RUNTIME
+              value: containerd
             - name: TEST_CLUSTER_TARGET_VERSION
-              value: "1.21.2"
+              value: "1.22.0"
             - name: KUBEONE_TEST_RUN
               value: "TestClusterConformance"
             - name: TF_VAR_project
@@ -502,7 +614,7 @@ presubmits:
             requests:
               cpu: 1
   #########################################################
-  # E2E/Conformance tests (Packet, 1.19-1.21)
+  # E2E/Conformance tests (Packet, 1.19-1.22)
   #########################################################
   - name: pull-kubeone-e2e-packet-conformance-1.19
     always_run: false
@@ -513,7 +625,7 @@ presubmits:
       preset-packet: "true"
     spec:
       containers:
-        - image: kubermatic/kubeone-e2e:v0.1.16
+        - image: kubermatic/kubeone-e2e:v0.1.17
           imagePullPolicy: Always
           command:
             - make
@@ -523,7 +635,7 @@ presubmits:
             - name: PROVIDER
               value: "packet"
             - name: TEST_CLUSTER_TARGET_VERSION
-              value: "1.19.12"
+              value: "1.19.14"
             - name: KUBEONE_TEST_RUN
               value: "TestClusterConformance"
           resources:
@@ -538,7 +650,7 @@ presubmits:
       preset-packet: "true"
     spec:
       containers:
-        - image: kubermatic/kubeone-e2e:v0.1.16
+        - image: kubermatic/kubeone-e2e:v0.1.17
           imagePullPolicy: Always
           command:
             - make
@@ -548,7 +660,7 @@ presubmits:
             - name: PROVIDER
               value: "packet"
             - name: TEST_CLUSTER_TARGET_VERSION
-              value: "1.20.8"
+              value: "1.20.10"
             - name: KUBEONE_TEST_RUN
               value: "TestClusterConformance"
           resources:
@@ -563,7 +675,7 @@ presubmits:
       preset-packet: "true"
     spec:
       containers:
-        - image: kubermatic/kubeone-e2e:v0.1.16
+        - image: kubermatic/kubeone-e2e:v0.1.17
           imagePullPolicy: Always
           command:
             - make
@@ -573,14 +685,41 @@ presubmits:
             - name: PROVIDER
               value: "packet"
             - name: TEST_CLUSTER_TARGET_VERSION
-              value: "1.21.2"
+              value: "1.21.4"
+            - name: KUBEONE_TEST_RUN
+              value: "TestClusterConformance"
+          resources:
+            requests:
+              cpu: 1
+  - name: pull-kubeone-e2e-packet-conformance-1.22
+    always_run: false
+    decorate: true
+    clone_uri: "ssh://git@github.com/kubermatic/kubeone.git"
+    labels:
+      preset-goproxy: "true"
+      preset-packet: "true"
+    spec:
+      containers:
+        - image: kubermatic/kubeone-e2e:v0.1.17
+          imagePullPolicy: Always
+          command:
+            - make
+          args:
+            - e2e-test
+          env:
+            - name: PROVIDER
+              value: "packet"
+            - name: CONTAINER_RUNTIME
+              value: containerd
+            - name: TEST_CLUSTER_TARGET_VERSION
+              value: "1.22.0"
             - name: KUBEONE_TEST_RUN
               value: "TestClusterConformance"
           resources:
             requests:
               cpu: 1
   #########################################################
-  # E2E/Conformance tests (OpenStack, 1.19-1.21)
+  # E2E/Conformance tests (OpenStack, 1.19-1.22)
   #########################################################
   - name: pull-kubeone-e2e-openstack-conformance-1.19
     always_run: false
@@ -591,7 +730,7 @@ presubmits:
       preset-openstack: "true"
     spec:
       containers:
-        - image: kubermatic/kubeone-e2e:v0.1.16
+        - image: kubermatic/kubeone-e2e:v0.1.17
           imagePullPolicy: Always
           command:
             - make
@@ -601,7 +740,7 @@ presubmits:
             - name: PROVIDER
               value: "openstack"
             - name: TEST_CLUSTER_TARGET_VERSION
-              value: "1.19.12"
+              value: "1.19.14"
             - name: KUBEONE_TEST_RUN
               value: "TestClusterConformance"
           resources:
@@ -616,7 +755,7 @@ presubmits:
       preset-openstack: "true"
     spec:
       containers:
-        - image: kubermatic/kubeone-e2e:v0.1.16
+        - image: kubermatic/kubeone-e2e:v0.1.17
           imagePullPolicy: Always
           command:
             - make
@@ -626,7 +765,7 @@ presubmits:
             - name: PROVIDER
               value: "openstack"
             - name: TEST_CLUSTER_TARGET_VERSION
-              value: "1.20.8"
+              value: "1.20.10"
             - name: KUBEONE_TEST_RUN
               value: "TestClusterConformance"
           resources:
@@ -641,7 +780,7 @@ presubmits:
       preset-openstack: "true"
     spec:
       containers:
-        - image: kubermatic/kubeone-e2e:v0.1.16
+        - image: kubermatic/kubeone-e2e:v0.1.17
           imagePullPolicy: Always
           command:
             - make
@@ -651,7 +790,34 @@ presubmits:
             - name: PROVIDER
               value: "openstack"
             - name: TEST_CLUSTER_TARGET_VERSION
-              value: "1.21.2"
+              value: "1.21.4"
+            - name: KUBEONE_TEST_RUN
+              value: "TestClusterConformance"
+          resources:
+            requests:
+              cpu: 1
+  - name: pull-kubeone-e2e-openstack-conformance-1.22
+    always_run: false
+    decorate: true
+    clone_uri: "ssh://git@github.com/kubermatic/kubeone.git"
+    labels:
+      preset-goproxy: "true"
+      preset-openstack: "true"
+    spec:
+      containers:
+        - image: kubermatic/kubeone-e2e:v0.1.17
+          imagePullPolicy: Always
+          command:
+            - make
+          args:
+            - e2e-test
+          env:
+            - name: PROVIDER
+              value: "openstack"
+            - name: CONTAINER_RUNTIME
+              value: containerd
+            - name: TEST_CLUSTER_TARGET_VERSION
+              value: "1.22.0"
             - name: KUBEONE_TEST_RUN
               value: "TestClusterConformance"
           resources:
@@ -660,7 +826,7 @@ presubmits:
   #########################################################
   # E2E/Upgrade tests (AWS)
   #########################################################
-  - name: pull-kubeone-e2e-aws-upgrade-containerd-1.18-1.19
+  - name: pull-kubeone-e2e-aws-upgrade-containerd-1.19-1.20
     run_if_changed: "(pkg/|examples/terraform/aws|hack/|test/|addons/)"
     decorate: true
     clone_uri: "ssh://git@github.com/kubermatic/kubeone.git"
@@ -669,7 +835,7 @@ presubmits:
       preset-aws: "true"
     spec:
       containers:
-        - image: kubermatic/kubeone-e2e:v0.1.16
+        - image: kubermatic/kubeone-e2e:v0.1.17
           imagePullPolicy: Always
           command:
             - make
@@ -685,12 +851,12 @@ presubmits:
             - name: TEST_CLUSTER_INITIAL_VERSION
               value: "1.18.20"
             - name: TEST_CLUSTER_TARGET_VERSION
-              value: "1.19.12"
+              value: "1.19.14"
             - name: TEST_TIMEOUT
               valut: "120m"
             - name: KUBEONE_TEST_RUN
               value: "TestClusterUpgrade"
-  - name: pull-kubeone-e2e-aws-upgrade-1.18-1.19
+  - name: pull-kubeone-e2e-aws-upgrade-1.19-1.20
     run_if_changed: "(pkg/|examples/terraform/aws|hack/|test/|addons/)"
     decorate: true
     clone_uri: "ssh://git@github.com/kubermatic/kubeone.git"
@@ -699,7 +865,7 @@ presubmits:
       preset-aws: "true"
     spec:
       containers:
-        - image: kubermatic/kubeone-e2e:v0.1.16
+        - image: kubermatic/kubeone-e2e:v0.1.17
           imagePullPolicy: Always
           command:
             - make
@@ -708,17 +874,15 @@ presubmits:
           env:
             - name: PROVIDER
               value: "aws"
-            - name: TF_VAR_initial_machinedeployment_spotinstances
-              value: "true"
             - name: TEST_CLUSTER_INITIAL_VERSION
-              value: "1.18.20"
+              value: "1.19.14"
             - name: TEST_CLUSTER_TARGET_VERSION
-              value: "1.19.12"
+              value: "1.20.10"
             - name: TEST_TIMEOUT
               valut: "120m"
             - name: KUBEONE_TEST_RUN
               value: "TestClusterUpgrade"
-  - name: pull-kubeone-e2e-aws-upgrade-1.19-1.20
+  - name: pull-kubeone-e2e-aws-upgrade-1.20-1.21
     run_if_changed: "(pkg/|examples/terraform/aws|hack/|test/|addons/)"
     decorate: true
     clone_uri: "ssh://git@github.com/kubermatic/kubeone.git"
@@ -727,7 +891,7 @@ presubmits:
       preset-aws: "true"
     spec:
       containers:
-        - image: kubermatic/kubeone-e2e:v0.1.16
+        - image: kubermatic/kubeone-e2e:v0.1.17
           imagePullPolicy: Always
           command:
             - make
@@ -736,15 +900,17 @@ presubmits:
           env:
             - name: PROVIDER
               value: "aws"
+            - name: TF_VAR_initial_machinedeployment_spotinstances
+              value: "true"
             - name: TEST_CLUSTER_INITIAL_VERSION
-              value: "1.19.12"
+              value: "1.20.10"
             - name: TEST_CLUSTER_TARGET_VERSION
-              value: "1.20.8"
+              value: "1.21.4"
             - name: TEST_TIMEOUT
               valut: "120m"
             - name: KUBEONE_TEST_RUN
               value: "TestClusterUpgrade"
-  - name: pull-kubeone-e2e-aws-upgrade-1.20-1.21
+  - name: pull-kubeone-e2e-aws-upgrade-1.21-1.22
     run_if_changed: "(pkg/|examples/terraform/aws|hack/|test/|addons/)"
     decorate: true
     clone_uri: "ssh://git@github.com/kubermatic/kubeone.git"
@@ -753,7 +919,7 @@ presubmits:
       preset-aws: "true"
     spec:
       containers:
-        - image: kubermatic/kubeone-e2e:v0.1.16
+        - image: kubermatic/kubeone-e2e:v0.1.17
           imagePullPolicy: Always
           command:
             - make
@@ -762,12 +928,14 @@ presubmits:
           env:
             - name: PROVIDER
               value: "aws"
+            - name: CONTAINER_RUNTIME
+              value: containerd
             - name: TF_VAR_initial_machinedeployment_spotinstances
               value: "true"
             - name: TEST_CLUSTER_INITIAL_VERSION
-              value: "1.20.8"
+              value: "1.21.4"
             - name: TEST_CLUSTER_TARGET_VERSION
-              value: "1.21.2"
+              value: "1.22.0"
             - name: TEST_TIMEOUT
               valut: "120m"
             - name: KUBEONE_TEST_RUN
@@ -775,7 +943,7 @@ presubmits:
   #########################################################
   # E2E/Upgrade tests (DigitalOcean)
   #########################################################
-  - name: pull-kubeone-e2e-digitalocean-upgrade-1.18-1.19
+  - name: pull-kubeone-e2e-digitalocean-upgrade-1.19-1.20
     always_run: false
     decorate: true
     clone_uri: "ssh://git@github.com/kubermatic/kubeone.git"
@@ -784,7 +952,7 @@ presubmits:
       preset-digitalocean: "true"
     spec:
       containers:
-        - image: kubermatic/kubeone-e2e:v0.1.16
+        - image: kubermatic/kubeone-e2e:v0.1.17
           imagePullPolicy: Always
           command:
             - make
@@ -794,14 +962,14 @@ presubmits:
             - name: PROVIDER
               value: "digitalocean"
             - name: TEST_CLUSTER_INITIAL_VERSION
-              value: "1.18.20"
+              value: "1.19.14"
             - name: TEST_CLUSTER_TARGET_VERSION
-              value: "1.19.12"
+              value: "1.20.10"
             - name: TEST_TIMEOUT
               valut: "120m"
             - name: KUBEONE_TEST_RUN
               value: "TestClusterUpgrade"
-  - name: pull-kubeone-e2e-digitalocean-upgrade-1.19-1.20
+  - name: pull-kubeone-e2e-digitalocean-upgrade-1.20-1.21
     always_run: false
     decorate: true
     clone_uri: "ssh://git@github.com/kubermatic/kubeone.git"
@@ -810,7 +978,7 @@ presubmits:
       preset-digitalocean: "true"
     spec:
       containers:
-        - image: kubermatic/kubeone-e2e:v0.1.16
+        - image: kubermatic/kubeone-e2e:v0.1.17
           imagePullPolicy: Always
           command:
             - make
@@ -820,14 +988,14 @@ presubmits:
             - name: PROVIDER
               value: "digitalocean"
             - name: TEST_CLUSTER_INITIAL_VERSION
-              value: "1.19.12"
+              value: "1.20.10"
             - name: TEST_CLUSTER_TARGET_VERSION
-              value: "1.20.8"
+              value: "1.21.4"
             - name: TEST_TIMEOUT
               valut: "120m"
             - name: KUBEONE_TEST_RUN
               value: "TestClusterUpgrade"
-  - name: pull-kubeone-e2e-digitalocean-upgrade-1.20-1.21
+  - name: pull-kubeone-e2e-digitalocean-upgrade-1.21-1.22
     always_run: false
     decorate: true
     clone_uri: "ssh://git@github.com/kubermatic/kubeone.git"
@@ -836,7 +1004,7 @@ presubmits:
       preset-digitalocean: "true"
     spec:
       containers:
-        - image: kubermatic/kubeone-e2e:v0.1.16
+        - image: kubermatic/kubeone-e2e:v0.1.17
           imagePullPolicy: Always
           command:
             - make
@@ -845,10 +1013,12 @@ presubmits:
           env:
             - name: PROVIDER
               value: "digitalocean"
+            - name: CONTAINER_RUNTIME
+              value: containerd
             - name: TEST_CLUSTER_INITIAL_VERSION
-              value: "1.20.8"
+              value: "1.21.4"
             - name: TEST_CLUSTER_TARGET_VERSION
-              value: "1.21.2"
+              value: "1.22.0"
             - name: TEST_TIMEOUT
               valut: "120m"
             - name: KUBEONE_TEST_RUN
@@ -856,7 +1026,7 @@ presubmits:
   #########################################################
   # E2E/Upgrade tests (Hetzner)
   #########################################################
-  - name: pull-kubeone-e2e-hetzner-upgrade-1.18-1.19
+  - name: pull-kubeone-e2e-hetzner-upgrade-1.19-1.20
     always_run: false
     decorate: true
     clone_uri: "ssh://git@github.com/kubermatic/kubeone.git"
@@ -865,7 +1035,7 @@ presubmits:
       preset-hetzner: "true"
     spec:
       containers:
-        - image: kubermatic/kubeone-e2e:v0.1.16
+        - image: kubermatic/kubeone-e2e:v0.1.17
           imagePullPolicy: Always
           command:
             - make
@@ -875,14 +1045,14 @@ presubmits:
             - name: PROVIDER
               value: "hetzner"
             - name: TEST_CLUSTER_INITIAL_VERSION
-              value: "1.18.20"
+              value: "1.19.14"
             - name: TEST_CLUSTER_TARGET_VERSION
-              value: "1.19.12"
+              value: "1.20.10"
             - name: TEST_TIMEOUT
               valut: "120m"
             - name: KUBEONE_TEST_RUN
               value: "TestClusterUpgrade"
-  - name: pull-kubeone-e2e-hetzner-upgrade-1.19-1.20
+  - name: pull-kubeone-e2e-hetzner-upgrade-1.20-1.21
     always_run: false
     decorate: true
     clone_uri: "ssh://git@github.com/kubermatic/kubeone.git"
@@ -891,7 +1061,7 @@ presubmits:
       preset-hetzner: "true"
     spec:
       containers:
-        - image: kubermatic/kubeone-e2e:v0.1.16
+        - image: kubermatic/kubeone-e2e:v0.1.17
           imagePullPolicy: Always
           command:
             - make
@@ -901,14 +1071,14 @@ presubmits:
             - name: PROVIDER
               value: "hetzner"
             - name: TEST_CLUSTER_INITIAL_VERSION
-              value: "1.19.12"
+              value: "1.20.10"
             - name: TEST_CLUSTER_TARGET_VERSION
-              value: "1.20.8"
+              value: "1.21.4"
             - name: TEST_TIMEOUT
               valut: "120m"
             - name: KUBEONE_TEST_RUN
               value: "TestClusterUpgrade"
-  - name: pull-kubeone-e2e-hetzner-upgrade-1.20-1.21
+  - name: pull-kubeone-e2e-hetzner-upgrade-1.21-1.22
     always_run: false
     decorate: true
     clone_uri: "ssh://git@github.com/kubermatic/kubeone.git"
@@ -917,7 +1087,7 @@ presubmits:
       preset-hetzner: "true"
     spec:
       containers:
-        - image: kubermatic/kubeone-e2e:v0.1.16
+        - image: kubermatic/kubeone-e2e:v0.1.17
           imagePullPolicy: Always
           command:
             - make
@@ -926,10 +1096,12 @@ presubmits:
           env:
             - name: PROVIDER
               value: "hetzner"
+            - name: CONTAINER_RUNTIME
+              value: containerd
             - name: TEST_CLUSTER_INITIAL_VERSION
-              value: "1.20.8"
+              value: "1.21.4"
             - name: TEST_CLUSTER_TARGET_VERSION
-              value: "1.21.2"
+              value: "1.22.0"
             - name: TEST_TIMEOUT
               valut: "120m"
             - name: KUBEONE_TEST_RUN
@@ -937,7 +1109,7 @@ presubmits:
   #########################################################
   # E2E/Upgrade tests (GCE)
   #########################################################
-  - name: pull-kubeone-e2e-gce-upgrade-1.18-1.19
+  - name: pull-kubeone-e2e-gce-upgrade-1.19-1.20
     always_run: false
     decorate: true
     clone_uri: "ssh://git@github.com/kubermatic/kubeone.git"
@@ -946,7 +1118,7 @@ presubmits:
       preset-gce: "true"
     spec:
       containers:
-        - image: kubermatic/kubeone-e2e:v0.1.16
+        - image: kubermatic/kubeone-e2e:v0.1.17
           imagePullPolicy: Always
           command:
             - make
@@ -956,16 +1128,16 @@ presubmits:
             - name: PROVIDER
               value: "gce"
             - name: TEST_CLUSTER_INITIAL_VERSION
-              value: "1.18.20"
+              value: "1.19.14"
             - name: TEST_CLUSTER_TARGET_VERSION
-              value: "1.19.12"
+              value: "1.20.10"
             - name: TEST_TIMEOUT
               valut: "120m"
             - name: KUBEONE_TEST_RUN
               value: "TestClusterUpgrade"
             - name: TF_VAR_project
               value: "kubeone-terraform-test"
-  - name: pull-kubeone-e2e-gce-upgrade-1.19-1.20
+  - name: pull-kubeone-e2e-gce-upgrade-1.20-1.21
     always_run: false
     decorate: true
     clone_uri: "ssh://git@github.com/kubermatic/kubeone.git"
@@ -974,7 +1146,7 @@ presubmits:
       preset-gce: "true"
     spec:
       containers:
-        - image: kubermatic/kubeone-e2e:v0.1.16
+        - image: kubermatic/kubeone-e2e:v0.1.17
           imagePullPolicy: Always
           command:
             - make
@@ -984,16 +1156,16 @@ presubmits:
             - name: PROVIDER
               value: "gce"
             - name: TEST_CLUSTER_INITIAL_VERSION
-              value: "1.19.12"
+              value: "1.20.10"
             - name: TEST_CLUSTER_TARGET_VERSION
-              value: "1.20.8"
+              value: "1.21.4"
             - name: TEST_TIMEOUT
               valut: "120m"
             - name: KUBEONE_TEST_RUN
               value: "TestClusterUpgrade"
             - name: TF_VAR_project
               value: "kubeone-terraform-test"
-  - name: pull-kubeone-e2e-gce-upgrade-1.20-1.21
+  - name: pull-kubeone-e2e-gce-upgrade-1.21-1.22
     always_run: false
     decorate: true
     clone_uri: "ssh://git@github.com/kubermatic/kubeone.git"
@@ -1002,7 +1174,7 @@ presubmits:
       preset-gce: "true"
     spec:
       containers:
-        - image: kubermatic/kubeone-e2e:v0.1.16
+        - image: kubermatic/kubeone-e2e:v0.1.17
           imagePullPolicy: Always
           command:
             - make
@@ -1011,10 +1183,12 @@ presubmits:
           env:
             - name: PROVIDER
               value: "gce"
+            - name: CONTAINER_RUNTIME
+              value: containerd
             - name: TEST_CLUSTER_INITIAL_VERSION
-              value: "1.20.8"
+              value: "1.21.4"
             - name: TEST_CLUSTER_TARGET_VERSION
-              value: "1.21.2"
+              value: "1.22.0"
             - name: TEST_TIMEOUT
               valut: "120m"
             - name: KUBEONE_TEST_RUN
@@ -1024,7 +1198,7 @@ presubmits:
   #########################################################
   # E2E/Upgrade tests (Packet)
   #########################################################
-  - name: pull-kubeone-e2e-packet-upgrade-1.18-1.19
+  - name: pull-kubeone-e2e-packet-upgrade-1.19-1.20
     always_run: false
     decorate: true
     clone_uri: "ssh://git@github.com/kubermatic/kubeone.git"
@@ -1033,7 +1207,7 @@ presubmits:
       preset-packet: "true"
     spec:
       containers:
-        - image: kubermatic/kubeone-e2e:v0.1.16
+        - image: kubermatic/kubeone-e2e:v0.1.17
           imagePullPolicy: Always
           command:
             - make
@@ -1043,14 +1217,14 @@ presubmits:
             - name: PROVIDER
               value: "packet"
             - name: TEST_CLUSTER_INITIAL_VERSION
-              value: "1.18.20"
+              value: "1.19.14"
             - name: TEST_CLUSTER_TARGET_VERSION
-              value: "1.19.12"
+              value: "1.20.10"
             - name: TEST_TIMEOUT
               valut: "120m"
             - name: KUBEONE_TEST_RUN
               value: "TestClusterUpgrade"
-  - name: pull-kubeone-e2e-packet-upgrade-1.19-1.20
+  - name: pull-kubeone-e2e-packet-upgrade-1.20-1.21
     always_run: false
     decorate: true
     clone_uri: "ssh://git@github.com/kubermatic/kubeone.git"
@@ -1059,7 +1233,7 @@ presubmits:
       preset-packet: "true"
     spec:
       containers:
-        - image: kubermatic/kubeone-e2e:v0.1.16
+        - image: kubermatic/kubeone-e2e:v0.1.17
           imagePullPolicy: Always
           command:
             - make
@@ -1069,14 +1243,14 @@ presubmits:
             - name: PROVIDER
               value: "packet"
             - name: TEST_CLUSTER_INITIAL_VERSION
-              value: "1.19.12"
+              value: "1.20.10"
             - name: TEST_CLUSTER_TARGET_VERSION
-              value: "1.20.8"
+              value: "1.21.4"
             - name: TEST_TIMEOUT
               valut: "120m"
             - name: KUBEONE_TEST_RUN
               value: "TestClusterUpgrade"
-  - name: pull-kubeone-e2e-packet-upgrade-1.20-1.21
+  - name: pull-kubeone-e2e-packet-upgrade-1.21-1.22
     always_run: false
     decorate: true
     clone_uri: "ssh://git@github.com/kubermatic/kubeone.git"
@@ -1085,7 +1259,7 @@ presubmits:
       preset-packet: "true"
     spec:
       containers:
-        - image: kubermatic/kubeone-e2e:v0.1.16
+        - image: kubermatic/kubeone-e2e:v0.1.17
           imagePullPolicy: Always
           command:
             - make
@@ -1094,10 +1268,12 @@ presubmits:
           env:
             - name: PROVIDER
               value: "packet"
+            - name: CONTAINER_RUNTIME
+              value: containerd
             - name: TEST_CLUSTER_INITIAL_VERSION
-              value: "1.20.8"
+              value: "1.21.4"
             - name: TEST_CLUSTER_TARGET_VERSION
-              value: "1.21.2"
+              value: "1.22.0"
             - name: TEST_TIMEOUT
               valut: "120m"
             - name: KUBEONE_TEST_RUN
@@ -1105,7 +1281,7 @@ presubmits:
   #########################################################
   # E2E/Upgrade tests (OpenStack)
   #########################################################
-  - name: pull-kubeone-e2e-openstack-upgrade-1.18-1.19
+  - name: pull-kubeone-e2e-openstack-upgrade-1.19-1.20
     always_run: false
     decorate: true
     clone_uri: "ssh://git@github.com/kubermatic/kubeone.git"
@@ -1114,7 +1290,7 @@ presubmits:
       preset-openstack: "true"
     spec:
       containers:
-        - image: kubermatic/kubeone-e2e:v0.1.16
+        - image: kubermatic/kubeone-e2e:v0.1.17
           imagePullPolicy: Always
           command:
             - make
@@ -1124,14 +1300,14 @@ presubmits:
             - name: PROVIDER
               value: "openstack"
             - name: TEST_CLUSTER_INITIAL_VERSION
-              value: "1.18.20"
+              value: "1.19.14"
             - name: TEST_CLUSTER_TARGET_VERSION
-              value: "1.19.12"
+              value: "1.20.10"
             - name: TEST_TIMEOUT
               valut: "120m"
             - name: KUBEONE_TEST_RUN
               value: "TestClusterUpgrade"
-  - name: pull-kubeone-e2e-openstack-upgrade-1.19-1.20
+  - name: pull-kubeone-e2e-openstack-upgrade-1.20-1.21
     always_run: false
     decorate: true
     clone_uri: "ssh://git@github.com/kubermatic/kubeone.git"
@@ -1140,7 +1316,7 @@ presubmits:
       preset-openstack: "true"
     spec:
       containers:
-        - image: kubermatic/kubeone-e2e:v0.1.16
+        - image: kubermatic/kubeone-e2e:v0.1.17
           imagePullPolicy: Always
           command:
             - make
@@ -1150,14 +1326,14 @@ presubmits:
             - name: PROVIDER
               value: "openstack"
             - name: TEST_CLUSTER_INITIAL_VERSION
-              value: "1.19.12"
+              value: "1.20.10"
             - name: TEST_CLUSTER_TARGET_VERSION
-              value: "1.20.8"
+              value: "1.21.4"
             - name: TEST_TIMEOUT
               valut: "120m"
             - name: KUBEONE_TEST_RUN
               value: "TestClusterUpgrade"
-  - name: pull-kubeone-e2e-openstack-upgrade-1.20-1.21
+  - name: pull-kubeone-e2e-openstack-upgrade-1.21-1.22
     always_run: false
     decorate: true
     clone_uri: "ssh://git@github.com/kubermatic/kubeone.git"
@@ -1166,7 +1342,7 @@ presubmits:
       preset-openstack: "true"
     spec:
       containers:
-        - image: kubermatic/kubeone-e2e:v0.1.16
+        - image: kubermatic/kubeone-e2e:v0.1.17
           imagePullPolicy: Always
           command:
             - make
@@ -1175,10 +1351,12 @@ presubmits:
           env:
             - name: PROVIDER
               value: "openstack"
+            - name: CONTAINER_RUNTIME
+              value: containerd
             - name: TEST_CLUSTER_INITIAL_VERSION
-              value: "1.20.8"
+              value: "1.21.4"
             - name: TEST_CLUSTER_TARGET_VERSION
-              value: "1.21.2"
+              value: "1.22.0"
             - name: TEST_TIMEOUT
               valut: "120m"
             - name: KUBEONE_TEST_RUN