diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 1937d97cc70..7fc3b52672c 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -22,7 +22,10 @@ include:
 
 stages:
   - build
+  - shared-pipeline-build
+  - shared-pipeline-test
   - publish
+  - shared-pipeline-publish
   - java-spring-petclinic-parallel
   - java-spring-petclinic-parallel-slo
   - java-startup-parallel
@@ -32,7 +35,6 @@ stages:
   - java-dacapo-parallel
   - java-dacapo-parallel-slo
   - java-post-pr-comment
-  - shared-pipeline
   - benchmarks
   - tests
   - tests-arm64
@@ -1227,7 +1229,10 @@ deploy_to_di_backend:manual:
 deploy_to_maven_central:
   extends: .gradle_build
   stage: publish
-  needs: [ build ]
+  needs:
+    - build
+    - job: system_tests
+      optional: true
   variables:
     CACHE_TYPE: "lib"
   rules:
@@ -1397,7 +1402,6 @@ verify_maven_central_deployment:
       done
 
 publishing-gate:
-  stage: publish
   needs:
     - job: verify_maven_central_deployment
       optional: true # Required for releases only
diff --git a/.gitlab/one-pipeline.locked.yml b/.gitlab/one-pipeline.locked.yml
index 98fd39f505d..655847911bf 100644
--- a/.gitlab/one-pipeline.locked.yml
+++ b/.gitlab/one-pipeline.locked.yml
@@ -1,4 +1,5 @@
 # DO NOT EDIT THIS FILE MANUALLY
 # This file is auto-generated by automation.
 include:
-  - remote: https://gitlab-templates.ddbuild.io/libdatadog/include/versions/1.0.0/one-pipeline.yml
+  # TEMP: testing libdatadog-build branch
+  - remote: https://gitlab-templates.ddbuild.io/libdatadog/include-wip/sarahchen6/separate-shared-pipeline-into-multiple-stages/one-pipeline.yml