diff --git a/orb/commands/@common.yml b/orb/commands/@common.yml
index 0e4e4af..62e66b2 100644
--- a/orb/commands/@common.yml
+++ b/orb/commands/@common.yml
@@ -170,7 +170,8 @@ set-release-name:
         command: |
           
           NAMESPACE="${CIRCLE_PROJECT_REPONAME,,}"
-          BRANCHNAME="${CIRCLE_BRANCH}"
+          # Use branch name or fall back to "production" if it's a tag.
+          BRANCHNAME="${CIRCLE_BRANCH:-${CIRCLE_TAG:+production}}"
           
           RELEASE_NAME=$(silta ci release name --branchname "${BRANCHNAME}" --release-suffix "<<parameters.release-suffix>>")
           SILTA_ENVIRONMENT_NAME=$(silta ci release environmentname --branchname "${BRANCHNAME}" --release-suffix "<<parameters.release-suffix>>")