diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index d56a3f62b853f83b233434aeaf2c70b72983a4f6..8e05c46cac65e89ebcf35012dce8b40467672879 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -27,8 +27,8 @@ variables:
   # We exclude it here to speed up pipeline execution, and avoid having the image fail on our Maven builds
   # Maven jobs should be using semgrep instead
   SAST_EXCLUDED_ANALYZERS: "spotbugs"
-  
   ACCEPTANCE_TEST_DIR: "legal-acceptance-test"
+
 include:
   - project: "osdu/platform/ci-cd-pipelines"
     file: "standard-setup.yml"
@@ -60,6 +60,18 @@ include:
   - project: "osdu/platform/ci-cd-pipelines"
     file: "cloud-providers/core-global.yml"
 
+  - project: "osdu/platform/ci-cd-pipelines"
+    file: "cloud-providers/aws-one-pipeline.yml"
+
+  - project: "osdu/platform/ci-cd-pipelines"
+    file: "cloud-providers/azure-one-pipeline.yml"
+
+  - project: "osdu/platform/ci-cd-pipelines"
+    file: "cloud-providers/gc-one-pipeline.yml"
+
+  - project: "osdu/platform/ci-cd-pipelines"
+    file: "cloud-providers/ibm-one-pipeline.yml"
+
   - local: "devops/gc/pipeline/override-stages.yml"
 
   - local: "devops/core-plus/pipeline/override-stages.yml"
@@ -196,6 +208,7 @@ azure_deploy:
     AZURE_COVERAGE_THRESHOLD: 80
 
 azure_containerize:
+  needs: [ "azure-compile-and-unit-test" ]
   variables:
     AZURE_CONTAINERIZE_REPOSITORY: "-b jdk-17 https://gitlab-ci-token:${CI_JOB_TOKEN}@community.opengroup.org/osdu/platform/deployment-and-operations/base-containers-azure/service-base-image"
 
diff --git a/devops/gc/pipeline/override-stages.yml b/devops/gc/pipeline/override-stages.yml
index 8285428f18bafc09c8a90dcf3084f982ffe7c435..d4fdda864cdd1948ef781bf1000883c5b977941d 100644
--- a/devops/gc/pipeline/override-stages.yml
+++ b/devops/gc/pipeline/override-stages.yml
@@ -82,7 +82,7 @@ download_gc_plugins:
       - $GC == '1'
 
 gc-containerize-gitlab:
-  needs: ["compile-and-unit-test", "download_gc_plugins"]
+  needs: ["gc-compile-and-unit-test", "download_gc_plugins"]
 
 gc-containerize-gcr:
-  needs: ["compile-and-unit-test", "download_gc_plugins"]
+  needs: ["gc-compile-and-unit-test", "download_gc_plugins"]
diff --git a/pom.xml b/pom.xml
index 3cdad1b4fc072f2b9dc5e0a46fde71da5cd30e14..61d7229ca9019aab5359ec046542779d6148602f 100644
--- a/pom.xml
+++ b/pom.xml
@@ -34,15 +34,6 @@
     <name>legal-service</name>
     <description>Legal service</description>
 
-    <modules>
-        <module>legal-core</module>
-        <module>legal-core-plus</module>
-        <module>provider/legal-gc</module>
-        <module>provider/legal-azure</module>
-        <module>provider/legal-aws</module>
-        <module>provider/legal-ibm</module>
-    </modules>
-
     <repositories>
         <repository>
             <id>${repo.releases.id}</id>
@@ -150,6 +141,40 @@
         </dependency>
 		</dependencies>
     <profiles>
+        <profile>
+            <id>core</id>
+            <activation>
+                <activeByDefault>true</activeByDefault>
+            </activation>
+            <modules>
+                <module>legal-core</module>
+                <module>legal-core-plus</module>
+            </modules>
+        </profile>
+        <profile>
+            <id>aws</id>
+            <modules>
+                <module>provider/legal-aws</module>
+            </modules>
+        </profile>
+        <profile>
+            <id>azure</id>
+            <modules>
+                <module>provider/legal-azure</module>
+            </modules>
+        </profile>
+        <profile>
+            <id>ibm</id>
+            <modules>
+                <module>provider/legal-ibm</module>
+            </modules>
+        </profile>
+        <profile>
+            <id>gc</id>
+            <modules>
+                <module>provider/legal-gc</module>
+            </modules>
+        </profile>
         <profile>
             <id>Default</id>
             <activation>