diff --git a/ci/cirrus-templates/script.bash b/ci/cirrus-templates/script.bash
index 23c6f4acfe9..5fe33bdc872 100644
--- a/ci/cirrus-templates/script.bash
+++ b/ci/cirrus-templates/script.bash
@@ -8,13 +8,14 @@ if [ "root" == "$(whoami)" ]; then exit 1; fi
 echo "========="
 echo "Acquire tags for the repo"
 
-git fetch --no-tags --prune --depth=1 origin +refs/tags/*:refs/tags/*
+# https://github.com/reg-viz/reg-suit#workaround-for-detached-head
+git checkout ${GITHUB_REF#refs/heads/} || git checkout -b ${GITHUB_REF#refs/heads/} && git pull
 
 echo "========="
 echo "Display the current git status"
 
 git status
-git describe --always
+git describe
 
 echo "========="
 echo "Prep cargo dirs"