diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index a8ca2bffe630a107f1c5bdefe2a0c27d94752b35..0f79c31e1a8d73293de53d814a90c04a7505d908 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -5,7 +5,7 @@ variables:
   AWS_SERVICE: indexer
   AWS_SERVICE_GATEWAY: osdu-gateway
   AWS_ENVIRONMENT: dev
-  AWS_DEPLOY_TARGET: HELM
+  AWS_DEPLOY_TARGET: TF
   AWS_EKS_DEPLOYMENT_NAME: os-indexer
 
   GCP_BUILD_SUBDIR: provider/indexer-gcp
@@ -31,33 +31,43 @@ variables:
 include:
   - project: "osdu/platform/ci-cd-pipelines"
     file: "standard-setup.yml"
+    ref: m18-pipeline-update-mm
 
   - project: "osdu/platform/ci-cd-pipelines"
     file: "build/maven.yml"
+    ref: m18-pipeline-update-mm
 
   - project: "osdu/platform/ci-cd-pipelines"
     file: "scanners/fossa-maven.yml"
+    ref: m18-pipeline-update-mm
 
   - project: "osdu/platform/ci-cd-pipelines"
     file: "scanners/gitlab-ultimate.yml"
+    ref: m18-pipeline-update-mm
 
   - project: "osdu/platform/ci-cd-pipelines"
     file: "cloud-providers/aws-global.yml"
+    ref: m18-pipeline-update-mm
 
   - project: "osdu/platform/ci-cd-pipelines"
     file: "cloud-providers/aws-maven.yml"
+    ref: m18-pipeline-update-mm
 
   - project: "osdu/platform/ci-cd-pipelines"
     file: "cloud-providers/azure.yml"
+    ref: m18-pipeline-update-mm
 
   - project: "osdu/platform/ci-cd-pipelines"
     file: "cloud-providers/ibm.yml"
+    ref: m18-pipeline-update-mm
 
   - project: "osdu/platform/ci-cd-pipelines"
     file: "publishing/pages.yml"
+    ref: m18-pipeline-update-mm
 
   - project: "osdu/platform/ci-cd-pipelines"
     file: "cloud-providers/gc-global.yml"
+    ref: m18-pipeline-update-mm
 
   - local: "devops/gc/pipeline/override-stages.yml"