diff --git a/app/filemetadata/.gitlab-ci.yml b/app/filemetadata/.gitlab-ci.yml
index 5e89251d7e70c3712d8240497bfb674c731d8ad7..5a44cd5270eec2d2f284211a8e06d6061fb706ca 100644
--- a/app/filemetadata/.gitlab-ci.yml
+++ b/app/filemetadata/.gitlab-ci.yml
@@ -8,7 +8,4 @@ include:
 
   # deploy
   # azure
-  - local: "app/filemetadata/devops/osdu/cloud-providers/azure.yml"
-  
-  # gcp
-  - local: "app/filemetadata/devops/osdu/cloud-providers/gcp.yml"
\ No newline at end of file
+  - local: "app/filemetadata/devops/osdu/cloud-providers/azure.yml"
\ No newline at end of file
diff --git a/app/filemetadata/devops/osdu/cloud-providers/gcp.yml b/app/filemetadata/devops/osdu/cloud-providers/gcp.yml
deleted file mode 100644
index d0955c72322ec62c1df819b31b9f66a453e31c25..0000000000000000000000000000000000000000
--- a/app/filemetadata/devops/osdu/cloud-providers/gcp.yml
+++ /dev/null
@@ -1,116 +0,0 @@
-filemetadata-osdu-gcp-helm-charts-master:
-  variables:
-    SEISMIC_OSDU_GCP_HELM_CONFIG_DIR: "app/filemetadata/devops/gcp/configmap"
-    SEISMIC_OSDU_GCP_HELM_DEPLOYMENT_DIR: "app/filemetadata/devops/gcp/deploy"
-  extends: .osdu-gcp-helm-charts-master
-
-filemetadata-osdu-gcp-helm-charts-release:
-  variables:
-    SEISMIC_OSDU_GCP_HELM_CONFIG_DIR: "app/filemetadata/devops/gcp/configmap"
-    SEISMIC_OSDU_GCP_HELM_DEPLOYMENT_DIR: "app/filemetadata/devops/gcp/deploy"
-  extends: .osdu-gcp-helm-charts-release
-
-filemetadata-osdu-gcp-containerize-gitlab:
-  variables:
-    SEISMIC_OSDU_GCP_DOCKERFILE_NAME: "Dockerfile"
-    SEISMIC_OSDU_GCP_SERVICE: seismic-store-filemetadata
-  extends: .osdu-gcp-containerize-gitlab
-  before_script:
-    - cd app/$FILEMETADATA_SERVICE
-    - sed -i "s/SEGY_LIBRARY_PAT/$SEGY_LIBRARY_FEED_PAT/g" pip.conf
-  rules:
-    - if: '$OSDU_GCP == "true" && $CI_COMMIT_BRANCH =~ /^release/'
-      when: on_success
-      changes:
-        - devops/**/*
-        - app/filemetadata/**/*
-    - if: '$OSDU_GCP == "true" && $CI_COMMIT_TAG'
-      when: on_success
-      changes:
-        - devops/**/*
-        - app/filemetadata/**/*
-    - if: '$OSDU_GCP == "true"'
-      when: on_success
-      changes:
-        - devops/**/*
-        - app/filemetadata/**/*
-
-filemetadata-osdu-gcp-deploy-configmap:
-  needs: ["filemetadata-osdu-gcp-containerize-gitlab"]
-  variables:
-    SEISMIC_OSDU_GCP_HELM_CONFIG_SERVICE: seismic-store-filemetadata-configmap
-    SEISMIC_OSDU_GCP_HELM_CONFIG_DIR: "app/filemetadata/devops/gcp/configmap"
-    SEISMIC_OSDU_GCP_HELM_CONFIG_SERVICE_VARS: "--set data.domain=$DOMAIN"
-  extends: .osdu-gcp-deploy-configmap
-  rules:
-    - if: '$OSDU_GCP == "true" && $CI_COMMIT_BRANCH =~ /^release/'
-      when: on_success
-      changes:
-        - devops/**/*
-        - app/filemetadata/**/*
-    - if: '$OSDU_GCP == "true" && $CI_COMMIT_TAG'
-      when: on_success
-      changes:
-        - devops/**/*
-        - app/filemetadata/**/*
-      
-filemetadata-osdu-gcp-dev2-deploy-configmap:
-  needs: ["filemetadata-osdu-gcp-containerize-gitlab"]
-  variables:
-    SEISMIC_OSDU_GCP_HELM_CONFIG_SERVICE: seismic-store-filemetadata-configmap
-    SEISMIC_OSDU_GCP_HELM_CONFIG_DIR: "app/filemetadata/devops/gcp/configmap"
-    SEISMIC_OSDU_GCP_HELM_CONFIG_SERVICE_VARS: "--set data.domain=$DOMAIN"
-  extends: .osdu-gcp-dev2-deploy-configmap
-  rules:
-    - if: '$OSDU_GCP == "true" && $CI_COMMIT_BRANCH =~ /^release/'
-      when: on_success
-      changes:
-        - devops/**/*
-        - app/filemetadata/**/*
-    - if: '$OSDU_GCP == "true" && $CI_COMMIT_TAG'
-      when: on_success
-      changes:
-        - devops/**/*
-        - app/filemetadata/**/*
-
-filemetadata-osdu-gcp-deployment:
-  variables:
-    SEISMIC_OSDU_GCP_HELM_DEPLOYMENT_SERVICE: seismic-store-filemetadata-deploy
-    SEISMIC_OSDU_GCP_HELM_DEPLOYMENT_DIR: "app/filemetadata/devops/gcp/deploy"
-    SEISMIC_OSDU_GCP_HELM_DEPLOYMENT_SERVICE_VARS: "--set data.image=$CI_REGISTRY_IMAGE/osdu-gcp-$SEISMIC_OSDU_GCP_SERVICE:$CI_COMMIT_REF_SLUG-$CI_COMMIT_SHORT_SHA"
-    SEISMIC_OSDU_GCP_SERVICE: seismic-store-filemetadata
-  extends: .osdu-gcp-deployment
-  allow_failure: true
-  needs: ["filemetadata-osdu-gcp-containerize-gitlab", "filemetadata-osdu-gcp-deploy-configmap"]
-  rules:
-    - if: '$OSDU_GCP == "true" && $CI_COMMIT_BRANCH =~ /^release/'
-      when: on_success
-      changes:
-        - devops/**/*
-        - app/filemetadata/**/*
-    - if: '$OSDU_GCP == "true" && $CI_COMMIT_TAG'
-      when: on_success
-      changes:
-        - devops/**/*
-        - app/filemetadata/**/*
-
-filemetadata-osdu-gcp-dev2-deploy-deployment:
-  variables:
-    SEISMIC_OSDU_GCP_HELM_DEPLOYMENT_SERVICE: seismic-store-filemetadata-deploy
-    SEISMIC_OSDU_GCP_HELM_DEPLOYMENT_DIR: "app/filemetadata/devops/gcp/deploy"
-    SEISMIC_OSDU_GCP_HELM_DEPLOYMENT_SERVICE_VARS: "--set data.image=$CI_REGISTRY_IMAGE/osdu-gcp-$SEISMIC_OSDU_GCP_SERVICE:$CI_COMMIT_SHORT_SHA"
-    SEISMIC_OSDU_GCP_SERVICE: seismic-store-filemetadata
-  extends: .osdu-gcp-dev2-deploy-deployment
-  needs: ["filemetadata-osdu-gcp-containerize-gitlab", "filemetadata-osdu-gcp-dev2-deploy-configmap"]
-  allow_failure: true
-  rules:
-    - if: '$OSDU_GCP == "true" && $CI_COMMIT_BRANCH =~ /^release/'
-      when: on_success
-      changes:
-        - devops/**/*
-        - app/filemetadata/**/*
-    - if: '$OSDU_GCP == "true" && $CI_COMMIT_TAG'
-      when: on_success
-      changes:
-        - devops/**/*
-        - app/filemetadata/**/*
\ No newline at end of file
diff --git a/app/sdms/devops/osdu/cloud-providers/aws.yml b/app/sdms/devops/osdu/cloud-providers/aws.yml
index b5b9e152ac12a637a46520ff9308491052032b64..c9e682fa2eb482e7a2eab7940305e08c35d5b190 100644
--- a/app/sdms/devops/osdu/cloud-providers/aws.yml
+++ b/app/sdms/devops/osdu/cloud-providers/aws.yml
@@ -47,6 +47,7 @@ sdms_aws-containerize:
       - merge_requests
 
 sdms_aws-update-eks:
