diff --git a/devops/gcp/bootstrap.yaml b/devops/gcp/bootstrap.yaml
index 6e94b87adcfb1f47676e5f0e290d81b49bdbf9a4..8a9bf8c9019bb2f266975a2fc38db00738c7d6ea 100644
--- a/devops/gcp/bootstrap.yaml
+++ b/devops/gcp/bootstrap.yaml
@@ -55,17 +55,20 @@ osdu-gcp-test:
 osdu-gcp-dev2-test:
   needs: ["osdu-gcp-bootstrap-dev2"]
 
-osdu-gcp-containerize-bootstrap-gitlab:
+osdu-gcp-containerize-bootstrap-schema:
   stage: containerize
   image: docker:19.03.15
   tags: ["osdu-medium"]
+  needs: ["compile-and-unit-test"]
   services:
     - docker:20.10.7-dind
+  variables:
+    IMAGE_NAME: osdu-gcp-bootstrap-schema
   script:
-    - export EXTRA_DOCKER_TAG=""; if [ "$CI_COMMIT_TAG" != "" ] ; then EXTRA_DOCKER_TAG="-t $CI_REGISTRY_IMAGE/osdu-gcp-bootstrap:$CI_COMMIT_TAG" ; elif [ "$CI_COMMIT_REF_NAME" = "master" ] ; then EXTRA_DOCKER_TAG="-t $CI_REGISTRY_IMAGE/osdu-gcp-bootstrap:latest" ; fi
-    - docker build -t $CI_REGISTRY_IMAGE/osdu-gcp-bootstrap:$CI_COMMIT_SHORT_SHA $EXTRA_DOCKER_TAG --file devops/$OSDU_GCP_VENDOR/bootstrap-osdu-module/Dockerfile .
+    - export EXTRA_DOCKER_TAG=""; if [ "$CI_COMMIT_TAG" != "" ] ; then EXTRA_DOCKER_TAG="-t $CI_REGISTRY_IMAGE/$IMAGE_NAME:$CI_COMMIT_TAG" ; elif [ "$CI_COMMIT_REF_NAME" = "master" ] ; then EXTRA_DOCKER_TAG="-t $CI_REGISTRY_IMAGE/$IMAGE_NAME:latest" ; fi
+    - docker build -t $CI_REGISTRY_IMAGE/$IMAGE_NAME:$CI_COMMIT_SHORT_SHA $EXTRA_DOCKER_TAG --file devops/$OSDU_GCP_VENDOR/bootstrap-osdu-module/Dockerfile .
     - docker login -u $CI_REGISTRY_USER -p $CI_REGISTRY_PASSWORD $CI_REGISTRY
-    - docker push $CI_REGISTRY_IMAGE/osdu-gcp-bootstrap
+    - docker push $CI_REGISTRY_IMAGE/$IMAGE_NAME
   rules:
     - if: '$OSDU_GCP == "true" && $CI_COMMIT_BRANCH =~ /^master$/'
       when: on_success