diff --git a/src/scripts/deliver.sh b/src/scripts/deliver.sh
index 4d54f61..0cef9cb 100755
--- a/src/scripts/deliver.sh
+++ b/src/scripts/deliver.sh
@@ -38,13 +38,16 @@ BRANCH=$(git branch --show-current)
 RELEASE=$(grep PROJECT_RELEASE_ITER= ./config.sh | ${SED} s/PROJECT_RELEASE_ITER=//g)
 popd
 
-if [ "${BRANCH}" == "master" ] || [ "${BRANCH}" == "alpha" ] ||
-  [ "${BRANCH}" == "main" ] || [ "${BRANCH}" == "release" ] ||
-  [ "${BRANCH}" == "beta" ] || [ "${BRANCH}" == "rc" ]; then
-  DEST_DIR=${DEST_DIR}/${RELEASE}
-elif [[ ${BRANCH} = *'-alpha-'* ]] || [[ ${BRANCH} = *'-beta-'* ]] ||
-  [[ ${BRANCH} = *'-rc-'* ]] || [[ ${BRANCH} = *'-release-'* ]]; then
-  DEST_DIR=${DEST_DIR}/nightly
+if [[ "${BRANCH}" =~ ^(master|main|release)$ ]] ||
+  [[ "${BRANCH}" =~ ^(alpha|beta|rc)(\.[0-9]+)?$ ]]; then
+  DEST_DIR="${DEST_DIR}/$([[ "${BRANCH}" =~ ^(master|main|release)$ ]] &&
+    printf '%s' "${RELEASE}" ||
+    printf '%s' "${BRANCH%%.*}")"
+elif [[ "${BRANCH}" == *"-alpha-"* ]] || [[ "${BRANCH}" == *"-beta-"* ]] ||
+  [[ "${BRANCH}" == *"-rc-"* ]] || [[ "${BRANCH}" == *"-release-"* ]] ||
+  [[ "${BRANCH}" == *"-alpha."* ]] || [[ "${BRANCH}" == *"-beta."* ]] ||
+  [[ "${BRANCH}" == *"-rc."* ]]; then
+  DEST_DIR="${DEST_DIR}/nightly"
 else
   error_exit "skipping ${PROJECT_FILE_PART}" 0
 fi