diff --git a/devops/core-plus/pipeline/override-stages.yml b/devops/core-plus/pipeline/override-stages.yml
index 62aabb929ed8074e9cdc7a840f8bd94ac87286f8..b39bb17f5617f237a9abc6c9a13f9efbbd8960df 100644
--- a/devops/core-plus/pipeline/override-stages.yml
+++ b/devops/core-plus/pipeline/override-stages.yml
@@ -5,19 +5,13 @@ variables:
   CORE_ENABLE_BOOTSTRAP: "true"
   CORE_SERVICE: schema
   CORE_HELM_TIMEOUT: "--timeout 15m"
+  CORE_TEST_SUBDIR: testing/schema-test-core
 
-core-test:
+core-containerize-bootstrap-gitlab:
+  tags: ["osdu-medium"]
   variables:
-    CORE_TEST_SUBDIR: testing/schema-test-core
-    HOST: https://osdu.core-dev.gcp.gnrg-osdu.projects.epam.com
-    PRIVATE_TENANT1: osdu
-    PRIVATE_TENANT2: osdu
-    SHARED_TENANT: osdu
-    VENDOR: anthos
+    CORE_IMAGE_BOOTSTRAP_NAME: "core-plus-bootstrap-schema"
+
+core-test:
   script:
     - $MAVEN_BUILD . test-results.log verify -q -f $CORE_TEST_SUBDIR/pom.xml
-
-core-containerize-bootstrap-gitlab:
-  variables:
-    IMAGE_BOOTSTRAP_NAME: "core-plus-bootstrap-schema"
-  tags: ["osdu-medium"]