+  allow_failure: true
   extends:
     - .aws-update-eks
   needs: ['sdms_aws-containerize']
diff --git a/app/sdms/devops/osdu/cloud-providers/gcp.yml b/app/sdms/devops/osdu/cloud-providers/gcp.yml
index 5b62a333817216b5b9c09bdd273588a508f28c3d..3d340a52b189fe3acaab2403b8e004d515757efb 100644
--- a/app/sdms/devops/osdu/cloud-providers/gcp.yml
+++ b/app/sdms/devops/osdu/cloud-providers/gcp.yml
@@ -22,7 +22,7 @@ sdms-osdu-gcp-helm-charts-release:
 sdms-osdu-gcp-containerize-gitlab:
   variables:
     SEISMIC_OSDU_GCP_DOCKERFILE_NAME: "docker/runtime.Dockerfile"
-    SEISMIC_OSDU_GCP_SERVICE: seismic-store    
+    SEISMIC_OSDU_GCP_SERVICE: seismic-store 
   extends: .osdu-gcp-containerize-gitlab
   before_script:
     - cd app/$SDMS_SERVICE
@@ -58,12 +58,11 @@ sdms-osdu-gcp-deploy-configmap:
     - sed -i 's|#{SERVICE_ACCOUNT_SIGNER}#|'NA'|' ${SEISMIC_OSDU_GCP_HELM_CONFIG_DIR}/values.yaml
     - sed -i 's|#{DES_APPKEY}#|'NA'|' ${SEISMIC_OSDU_GCP_HELM_CONFIG_DIR}/values.yaml
   rules:
