diff --git a/.github/workflows/appimage10.yml b/.github/workflows/appimage10.yml
index d6439604..121e4019 100644
--- a/.github/workflows/appimage10.yml
+++ b/.github/workflows/appimage10.yml
@@ -66,7 +66,7 @@ jobs:
           echo GITHUB_REF=$GITHUB_REF
           echo GITHUB_SHA=$GITHUB_SHA
           git fetch --tags --no-progress --quiet # fetch-tags: true # did not work
-          git_describe=$(git describe $GITHUB_SHA | sed -e 's#-#+#')
+          git_describe=$(git describe --tags $GITHUB_SHA | sed -e 's#\-\([0-9]\+\-g\)#\+\1#') # /-\d+-g/
 
           # RELEASE-NOTES-EL10.txt
           echo "### ${MAGIC_APPIMAGE_OUTPUT_FILENAME} commit ${git_describe}" | sed -e 's#~#\\~#g' > RELEASE-NOTES-EL10.txt
@@ -85,7 +85,8 @@ jobs:
           echo "" >> RELEASE-NOTES-EL10.txt
 
           # RELEASE-NOTES-CL.txt
-          git_previous_tag=$(git describe --tags --abbrev=0 ${GITHUB_SHA}~1)
+          git_previous_tag=$(git describe --tags --abbrev=0 $(git rev-list --tags --skip=1 --max-count=1))
+          echo git_previous_tag=$git_previous_tag
           if [ -n "${git_previous_tag}" ]
           then
               echo "### Change Log (since previous tag):" > RELEASE-NOTES-CL.txt
diff --git a/.github/workflows/appimage7.yml b/.github/workflows/appimage7.yml
index 18dc8687..af881def 100644
--- a/.github/workflows/appimage7.yml
+++ b/.github/workflows/appimage7.yml
@@ -66,7 +66,7 @@ jobs:
           echo GITHUB_REF=$GITHUB_REF
           echo GITHUB_SHA=$GITHUB_SHA
           git fetch --tags --no-progress --quiet # fetch-tags: true # did not work
-          git_describe=$(git describe $GITHUB_SHA | sed -e 's#-#+#')
+          git_describe=$(git describe --tags $GITHUB_SHA | sed -e 's#\-\([0-9]\+\-g\)#\+\1#') # /-\d+-g/
 
           # RELEASE-NOTES-EL7.txt
           echo "### ${MAGIC_APPIMAGE_OUTPUT_FILENAME} commit ${git_describe}" | sed -e 's#~#\\~#g' > RELEASE-NOTES-EL7.txt
@@ -85,7 +85,8 @@ jobs:
           echo "" >> RELEASE-NOTES-EL7.txt
 
           # RELEASE-NOTES-CL.txt
-          git_previous_tag=$(git describe --tags --abbrev=0 ${GITHUB_SHA}~1)
+          git_previous_tag=$(git describe --tags --abbrev=0 $(git rev-list --tags --skip=1 --max-count=1))
+          echo git_previous_tag=$git_previous_tag
           if [ -n "${git_previous_tag}" ]
           then
               echo "### Change Log (since previous tag):" > RELEASE-NOTES-CL.txt
diff --git a/.github/workflows/appimage8.yml b/.github/workflows/appimage8.yml
index efc01b7d..9ac5749b 100644
--- a/.github/workflows/appimage8.yml
+++ b/.github/workflows/appimage8.yml
@@ -66,7 +66,7 @@ jobs:
           echo GITHUB_REF=$GITHUB_REF
           echo GITHUB_SHA=$GITHUB_SHA
           git fetch --tags --no-progress --quiet # fetch-tags: true # did not work
-          git_describe=$(git describe $GITHUB_SHA | sed -e 's#-#+#')
+          git_describe=$(git describe --tags $GITHUB_SHA | sed -e 's#\-\([0-9]\+\-g\)#\+\1#') # /-\d+-g/
 
           # RELEASE-NOTES-EL8.txt
           echo "### ${MAGIC_APPIMAGE_OUTPUT_FILENAME} commit ${git_describe}" | sed -e 's#~#\\~#g' > RELEASE-NOTES-EL8.txt
@@ -85,7 +85,8 @@ jobs:
           echo "" >> RELEASE-NOTES-EL8.txt
 
           # RELEASE-NOTES-CL.txt
-          git_previous_tag=$(git describe --tags --abbrev=0 ${GITHUB_SHA}~1)
+          git_previous_tag=$(git describe --tags --abbrev=0 $(git rev-list --tags --skip=1 --max-count=1))
+          echo git_previous_tag=$git_previous_tag
           if [ -n "${git_previous_tag}" ]
           then
               echo "### Change Log (since previous tag):" > RELEASE-NOTES-CL.txt
