diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 37612eef1b7108a15ac67404c4ff8107f8daa3a8..336441ec9fe94e0b7f2b877dedfb3396895aa6cc 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -183,15 +183,15 @@ version:
         INTERNAL_TAG="${VERSION}"
         NIGHTLY_TAG="${VERSION}-nightly"
         EXPORT_TAG="${VERSION}"
-      elif [[ "$CI_COMMIT_TAG" =~ ^v[0-9.]+ ]]; then
+      elif [[ "$CI_COMMIT_TAG" =~ ^v[0-9.]+\.[0-9]+\.[0-9]+ ]]; then
         VERSION="${CI_COMMIT_TAG:1}"
         INTERNAL_TAG="stable-tag-${VERSION}"
         EXPORT_TAG="${VERSION}"
-      elif [[ "$CI_COMMIT_BRANCH" = "v[0-9.]+-stable" ]]; then
+      elif [[ "$CI_COMMIT_BRANCH" = ^v[0-9.]+\.[0-9]+-stable ]]; then
         VERSION="${CI_COMMIT_BRANCH:1}"
         INTERNAL_TAG="stable-br-${VERSION}"
         EXPORT_TAG="${VERSION}"
-      elif [[ "$CI_COMMIT_BRANCH" =~ ^v[0-9.]+-[a-z]+-stable ]]; then
+      elif [[ "$CI_COMMIT_BRANCH" =~ ^v[0-9.]+\.[0-9]+-[a-z]+-stable ]]; then
         VERSION="${CI_COMMIT_BRANCH:1}"
         INTERNAL_TAG="stable-br-${VERSION}"
         EXPORT_TAG="${VERSION}"