diff --git a/scripts/ci/octez-release.sh b/scripts/ci/octez-release.sh
index ff1ed1400d4d09ce1c87cba449479018dc4b8918..2c52cb7f8b53d8c8e6cd895cf794b8c072a89300 100755
--- a/scripts/ci/octez-release.sh
+++ b/scripts/ci/octez-release.sh
@@ -20,7 +20,7 @@ octez_source_content="$script_inputs_dir/octez-source-content"
 
 # Full octez release tag
 # octez-vX.Y, octez-vX.Y-rcZ or octez-vX.Y-betaZ
-gitlab_release=$(echo "${CI_COMMIT_TAG}" | grep -oE '^octez-v([0-9]+)\.([0-9]+)$' || :)
+gitlab_release=$(echo "${CI_COMMIT_TAG}" | grep -oE '^octez-v([0-9]+)\.([0-9]+)(-(rc|beta)([0-9]+))?$' || :)
 
 # Strips the leading 'octez-v'
 # X.Y, X.Y-rcZ or X.Y-betaZ
diff --git a/scripts/rpm/make_rpm.sh b/scripts/rpm/make_rpm.sh
index 1d218612c2ecd908a4fb55d23e0333740b0659c1..c115d7b0179c72a6e1aed7056646061ed7dae896 100755
--- a/scripts/rpm/make_rpm.sh
+++ b/scripts/rpm/make_rpm.sh
@@ -50,7 +50,7 @@ for specfile in "$myhome"/*spec.in; do
   #
   rpm_name=${OCTEZ_PKGNAME}-${pg}
   init_name=${OCTEZ_REALNAME}-${pg}
-  rpm_vers=$(echo "${pkg_vers}" | tr -d '~')
+  rpm_vers=$(echo "${pkg_vers}" | tr -d '~' | tr '-' '_')
   rpm_fullname="${rpm_name}-${rpm_vers}-${OCTEZ_PKGREV}.${rpm_arch}.rpm"
 
   binaries=$(fixBinaryList "${common}/${pg}-binaries")