diff --git a/sdk_container/src/third_party/coreos-overlay/coreos-base/emerge-gitclone/emerge-gitclone-9999.ebuild b/sdk_container/src/third_party/coreos-overlay/coreos-base/emerge-gitclone/emerge-gitclone-9999.ebuild
index 113067d692e..61132d5b671 100644
--- a/sdk_container/src/third_party/coreos-overlay/coreos-base/emerge-gitclone/emerge-gitclone-9999.ebuild
+++ b/sdk_container/src/third_party/coreos-overlay/coreos-base/emerge-gitclone/emerge-gitclone-9999.ebuild
@@ -7,7 +7,9 @@ EGIT_REPO_URI="https://github.com/flatcar/flatcar-dev-util.git"
 if [[ "${PV}" == 9999 ]]; then
 	KEYWORDS="~amd64 ~arm ~arm64 ~x86"
 else
-	EGIT_COMMIT="00396595376d8d6a3c4b9251ba94e9de2d7a9e39" # flatcar-master
+	#EGIT_COMMIT="00396595376d8d6a3c4b9251ba94e9de2d7a9e39" # flatcar-master
+	EGIT_COMMIT="cd1b814127e8d8dbe8513ba10195eab70c853579" # flatcar-master
+	EGIT_BRANCH="jepio/fetch-head"
 	KEYWORDS="amd64 arm arm64 x86"
 fi
 
diff --git a/sdk_lib/sdk_container_common.sh b/sdk_lib/sdk_container_common.sh
index b0f94cfbf67..6cc6ab483cc 100644
--- a/sdk_lib/sdk_container_common.sh
+++ b/sdk_lib/sdk_container_common.sh
@@ -55,7 +55,12 @@ function yell() {
 function get_git_version() {
     local tag="$(git tag --points-at HEAD)"
     if [ -z "$tag" ] ; then
-        git describe --tags
+        local abbrev=
+        # emerge-gitclone needs the full SHA for external PRs
+        if [ "${GITHUB_ACTIONS:-}" = "true" ]; then
+            abbrev="--abbrev=40"
+        fi
+        git describe --tags ${abbrev}
     else
         echo "$tag"
     fi