diff --git a/contrib/guix/guix-build b/contrib/guix/guix-build
index b38f91f3c7b..c2e7a6b17a3 100755
--- a/contrib/guix/guix-build
+++ b/contrib/guix/guix-build
@@ -238,7 +238,7 @@ SOURCE_DATE_EPOCH="${SOURCE_DATE_EPOCH:-$(git -c log.showSignature=false log --f
 # across time.
 time-machine() {
     # shellcheck disable=SC2086
-    guix time-machine --url=https://git.savannah.gnu.org/git/guix.git \
+    guix time-machine --url=https://codeberg.org/guix.git \
                       --commit=ae03f401381e956c4c41b4cf495cbde964fa43d0 \
                       --cores="$JOBS" \
                       --keep-failed \
diff --git a/contrib/guix/guix-codesign b/contrib/guix/guix-codesign
index 4b272f30847..2a9779aee2a 100755
--- a/contrib/guix/guix-codesign
+++ b/contrib/guix/guix-codesign
@@ -226,7 +226,7 @@ SOURCE_DATE_EPOCH="${SOURCE_DATE_EPOCH:-$(git -c log.showSignature=false log --f
 # across time.
 time-machine() {
     # shellcheck disable=SC2086
-    guix time-machine --url=https://git.savannah.gnu.org/git/guix.git \
+    guix time-machine --url=https://codeberg.org/guix.git \
                       --commit=ae03f401381e956c4c41b4cf495cbde964fa43d0 \
                       --cores="$JOBS" \
                       --keep-failed \
diff --git a/share/genbuild.sh b/share/genbuild.sh
index ecc96160e69..fb19a68ce23 100755
--- a/share/genbuild.sh
+++ b/share/genbuild.sh
@@ -28,6 +28,8 @@ if [ "${BITCOIN_GENBUILD_NO_GIT}" != "1" ] && [ -e "$(command -v git)" ] && [ "$
     RAWDESC=$(git describe --abbrev=0 2>/dev/null)
     if [ "$(git rev-parse HEAD)" = "$(git rev-list -1 "$RAWDESC" 2>/dev/null)" ]; then
         git diff-index --quiet HEAD -- && GIT_TAG=$RAWDESC
+        # Replace elements- tag with the corresponding v
+        case "$GIT_TAG" in elements-*) GIT_TAG="v${GIT_TAG#elements-}";; esac
     fi
 
     # otherwise generate suffix from git, i.e. string like "59887e8-dirty"