diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index d3241259bf8c03c01e6a959ea87e032e6194ad3c..34a2bbf0132175d04f0fab8f0ddc7e3fd3423e14 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -61,9 +61,20 @@ include:
   - project: "osdu/platform/ci-cd-pipelines"
     file: "cloud-providers/core-global.yml"
 
-  - local: "devops/gc/pipeline/override-stages.yml"
   - local: "devops/core-plus/pipeline/override-stages.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: "/publish.yml"
 
 download_plugins:
diff --git a/NOTICE b/NOTICE
index ff9db515b3dfc3db2c2ebcfcd3c8fdb5b24db4f9..c55150a84524b2f8978c4ca0187995218d5467aa 100644
--- a/NOTICE
+++ b/NOTICE
@@ -495,6 +495,7 @@ The following software have components provided under the terms of this license:
 - Eclipse Parsson (from https://repo1.maven.org/maven2/org/eclipse/parsson/parsson)
 - HK2 API module (from https://repo1.maven.org/maven2/org/glassfish/hk2/hk2-api)
 - HK2 Implementation Utilities (from https://repo1.maven.org/maven2/org/glassfish/hk2/hk2-utils)
+- HK2 OSGi resource locator (from https://repo1.maven.org/maven2/org/glassfish/hk2/osgi-resource-locator)
 - HK2 core module (from https://repo1.maven.org/maven2/org/glassfish/hk2/hk2-core)
 - JUnit Jupiter (Aggregator) (from https://junit.org/junit5/)
 - JUnit Jupiter API (from http://junit.org/junit5/, https://junit.org/junit5/)
@@ -511,7 +512,6 @@ The following software have components provided under the terms of this license:
 - Jakarta RESTful WS API (from https://github.com/eclipse-ee4j/jaxrs-api, https://repo1.maven.org/maven2/jakarta/ws/rs/jakarta.ws.rs-api)
 - Jakarta Validation API (from https://beanvalidation.org)
 - Jakarta XML Binding API (from https://repo1.maven.org/maven2/jakarta/xml/bind/jakarta.xml.bind-api, https://repo1.maven.org/maven2/org/jboss/spec/javax/xml/bind/jboss-jaxb-api_2.3_spec)
-- OSGi resource locator (from https://repo1.maven.org/maven2/org/glassfish/hk2/osgi-resource-locator)
 - ServiceLocator Default Implementation (from https://repo1.maven.org/maven2/org/glassfish/hk2/hk2-locator)
 - aopalliance-repackaged (from https://repo1.maven.org/maven2/org/glassfish/hk2/external/aopalliance-repackaged)
 - jersey-container-servlet (from https://repo1.maven.org/maven2/org/glassfish/jersey/containers/jersey-container-servlet)
@@ -543,6 +543,7 @@ The following software have components provided under the terms of this license:
 - Eclipse Expressly (from https://projects.eclipse.org/projects/ee4j.expressly)
 - Eclipse Parsson (from https://repo1.maven.org/maven2/org/eclipse/parsson/parsson)
 - HK2 Implementation Utilities (from https://repo1.maven.org/maven2/org/glassfish/hk2/hk2-utils)
+- HK2 OSGi resource locator (from https://repo1.maven.org/maven2/org/glassfish/hk2/osgi-resource-locator)
 - HK2 core module (from https://repo1.maven.org/maven2/org/glassfish/hk2/hk2-core)
 - JAX-RS 2.1: The Java(TM) API for RESTful Web Services (from https://repo1.maven.org/maven2/org/jboss/spec/javax/ws/rs/jboss-jaxrs-api_2.1_spec)
 - Jakarta Activation API (from https://github.com/eclipse-ee4j/jaf, https://github.com/jakartaee/jaf-api, https://repo1.maven.org/maven2/jakarta/activation/jakarta.activation-api)
@@ -555,7 +556,6 @@ The following software have components provided under the terms of this license:
 - Jakarta XML Binding API (from https://repo1.maven.org/maven2/jakarta/xml/bind/jakarta.xml.bind-api, https://repo1.maven.org/maven2/org/jboss/spec/javax/xml/bind/jboss-jaxb-api_2.3_spec)
 - Java Architecture for XML Binding (from http://jaxb.java.net/, https://repo1.maven.org/maven2/javax/xml/bind/jaxb-api)
 - JavaBeans Activation Framework (from <http://java.sun.com/javase/technologies/desktop/javabeans/jaf/index.jsp>, http://java.sun.com/javase/technologies/desktop/javabeans/jaf/index.jsp, https://repo1.maven.org/maven2/com/sun/activation/javax.activation)
-- OSGi resource locator (from https://repo1.maven.org/maven2/org/glassfish/hk2/osgi-resource-locator)
 - ServiceLocator Default Implementation (from https://repo1.maven.org/maven2/org/glassfish/hk2/hk2-locator)
 - aopalliance-repackaged (from https://repo1.maven.org/maven2/org/glassfish/hk2/external/aopalliance-repackaged)
 - javax.annotation API (from http://jcp.org/en/jsr/detail?id=250)
diff --git a/pom.xml b/pom.xml
index 34374ce2184c4f8aa02b2b543a06a0a68ffa1534..5376a470da5f7fbf4f079e62402c3c9b017a92a5 100644
--- a/pom.xml
+++ b/pom.xml
@@ -56,14 +56,6 @@
     	</license>
     </licenses>
 
-    <modules>
-        <module>search-core</module>
-        <module>search-core-plus</module>
-        <module>provider/search-gc</module>
-        <module>provider/search-aws</module>
-        <module>provider/search-azure</module>
-        <module>provider/search-ibm</module>
-    </modules>
     <dependencyManagement>
         <dependencies>
             <dependency>
@@ -370,6 +362,40 @@
                 <publish.releases.url>https://community.opengroup.org/api/v4/projects/19/packages/maven</publish.releases.url>
             </properties>
         </profile>
+        <profile>
+            <id>core</id>
+            <activation>
+                <activeByDefault>true</activeByDefault>
+            </activation>
+            <modules>
+                <module>search-core</module>
+                <module>search-core-plus</module>
+            </modules>
+        </profile>
+        <profile>
+            <id>aws</id>
+            <modules>
+                <module>provider/search-aws</module>
+            </modules>
+        </profile>
+        <profile>
+            <id>azure</id>
+            <modules>
+                <module>provider/search-azure</module>
+            </modules>
+        </profile>
+        <profile>
+            <id>ibm</id>
+            <modules>
+                <module>provider/search-ibm</module>
+            </modules>
+        </profile>
+        <profile>
+            <id>gc</id>
+            <modules>
+                <module>provider/search-gc</module>
+            </modules>
+        </profile>
     </profiles>
 
     <build>
diff --git a/provider/search-aws/build-aws/buildspec.yaml b/provider/search-aws/build-aws/buildspec.yaml
index 72f53c85e331569b41c436c2388588f17e16c8cd..71b8a4fbf1a2de992dc79d8ee5675e74056dc267 100644
--- a/provider/search-aws/build-aws/buildspec.yaml
+++ b/provider/search-aws/build-aws/buildspec.yaml
@@ -73,8 +73,8 @@ phases:
       - cp devops/aws/requirements.txt testing/integration-tests/search-test-aws/build-aws/requirements.txt
 
       - echo "Building primary service assemblies..."
-      - mvn -ntp -B test install -pl .,search-core,provider/search-aws -Ddeployment.environment=prod
-      - mvn sonar:sonar -pl .,provider/search-aws -Dsonar.login=${SONAR_USERNAME} -Dsonar.password=${SONAR_PASSWORD} -Dsonar.branch.name=${BRANCH_NAME} -Dsonar.host.url=${SONAR_URL}
+      - mvn -ntp -B test install -pl .,search-core,provider/search-aws -P aws,core -Ddeployment.environment=prod
+      - mvn sonar:sonar -pl .,provider/search-aws -P aws -Dsonar.login=${SONAR_USERNAME} -Dsonar.password=${SONAR_PASSWORD} -Dsonar.branch.name=${BRANCH_NAME} -Dsonar.host.url=${SONAR_URL}
       - echo "Building integration testing assemblies and gathering artifacts..."
       - ./testing/integration-tests/search-test-aws/build-aws/prepare-dist.sh