diff --git a/kinder/ci/tools/update-workflows/config.yaml b/kinder/ci/tools/update-workflows/config.yaml
index 89b17c52..8ac3240a 100644
--- a/kinder/ci/tools/update-workflows/config.yaml
+++ b/kinder/ci/tools/update-workflows/config.yaml
@@ -60,10 +60,6 @@ jobGroups:
     - ./templates/workflows/patches-tasks.yaml
   jobs:
   - kubernetesVersion: latest
-  - kubernetesVersion: 0
-  - kubernetesVersion: -1
-  - kubernetesVersion: -2
-  - kubernetesVersion: -3
 
 - name: presubmit-upgrade-latest
   kinderWorkflowSpec:
diff --git a/kinder/ci/tools/update-workflows/templates/workflows/patches-tasks.yaml b/kinder/ci/tools/update-workflows/templates/workflows/patches-tasks.yaml
index 63150f7d..86a073c3 100644
--- a/kinder/ci/tools/update-workflows/templates/workflows/patches-tasks.yaml
+++ b/kinder/ci/tools/update-workflows/templates/workflows/patches-tasks.yaml
@@ -71,6 +71,10 @@ tasks:
         cat <<EOF >/tmp/kubeadm-patches/etcd+json.json
         [{"op":"add","path":"/metadata/annotations/patched","value":"true"}]
         EOF
+
+        cat <<EOF >/tmp/kubeadm-patches/kubeletconfiguration+strategic.yaml
+        shutdownGracePeriod: 1s
+        EOF
   - name: prepare verify-patches.sh script
     cmd: /bin/sh
     args:
@@ -88,6 +92,13 @@ tasks:
           fi
         done
 
+        if grep -q "shutdownGracePeriod: 1s" /var/lib/kubelet/config.yaml ; then
+            echo "/var/lib/kubelet/config.yaml is patched!"
+        else
+            echo "ERROR: /var/lib/kubelet/config.yaml is not patched"
+            res=1
+        fi
+
         if [[ "\${res}" = 0 ]]; then
           echo "All verify checks passed, congrats!"
           echo ""
diff --git a/kinder/ci/workflows/patches-1.21.yaml b/kinder/ci/workflows/patches-1.21.yaml
deleted file mode 100644
index d555a998..00000000
--- a/kinder/ci/workflows/patches-1.21.yaml
+++ /dev/null
@@ -1,10 +0,0 @@
-# AUTOGENERATED by https://git.k8s.io/kubeadm/kinder/ci/tools/update-workflows
-version: 1
-summary: |
-  This workflow implements a sequence of tasks for testing the patches functionality.
-  test grid > https://testgrid.k8s.io/sig-cluster-lifecycle-kubeadm#kubeadm-kinder-patches-1-21
-  config    > https://git.k8s.io/test-infra/config/jobs/kubernetes/sig-cluster-lifecycle/kubeadm-kinder-patches.yaml
-vars:
-  kubernetesVersion: "{{ resolve `ci/latest-1.21` }}"
-tasks:
-- import: patches-tasks.yaml
diff --git a/kinder/ci/workflows/patches-1.22.yaml b/kinder/ci/workflows/patches-1.22.yaml
deleted file mode 100644
index 7733f469..00000000
--- a/kinder/ci/workflows/patches-1.22.yaml
+++ /dev/null
@@ -1,10 +0,0 @@
-# AUTOGENERATED by https://git.k8s.io/kubeadm/kinder/ci/tools/update-workflows
-version: 1
-summary: |
-  This workflow implements a sequence of tasks for testing the patches functionality.
-  test grid > https://testgrid.k8s.io/sig-cluster-lifecycle-kubeadm#kubeadm-kinder-patches-1-22
-  config    > https://git.k8s.io/test-infra/config/jobs/kubernetes/sig-cluster-lifecycle/kubeadm-kinder-patches.yaml
-vars:
-  kubernetesVersion: "{{ resolve `ci/latest-1.22` }}"
-tasks:
-- import: patches-tasks.yaml
diff --git a/kinder/ci/workflows/patches-1.23.yaml b/kinder/ci/workflows/patches-1.23.yaml
deleted file mode 100644
index efc44c43..00000000
--- a/kinder/ci/workflows/patches-1.23.yaml
+++ /dev/null
@@ -1,10 +0,0 @@
-# AUTOGENERATED by https://git.k8s.io/kubeadm/kinder/ci/tools/update-workflows
-version: 1
-summary: |
-  This workflow implements a sequence of tasks for testing the patches functionality.
-  test grid > https://testgrid.k8s.io/sig-cluster-lifecycle-kubeadm#kubeadm-kinder-patches-1-23
-  config    > https://git.k8s.io/test-infra/config/jobs/kubernetes/sig-cluster-lifecycle/kubeadm-kinder-patches.yaml
-vars:
-  kubernetesVersion: "{{ resolve `ci/latest-1.23` }}"
-tasks:
-- import: patches-tasks.yaml
diff --git a/kinder/ci/workflows/patches-1.24.yaml b/kinder/ci/workflows/patches-1.24.yaml
deleted file mode 100644
index fd8dc2e0..00000000
--- a/kinder/ci/workflows/patches-1.24.yaml
+++ /dev/null
@@ -1,10 +0,0 @@
-# AUTOGENERATED by https://git.k8s.io/kubeadm/kinder/ci/tools/update-workflows
-version: 1
-summary: |
-  This workflow implements a sequence of tasks for testing the patches functionality.
-  test grid > https://testgrid.k8s.io/sig-cluster-lifecycle-kubeadm#kubeadm-kinder-patches-1-24
-  config    > https://git.k8s.io/test-infra/config/jobs/kubernetes/sig-cluster-lifecycle/kubeadm-kinder-patches.yaml
-vars:
-  kubernetesVersion: "{{ resolve `ci/latest-1.24` }}"
-tasks:
-- import: patches-tasks.yaml
diff --git a/kinder/ci/workflows/patches-tasks.yaml b/kinder/ci/workflows/patches-tasks.yaml
index 368347fc..78bf38bd 100644
--- a/kinder/ci/workflows/patches-tasks.yaml
+++ b/kinder/ci/workflows/patches-tasks.yaml
@@ -72,6 +72,10 @@ tasks:
         cat <<EOF >/tmp/kubeadm-patches/etcd+json.json
         [{"op":"add","path":"/metadata/annotations/patched","value":"true"}]
         EOF
+
+        cat <<EOF >/tmp/kubeadm-patches/kubeletconfiguration+strategic.yaml
+        shutdownGracePeriod: 1s
+        EOF
   - name: prepare verify-patches.sh script
     cmd: /bin/sh
     args:
@@ -89,6 +93,13 @@ tasks:
           fi
         done
 
+        if grep -q "shutdownGracePeriod: 1s" /var/lib/kubelet/config.yaml ; then
+            echo "/var/lib/kubelet/config.yaml is patched!"
+        else
+            echo "ERROR: /var/lib/kubelet/config.yaml is not patched"
+            res=1
+        fi
+
         if [[ "\${res}" = 0 ]]; then
           echo "All verify checks passed, congrats!"
           echo ""