-    - if: '$OSDU_GCP == "true" && $CI_COMMIT_BRANCH =~ /^release/'
-      when: on_success
-      changes:
-        - devops/**/*
-        - app/sdms/**/*
-    - if: '$OSDU_GCP == "true" && $CI_COMMIT_TAG'
+    - if: "$CI_COMMIT_BRANCH =~ /^release/"
+      when: never
+    - if: "$CI_COMMIT_TAG"
+      when: never
+    - if: '$OSDU_GCP == "true"'
       when: on_success
       changes:
         - devops/**/*
@@ -99,18 +98,17 @@ sdms-osdu-gcp-deployment:
     SEISMIC_OSDU_GCP_HELM_DEPLOYMENT_SERVICE: seismic-store-deploy
     SEISMIC_OSDU_GCP_HELM_DEPLOYMENT_DIR: "app/sdms/devops/gcp/deploy"
     SEISMIC_OSDU_GCP_SERVICE: seismic-store
-    SEISMIC_OSDU_GCP_HELM_DEPLOYMENT_SERVICE_VARS: "--set data.image=$CI_REGISTRY_IMAGE/osdu-gcp-$SEISMIC_OSDU_GCP_SERVICE:$CI_COMMIT_REF_SLUG-$CI_COMMIT_SHORT_SHA --set data.serviceAccountName=$SEISMIC_OSDU_GCP_SERVICE-k8s"
+    SEISMIC_OSDU_GCP_HELM_DEPLOYMENT_SERVICE_VARS: "--set data.image=$CI_REGISTRY_IMAGE/osdu-gcp:$CI_COMMIT_SHORT_SHA --set data.serviceAccountName=$SEISMIC_OSDU_GCP_SERVICE-k8s"
   extends: .osdu-gcp-deployment
   needs: ["sdms-osdu-gcp-containerize-gitlab", "sdms-osdu-gcp-deploy-configmap"]
   before_script:
     - sed -i 's|#{SDMS_PREFIX}#|'$GCP_SDMS_PREFIX'|' ${SEISMIC_OSDU_GCP_HELM_DEPLOYMENT_DIR}/values.yaml
   rules:
