diff --git a/sdk_container/src/third_party/coreos-overlay/.github/workflows/go-apply-patch.sh b/sdk_container/src/third_party/coreos-overlay/.github/workflows/go-apply-patch.sh
index 70dc670fbb..260f3be396 100755
--- a/sdk_container/src/third_party/coreos-overlay/.github/workflows/go-apply-patch.sh
+++ b/sdk_container/src/third_party/coreos-overlay/.github/workflows/go-apply-patch.sh
@@ -2,13 +2,16 @@
 
 set -euo pipefail
 
+# trim the 3rd part in the input semver, e.g. from 1.14.3 to 1.14
+VERSION_SHORT=${VERSION_NEW%.*}
+
 . .github/workflows/common.sh
 
 checkout_branches "go-${VERSION_NEW}"
 
 pushd "${SDK_OUTER_SRCDIR}/third_party/coreos-overlay" >/dev/null || exit
 
-VERSION_OLD=$(sed -n "s/^DIST go\(${GO_VERSION}.[0-9]*\).*/\1/p" dev-lang/go/Manifest | sort -ruV | head -n1)
+VERSION_OLD=$(sed -n "s/^DIST go\(${VERSION_SHORT}.[0-9]*\).*/\1/p" dev-lang/go/Manifest | sort -ruV | head -n1)
 [[ "${VERSION_NEW}" = "${VERSION_OLD}" ]] && echo "already the latest Go, nothing to do" && exit
 
 git mv $(ls -1 dev-lang/go/go-${VERSION_OLD}*.ebuild | sort -ruV | head -n1) "dev-lang/go/go-${VERSION_NEW}.ebuild"
diff --git a/sdk_container/src/third_party/coreos-overlay/.github/workflows/go-releases-alpha.yml b/sdk_container/src/third_party/coreos-overlay/.github/workflows/go-releases-alpha.yml
index 2ad919ac5a..c959e5b39e 100644
--- a/sdk_container/src/third_party/coreos-overlay/.github/workflows/go-releases-alpha.yml
+++ b/sdk_container/src/third_party/coreos-overlay/.github/workflows/go-releases-alpha.yml
@@ -27,7 +27,6 @@ jobs:
         id: apply-patch-alpha
         env:
           BASE_BRANCH: ${{ steps.fetch-latest-release.outputs.BASE_BRANCH_ALPHA }}
-          GO_VERSION: 1.13
           PATH: ${{ steps.setup-flatcar-sdk.outputs.path }}
           VERSION_NEW: ${{ steps.fetch-latest-release.outputs.VERSION_ALPHA }}
         run: .github/workflows/go-apply-patch.sh
diff --git a/sdk_container/src/third_party/coreos-overlay/.github/workflows/go-releases-edge.yml b/sdk_container/src/third_party/coreos-overlay/.github/workflows/go-releases-edge.yml
index 03fa5973ea..d1e158abae 100644
--- a/sdk_container/src/third_party/coreos-overlay/.github/workflows/go-releases-edge.yml
+++ b/sdk_container/src/third_party/coreos-overlay/.github/workflows/go-releases-edge.yml
@@ -27,7 +27,6 @@ jobs:
         id: apply-patch-edge
         env:
           BASE_BRANCH: ${{ steps.fetch-latest-release.outputs.BASE_BRANCH_EDGE }}
-          GO_VERSION: 1.13
           PATH: ${{ steps.setup-flatcar-sdk.outputs.path }}
           VERSION_NEW: ${{ steps.fetch-latest-release.outputs.VERSION_EDGE }}
         run: .github/workflows/go-apply-patch.sh
diff --git a/sdk_container/src/third_party/coreos-overlay/.github/workflows/kernel-apply-patch.sh b/sdk_container/src/third_party/coreos-overlay/.github/workflows/kernel-apply-patch.sh
index 3eadc5d5e9..ba72e53184 100755
--- a/sdk_container/src/third_party/coreos-overlay/.github/workflows/kernel-apply-patch.sh
+++ b/sdk_container/src/third_party/coreos-overlay/.github/workflows/kernel-apply-patch.sh
@@ -2,15 +2,18 @@
 
 set -euo pipefail
 
+# trim the 3rd part in the input semver, e.g. from 5.4.1 to 5.4
+VERSION_SHORT=${VERSION_NEW%.*}
+
 . .github/workflows/common.sh
 
 checkout_branches "linux-${VERSION_NEW}"
 
 pushd "${SDK_OUTER_SRCDIR}/third_party/coreos-overlay" >/dev/null || exit
 