diff --git a/.github/workflows/appimage9.yml b/.github/workflows/appimage9.yml
index 2e48450a..3e7a2024 100644
--- a/.github/workflows/appimage9.yml
+++ b/.github/workflows/appimage9.yml
@@ -66,7 +66,7 @@ jobs:
           echo GITHUB_REF=$GITHUB_REF
           echo GITHUB_SHA=$GITHUB_SHA
           git fetch --tags --no-progress --quiet # fetch-tags: true # did not work
-          git_describe=$(git describe $GITHUB_SHA | sed -e 's#-#+#')
+          git_describe=$(git describe --tags $GITHUB_SHA | sed -e 's#\-\([0-9]\+\-g\)#\+\1#') # /-\d+-g/
 
           # RELEASE-NOTES-EL9.txt
           echo "### ${MAGIC_APPIMAGE_OUTPUT_FILENAME} commit ${git_describe}" | sed -e 's#~#\\~#g' > RELEASE-NOTES-EL9.txt
@@ -85,7 +85,8 @@ jobs:
           echo "" >> RELEASE-NOTES-EL9.txt
 
           # RELEASE-NOTES-CL.txt
-          git_previous_tag=$(git describe --tags --abbrev=0 ${GITHUB_SHA}~1)
+          git_previous_tag=$(git describe --tags --abbrev=0 $(git rev-list --tags --skip=1 --max-count=1))
+          echo git_previous_tag=$git_previous_tag
           if [ -n "${git_previous_tag}" ]
           then
               echo "### Change Log (since previous tag):" > RELEASE-NOTES-CL.txt
diff --git a/appimage/10/Makefile b/appimage/10/Makefile
index 252d0dfb..05041d54 100644
--- a/appimage/10/Makefile
+++ b/appimage/10/Makefile
@@ -4,7 +4,7 @@ ARCH := $(shell uname -m)
 APPIMAGE = Magic-$(ARCH).AppImage
 VERSION_MAGIC := $(shell cat $(MAGIC_SRC_ROOT)/VERSION)
 VERSION_TSTAMP := $(shell git show -s "--format=%cs" | tr -d '-')
-VERSION_HASH := $(shell git show-ref --hash=7 remotes/origin/HEAD)
+VERSION_HASH := $(shell git show -s "--format=%h")
 VERSION_NUM ?= $(VERSION_MAGIC)~$(VERSION_TSTAMP)~$(VERSION_HASH)
 VERSION := $(VERSION_NUM)
 
diff --git a/appimage/7/Makefile b/appimage/7/Makefile
index bbc815cc..3ec57ebd 100644
--- a/appimage/7/Makefile
+++ b/appimage/7/Makefile
@@ -4,7 +4,7 @@ ARCH := $(shell uname -m)
 APPIMAGE = Magic-$(ARCH).AppImage
 VERSION_MAGIC := $(shell cat $(MAGIC_SRC_ROOT)/VERSION)
 VERSION_TSTAMP := $(shell git show -s "--format=%cs" | tr -d '-')
-VERSION_HASH := $(shell git show-ref --hash=7 remotes/origin/HEAD)
+VERSION_HASH := $(shell git show -s "--format=%h")
 VERSION_NUM ?= $(VERSION_MAGIC)~$(VERSION_TSTAMP)~$(VERSION_HASH)
 VERSION := $(VERSION_NUM)
 
diff --git a/appimage/8/Makefile b/appimage/8/Makefile
index 0708b892..b575062c 100644
--- a/appimage/8/Makefile
+++ b/appimage/8/Makefile
@@ -4,7 +4,7 @@ ARCH := $(shell uname -m)
 APPIMAGE = Magic-$(ARCH).AppImage
 VERSION_MAGIC := $(shell cat $(MAGIC_SRC_ROOT)/VERSION)
 VERSION_TSTAMP := $(shell git show -s "--format=%cs" | tr -d '-')
-VERSION_HASH := $(shell git show-ref --hash=7 remotes/origin/HEAD)
+VERSION_HASH := $(shell git show -s "--format=%h")
 VERSION_NUM ?= $(VERSION_MAGIC)~$(VERSION_TSTAMP)~$(VERSION_HASH)
 VERSION := $(VERSION_NUM)
 
diff --git a/appimage/9/Makefile b/appimage/9/Makefile
index 252d0dfb..05041d54 100644
--- a/appimage/9/Makefile
+++ b/appimage/9/Makefile
@@ -4,7 +4,7 @@ ARCH := $(shell uname -m)
 APPIMAGE = Magic-$(ARCH).AppImage
 VERSION_MAGIC := $(shell cat $(MAGIC_SRC_ROOT)/VERSION)
 VERSION_TSTAMP := $(shell git show -s "--format=%cs" | tr -d '-')
-VERSION_HASH := $(shell git show-ref --hash=7 remotes/origin/HEAD)
+VERSION_HASH := $(shell git show -s "--format=%h")
 VERSION_NUM ?= $(VERSION_MAGIC)~$(VERSION_TSTAMP)~$(VERSION_HASH)
 VERSION := $(VERSION_NUM)