-    - if: '$OSDU_GCP == "true" && $CI_COMMIT_BRANCH =~ /^release/'
-      when: on_success
-      changes:
-        - devops/**/*
-        - app/sdms/**/*
-    - if: '$OSDU_GCP == "true" && $CI_COMMIT_TAG'
+    - if: "$CI_COMMIT_BRANCH =~ /^release/"
+      when: never
+    - if: "$CI_COMMIT_TAG"
+      when: never
+    - if: '$OSDU_GCP == "true"'
       when: on_success
       changes:
         - devops/**/*
@@ -121,7 +119,7 @@ sdms-osdu-gcp-dev2-deploy-deployment:
     SEISMIC_OSDU_GCP_HELM_DEPLOYMENT_SERVICE: seismic-store-deploy
     SEISMIC_OSDU_GCP_HELM_DEPLOYMENT_DIR: "app/sdms/devops/gcp/deploy"
     SEISMIC_OSDU_GCP_SERVICE: seismic-store
-    SEISMIC_OSDU_GCP_HELM_DEPLOYMENT_SERVICE_VARS: "--set data.image=$CI_REGISTRY_IMAGE/osdu-gcp-$SEISMIC_OSDU_GCP_SERVICE:$CI_COMMIT_SHORT_SHA"
+    SEISMIC_OSDU_GCP_HELM_DEPLOYMENT_SERVICE_VARS: "--set data.image=$CI_REGISTRY_IMAGE/osdu-gcp:$CI_COMMIT_SHORT_SHA"
   extends: .osdu-gcp-dev2-deploy-deployment
   needs: ["sdms-osdu-gcp-containerize-gitlab", "sdms-osdu-gcp-dev2-deploy-configmap"]
   before_script:
@@ -165,12 +163,11 @@ sdms-osdu-gcp-test-python:
     - chmod +x ./tests/e2e/run_e2e_tests.sh
     - ./tests/e2e/run_e2e_tests.sh --seistore-svc-url="https://${OSDU_GCP_UNIT_HOSTNAME}${GCP_SDMS_PREFIX}" --seistore-svc-api-key="NA" --user-idtoken="$OSDU_GCP_INTEGRATION_TESTER" --tenant="${OSDU_GCP_TENANT}" --admin-email="${OSDU_GCP_SEISTORE_ADMIN_EMAIL}" --datapartition="${DATA_PARTITION_ID}" --legaltag01="${OSDU_GCP_SEISTORE_LEGALTAG01}" --legaltag02="${OSDU_GCP_SEISTORE_LEGALTAG02}" --VCS-Provider="${ISGITLAB}"
   rules:
-    - if: '$OSDU_GCP == "true" && $CI_COMMIT_BRANCH =~ /^release/'
-      when: on_success
-      changes:
-        - devops/**/*
-        - app/sdms/**/*
-    - if: '$OSDU_GCP == "true" && $CI_COMMIT_TAG'
+    - if: "$CI_COMMIT_BRANCH =~ /^release/"
+      when: never
+    - if: "$CI_COMMIT_TAG"
+      when: never
+    - if: '$OSDU_GCP == "true"'
       when: on_success
       changes:
         - devops/**/*
@@ -212,4 +209,4 @@ sdms-osdu-gcp-dev2-test-python:
       when: on_success
       changes:
         - devops/**/*
-        - app/sdms/**/*
\ No newline at end of file
+        - app/sdms/**/*
diff --git a/app/sdms/devops/osdu/cloud-providers/ibm.yml b/app/sdms/devops/osdu/cloud-providers/ibm.yml
index d8c73b56715609fc758851863cad034f7e72cfd3..e9a14e6649b2be9b4742c849d6b8ce31fea13090 100644
--- a/app/sdms/devops/osdu/cloud-providers/ibm.yml
+++ b/app/sdms/devops/osdu/cloud-providers/ibm.yml
@@ -44,6 +44,7 @@ sdms_ibm-test-py:
   extends:
     - .ibm-test-py
   needs: ["sdms_ibm-deploy"]
+  allow_failure: true
   script:
     - cd app/$SDMS_SERVICE
     - apt-get update