-VERSION_OLD=$(sed -n "s/^DIST patch-\(${KERNEL_VERSION}.[0-9]*\).*/\1/p" sys-kernel/coreos-sources/Manifest)
+VERSION_OLD=$(sed -n "s/^DIST patch-\(${VERSION_SHORT}.[0-9]*\).*/\1/p" sys-kernel/coreos-sources/Manifest)
 if [[ -z "${VERSION_OLD}" ]]; then
-  VERSION_OLD=$(sed -n "s/^DIST linux-\(${KERNEL_VERSION}*\).*/\1/p" sys-kernel/coreos-sources/Manifest)
+  VERSION_OLD=$(sed -n "s/^DIST linux-\(${VERSION_SHORT}*\).*/\1/p" sys-kernel/coreos-sources/Manifest)
 fi
 [[ "${VERSION_NEW}" = "${VERSION_OLD}" ]] && echo "already the latest Kernel, nothing to do" && exit
 
diff --git a/sdk_container/src/third_party/coreos-overlay/.github/workflows/kernel-releases-alpha.yml b/sdk_container/src/third_party/coreos-overlay/.github/workflows/kernel-releases-alpha.yml
index 75c7a3a9d6..ee8cc77625 100644
--- a/sdk_container/src/third_party/coreos-overlay/.github/workflows/kernel-releases-alpha.yml
+++ b/sdk_container/src/third_party/coreos-overlay/.github/workflows/kernel-releases-alpha.yml
@@ -27,7 +27,6 @@ jobs:
         id: apply-patch-alpha
         env:
           BASE_BRANCH: ${{ steps.fetch-latest-release.outputs.BASE_BRANCH_ALPHA }}
-          KERNEL_VERSION: 5.4
           PATH: ${{ steps.setup-flatcar-sdk.outputs.path }}
           VERSION_NEW: ${{ steps.fetch-latest-release.outputs.VERSION_ALPHA }}
         run: .github/workflows/kernel-apply-patch.sh
diff --git a/sdk_container/src/third_party/coreos-overlay/.github/workflows/kernel-releases-beta.yml b/sdk_container/src/third_party/coreos-overlay/.github/workflows/kernel-releases-beta.yml
index 8772d4cd10..c72ce7c611 100644
--- a/sdk_container/src/third_party/coreos-overlay/.github/workflows/kernel-releases-beta.yml
+++ b/sdk_container/src/third_party/coreos-overlay/.github/workflows/kernel-releases-beta.yml
@@ -27,7 +27,6 @@ jobs:
         id: apply-patch-beta
         env:
           BASE_BRANCH: ${{ steps.fetch-latest-release.outputs.BASE_BRANCH_BETA }}
-          KERNEL_VERSION: 4.19
           PATH: ${{ steps.setup-flatcar-sdk.outputs.path }}
           VERSION_NEW: ${{ steps.fetch-latest-release.outputs.VERSION_BETA }}
         run: .github/workflows/kernel-apply-patch.sh
diff --git a/sdk_container/src/third_party/coreos-overlay/.github/workflows/kernel-releases-edge.yml b/sdk_container/src/third_party/coreos-overlay/.github/workflows/kernel-releases-edge.yml
index 1f756df34c..49ea363442 100644
--- a/sdk_container/src/third_party/coreos-overlay/.github/workflows/kernel-releases-edge.yml
+++ b/sdk_container/src/third_party/coreos-overlay/.github/workflows/kernel-releases-edge.yml
@@ -27,7 +27,6 @@ jobs:
         id: apply-patch-edge
         env:
           BASE_BRANCH: ${{ steps.fetch-latest-release.outputs.BASE_BRANCH_EDGE }}
-          KERNEL_VERSION: 5.6
           PATH: ${{ steps.setup-flatcar-sdk.outputs.path }}
           VERSION_NEW: ${{ steps.fetch-latest-release.outputs.VERSION_EDGE }}
         run: .github/workflows/kernel-apply-patch.sh
diff --git a/sdk_container/src/third_party/coreos-overlay/.github/workflows/kernel-releases-stable.yml b/sdk_container/src/third_party/coreos-overlay/.github/workflows/kernel-releases-stable.yml
index b6c930f31a..0adc9ad24f 100644
--- a/sdk_container/src/third_party/coreos-overlay/.github/workflows/kernel-releases-stable.yml
+++ b/sdk_container/src/third_party/coreos-overlay/.github/workflows/kernel-releases-stable.yml
@@ -27,7 +27,6 @@ jobs:
         id: apply-patch-stable
         env:
           BASE_BRANCH: ${{ steps.fetch-latest-release.outputs.BASE_BRANCH_STABLE }}
-          KERNEL_VERSION: 4.19
           PATH: ${{ steps.setup-flatcar-sdk.outputs.path }}
           VERSION_NEW: ${{ steps.fetch-latest-release.outputs.VERSION_STABLE }}
         run: .github/workflows/kernel-apply-patch.sh