diff --git a/RELEASE.sh b/RELEASE.sh
index 8e9255698..ba033460e 100755
--- a/RELEASE.sh
+++ b/RELEASE.sh
@@ -11,9 +11,6 @@ CHANGELOG_FILE="$CHANGELOG_DIR/$VERSIONID.txt"
 
 git diff --exit-code || echo -e "\nWARNING WARNING WARNING WARNING WARNING: this branch contains uncommit changes."
 
-#TODO Execute all tests: we are destroying data, running on a real device.
-# ./gradlew connectedCheck
-
 # Changelog
 echo -e "\nPrevious changelog\n------------"
 PREVIOUS_CHANGELOG=$(find "$CHANGELOG_DIR" -iname "[[:digit:]]**.txt" | sort -n | tail -1)
@@ -34,8 +31,8 @@ gedit -w "$CHANGELOG_FILE"
 git add "$CHANGELOG_FILE"
 
 echo "Updating build.gradle"
-sed -i s/versionCode\ .*/versionCode\ "$VERSIONID"/g build.gradle
-sed -i s/versionName\ .*/versionName\ "\"$VERSIONNAME\""/g build.gradle
+sed -i s/versionCode\ [0-9]/versionCode\ "$VERSIONID"/g build.gradle
+sed -i s/versionName\ \"v/versionName\ "\"$VERSIONNAME\""/g build.gradle
 
 git diff
 
diff --git a/RELEASE_BUILD.sh b/RELEASE_BUILD.sh
index d22da24a1..b859b807c 100755
--- a/RELEASE_BUILD.sh
+++ b/RELEASE_BUILD.sh
@@ -6,8 +6,13 @@ export JAVA_HOME=/usr/lib/jvm/java-21-openjdk-amd64/
 
 JAVA_VERSION=`java --version`
 if [[ $JAVA_VERSION != "openjdk 21."* ]]; then
-  echo "OpenJDK version should be 21.X"
-  exit -1;
+  echo -e "OpenJDK version should be 21.X"
+fi
+
+git diff --exit-code || echo -e "\nWARNING WARNING WARNING WARNING WARNING: this branch contains uncommit changes."
+
+if [[ $(git log "$(git describe --tags --abbrev=0)..HEAD" --no-merges --oneline | wc -l) -gt 0 ]]; then
+  echo -e "No version tag for this commit; please use RELEASE.sh";
 fi
 
 RELEASE_STORE_PASSWORD=