diff --git a/devops/osdu/cloud-providers/gcp-common-pipeline.yml b/devops/osdu/cloud-providers/gcp-common-pipeline.yml
index ae5d4053e6f4504e08e85c92ccec697ca3a560f4..3d222e7588a7184ffa14a8af7a89850808d23df9 100644
--- a/devops/osdu/cloud-providers/gcp-common-pipeline.yml
+++ b/devops/osdu/cloud-providers/gcp-common-pipeline.yml
@@ -10,6 +10,19 @@
   - gcloud config set project $OSDU_GCP_DEV2_PROJECT
   - gcloud container clusters get-credentials $OSDU_GCP_DEV2_CLUSTER --zone $OSDU_GCP_DEV2_ZONE --project $OSDU_GCP_DEV2_PROJECT
   - curl https://get.helm.sh/helm-v3.5.4-linux-amd64.tar.gz -s -o helm.tgz; tar -zxf helm.tgz; mv linux-amd64/helm /usr/local/bin/
+  
+.define_VER: &define_VER
+  - >
+    if [[ -z $CI_COMMIT_TAG ]] && [[ $CI_COMMIT_BRANCH =~ ^release\/[0-9]{1,2}.[0-9]{1,2}$ ]];
+    then
+        RELEASE_VER=$(echo $CI_COMMIT_BRANCH | sed "s?^release/??");
+        VER="$RELEASE_VER.0-release"
+    elif [[ $CI_COMMIT_TAG =~ ^v[0-9]{1,2}\.[0-9]{1,2}\.[0-9]{1,2}$ ]];
+    then
+        VER=$(echo $CI_COMMIT_TAG | sed "s/^v//");
+    else
+        VER="0.0.0-invalid";
+    fi;
 
 .osdu-gcp-helm-charts-master:
   stage: build
@@ -46,11 +59,10 @@
   cache: {}
   allow_failure: true
   script:
-    - export EXTRA_DOCKER_TAG=""; if [ "$CI_COMMIT_TAG" != "" ] ; then EXTRA_DOCKER_TAG="-t $CI_REGISTRY_IMAGE/osdu-gcp-$SEISMIC_OSDU_GCP_SERVICE:$CI_COMMIT_REF_SLUG-$CI_COMMIT_TAG" ; elif [ "$CI_COMMIT_REF_NAME" = "master" ] ; then EXTRA_DOCKER_TAG="-t $CI_REGISTRY_IMAGE/osdu-gcp-$SEISMIC_OSDU_GCP_SERVICE:latest" ; fi
-    - docker build -t $CI_REGISTRY_IMAGE/osdu-gcp-$SEISMIC_OSDU_GCP_SERVICE:$CI_COMMIT_REF_SLUG-$CI_COMMIT_SHORT_SHA $EXTRA_DOCKER_TAG --file $SEISMIC_OSDU_GCP_DOCKERFILE_NAME .
+    - export EXTRA_DOCKER_TAG=""; if [ "$CI_COMMIT_TAG" != "" ] ; then EXTRA_DOCKER_TAG="-t $CI_REGISTRY_IMAGE/osdu-gcp-$CI_COMMIT_TAG" ; elif [ "$CI_COMMIT_REF_NAME" = "master" ] ; then EXTRA_DOCKER_TAG="-t $CI_REGISTRY_IMAGE/osdu-gcp:latest" ; fi
+    - docker build -t $OSDU_GCP_LOCAL_IMAGE_TAG_SHA $EXTRA_DOCKER_TAG --file $SEISMIC_OSDU_GCP_DOCKERFILE_NAME .
     - docker login -u $CI_REGISTRY_USER -p $CI_REGISTRY_PASSWORD $CI_REGISTRY
-    - docker push $CI_REGISTRY_IMAGE/osdu-gcp-$SEISMIC_OSDU_GCP_SERVICE:$CI_COMMIT_REF_SLUG-$CI_COMMIT_SHORT_SHA
-    - docker push $CI_REGISTRY_IMAGE/osdu-gcp-$SEISMIC_OSDU_GCP_SERVICE
+    - docker push $CI_REGISTRY_IMAGE/osdu-gcp
   rules:
     - if: '$OSDU_GCP == "true" && $CI_COMMIT_BRANCH =~ /^release/'
       when: on_success