diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 421df5a9eb252109c8f5d65489b86866b8bab8b0..65826af651507e1d6abded94f4cfe3f9394b1a6d 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -53,12 +53,13 @@ stages:
     - |
       if [[ "$CI_COMMIT_TAG" == "" ]]; then
         tag="sha-${CI_COMMIT_SHORT_SHA}"
+        CI_SOURCE_BRANCH=$(echo $CI_COMMIT_BRANCH | tr '[:upper:]' '[:lower:]')
       else
-        tag="$CI_COMMIT_TAG"
+        tag="$CI_COMMIT_TAG";
+        # Get (source) branch when tagging
+        CI_SOURCE_BRANCH=$(git for-each-ref | grep $CI_COMMIT_SHA | grep origin | sed "s/.*\///" | tr '[:upper:]' '[:lower:]')
       fi
     - echo current tag ${tag}
-    # Get (source) branch when tagging
-    - CI_SOURCE_BRANCH=$(git for-each-ref | grep $CI_COMMIT_SHA | grep origin | sed "s/.*\///" | tr '[:upper:]' '[:lower:]')
     - echo CI_SOURCE_BRANCH $CI_SOURCE_BRANCH
     - REGISTRY_IMAGE_BASE="$CI_REGISTRY_IMAGE/$CI_SOURCE_BRANCH/$IMG_NAME"
     - FINAL_REGISTRY_IMAGE="$CI_REGISTRY_IMAGE/$CI_SOURCE_BRANCH/$IMG_NAME:${tag}"
diff --git a/gfsBackendService/ci-trigger-test.txt b/gfsBackendService/ci-trigger-test.txt
new file mode 100644
index 0000000000000000000000000000000000000000..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391