diff --git a/contrib/guix/libexec/prelude.bash b/contrib/guix/libexec/prelude.bash
index 781e9c17e8..6587719af2 100644
--- a/contrib/guix/libexec/prelude.bash
+++ b/contrib/guix/libexec/prelude.bash
@@ -50,7 +50,7 @@ fi
 # 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=d5ca4d4fd713a9f7e17e074a1e37dda99bbb09fc \
                       --cores="$JOBS" \
                       --keep-failed \
diff --git a/share/genbuild.sh b/share/genbuild.sh
index ecc96160e6..fb19a68ce2 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"