diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 487a6e20e8d11a9efa78ae5b79a3e67cc95c7c66..91b3d94e49a81f5e556f855b17a96c2d141c609e 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -132,10 +132,9 @@ osdu-gcp-containerize-for-release:
   tags: ["osdu-medium"]
   only:
     variables:
-      - $OSDU_GCP == 'true' && $RELEASE =~ /(v)(\d+\.)(\d+\.)\w+/i
+      - $OSDU_GCP == 'true' && $CI_COMMIT_TAG != null
   variables:
-    IMAGE_TAG: $CI_REGISTRY_IMAGE/osdu-gcp-$OSDU_GCP_SERVICE:gcp-$RELEASE
-    IMAGE_TAG_RELEASE: $CI_REGISTRY_IMAGE/osdu-gcp-$OSDU_GCP_SERVICE:gcp-release
+    IMAGE_TAG_RELEASE: $CI_REGISTRY_IMAGE/osdu-gcp-$OSDU_GCP_SERVICE:gcp-$CI_COMMIT_TAG
   script:
     - echo ---- ---- ---- SYSTEM DEPENDENCIES ---- ---- ----
     - apk update
@@ -152,10 +151,9 @@ osdu-gcp-containerize-for-release:
     - commit_branch=$commit_id
     - echo $commit_branch
     - echo ---- ---- BUILD IMAGE
-    - docker build -t $IMAGE_TAG -t $IMAGE_TAG_RELEASE -t=$CI_REGISTRY_IMAGE:latest --rm . -f ./build/Dockerfile --build-arg PIP_WHEEL_DIR=python-packages --build-arg build_date="$current_utc_date" --build-arg build_number=$commit_id --build-arg commit_id=$commit_id --build-arg build_origin="Gitlab" --build-arg commit_branch=$commit_branch
+    - docker build -t $IMAGE_TAG -t $IMAGE_TAG_RELEASE --rm . -f ./build/Dockerfile --build-arg PIP_WHEEL_DIR=python-packages --build-arg build_date="$current_utc_date" --build-arg build_number=$commit_id --build-arg commit_id=$commit_id --build-arg build_origin="Gitlab" --build-arg commit_branch=$commit_branch
     - docker login -u $CI_REGISTRY_USER -p $CI_REGISTRY_PASSWORD $CI_REGISTRY
     - echo ---- ---- PUSH IMAGE
-    - docker push $IMAGE_TAG
     - docker push $IMAGE_TAG_RELEASE
 
 osdu-gcp-test-python: