diff --git a/pom.xml b/pom.xml
index 7e99f7f610cbb79be5fb388f3a34411032c2fb66..19963fcc129fba1936ecee5b1217bf3b50a25aae 100644
--- a/pom.xml
+++ b/pom.xml
@@ -69,6 +69,18 @@
                 <module>indexer-core</module>
             </modules>
         </profile>
+        <profile>
+            <id>indexer-aws</id>
+            <activation>
+                <property>
+                    <name>provider</name>
+                    <value>indexer-aws</value>
+                </property>
+            </activation>
+            <modules>
+                <module>provider/indexer-aws</module>
+            </modules>
+        </profile>
         <profile>
             <id>indexer-azure</id>
             <activation>
diff --git a/testing/indexer-test-aws/pom.xml b/testing/indexer-test-aws/pom.xml
index 6e0adf9c2a4cf7f882d4d695761913bb3f2f3a30..34822064df4d2bd8358f58f9d51f337c4a81d634 100644
--- a/testing/indexer-test-aws/pom.xml
+++ b/testing/indexer-test-aws/pom.xml
@@ -18,22 +18,26 @@
 
     <dependencies>
 
+        <!-- Internal packages -->
         <dependency>
             <groupId>org.opengroup.osdu.indexer</groupId>
             <artifactId>indexer-test-core</artifactId>
             <version>0.0.1</version>
         </dependency>
-        <dependency>
-            <groupId>com.amazonaws</groupId>
-            <artifactId>aws-request-signing-apache-interceptor</artifactId>
-            <version>1.0-SNAPSHOT</version>
-        </dependency>
         <dependency>
             <groupId>org.opengroup.osdu.core.aws</groupId>
             <artifactId>aws-osdu-util</artifactId>
             <version>0.0.1</version>
         </dependency>
-        <!-- Cucumber -->
+
+        <!-- AWS managed packages -->
+        <dependency>
+            <groupId>com.amazonaws</groupId>
+            <artifactId>aws-request-signing-apache-interceptor</artifactId>
+            <version>1.0-SNAPSHOT</version>
+        </dependency>
+
+        <!-- Testing -->
         <dependency>
             <groupId>junit</groupId>
             <artifactId>junit</artifactId>
@@ -53,7 +57,7 @@
             <scope>test</scope>
         </dependency>
 
-        <!-- Gson: Java to Json conversion -->
+        <!-- third party Apache 2.0 license packages -->
         <dependency>
             <groupId>com.google.code.gson</groupId>
             <artifactId>gson</artifactId>
@@ -65,7 +69,6 @@
             <artifactId>jackson-jaxrs-json-provider</artifactId>
             <version>2.9.9</version>
         </dependency>
-
         <dependency>
             <groupId>org.glassfish</groupId>
             <artifactId>javax.json</artifactId>
@@ -76,19 +79,22 @@
             <artifactId>jersey-client</artifactId>
             <version>1.19.4</version>
         </dependency>
-
         <dependency>
             <groupId>org.projectlombok</groupId>
             <artifactId>lombok</artifactId>
             <version>1.18.2</version>
             <scope>provided</scope>
         </dependency>
-
         <dependency>
             <groupId>commons-io</groupId>
             <artifactId>commons-io</artifactId>
             <version>2.6</version>
         </dependency>
+        <dependency>
+            <groupId>com.google.guava</groupId>
+            <artifactId>guava</artifactId>
+            <version>27.1-jre</version>
+        </dependency>
 
         <!--Elasticsearch-->
         <dependency>
@@ -119,10 +125,5 @@
             <version>1.8.0-beta4</version>
         </dependency>-->
 
-        <dependency>
-            <groupId>com.google.guava</groupId>
-            <artifactId>guava</artifactId>
-            <version>27.1-jre</version>
-        </dependency>
     </dependencies>
 </project>
\ No newline at end of file