diff --git a/.gitignore b/.gitignore
index 78079a17a81797c4da9cfd295759a7c3c510b256..d2dd4004e95485bc1b0e260c06b1c90f8cbcee54 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,17 @@
+# Copyright © 2020 Amazon Web Services
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
 # Compiled class file
 *.class
 
@@ -39,3 +53,7 @@ load-tests/*.pyc
 # Environment configuration
 *.env
 .sts4*
+
+
+### IntelliJ IDEA ###
+*.iml
diff --git a/NOTICE b/NOTICE
index 62f6feabd729d1ec75b71aa6e300fc5e8406bcb8..2d5a7492984461b1b32c71f5a6d8d75c90c2e6cb 100644
--- a/NOTICE
+++ b/NOTICE
@@ -162,10 +162,10 @@ The following software have components provided under the terms of this license:
 - Microsoft Application Insights Java SDK Spring Boot starter (from https://github.com/Microsoft/ApplicationInsights-Java)
 - Microsoft Application Insights Java SDK Web Module (from https://github.com/Microsoft/ApplicationInsights-Java)
 - Microsoft Application Insights Log4j 2 Appender (from https://github.com/Microsoft/ApplicationInsights-Java)
-- Mockito (from http://www.mockito.org)
-- Mockito (from http://mockito.org)
 - Mockito (from http://mockito.org)
 - Mockito (from http://www.mockito.org)
+- Mockito (from http://www.mockito.org)
+- Mockito (from http://mockito.org)
 - Netty Reactive Streams Implementation (from )
 - Netty/Buffer (from http://netty.io/)
 - Netty/Codec (from )
@@ -310,9 +310,6 @@ The following software have components provided under the terms of this license:
 - org.xmlunit:xmlunit-core (from http://www.xmlunit.org/)
 - parent-join (from https://github.com/elastic/elasticsearch)
 - parent-join (from https://github.com/elastic/elasticsearch)
-- powermock-api-mockito (from )
-- powermock-api-mockito-common (from )
-- powermock-api-support (from )
 - powermock-api-support (from )
 - powermock-core (from http://www.powermock.org)
 - powermock-module-junit4 (from http://www.powermock.org)
@@ -745,9 +742,9 @@ The following software have components provided under the terms of this license:
 - Microsoft Azure client library for KeyVault Secrets (from https://github.com/Azure/azure-sdk-for-java)
 - Microsoft Azure common module for Storage (from https://github.com/Azure/azure-sdk-for-java)
 - Mockito (from http://www.mockito.org)
-- Mockito (from http://mockito.org)
 - Mockito (from http://www.mockito.org)
 - Mockito (from http://mockito.org)
+- Mockito (from http://mockito.org)
 - Netty/Codec/HTTP (from )
 - Netty/Common (from )
 - Project Lombok (from https://projectlombok.org)
@@ -756,7 +753,6 @@ The following software have components provided under the terms of this license:
 - adal4j (from https://github.com/AzureAD/azure-activedirectory-library-for-java)
 - azure-documentdb (from https://azure.microsoft.com/en-us/services/cosmos-db/)
 - msal4j (from https://github.com/AzureAD/microsoft-authentication-library-for-java)
-- powermock-api-mockito (from )
 - spring-security-core (from http://spring.io/spring-security)
 
 ========================================================================
diff --git a/provider/search-aws/build-aws/Dockerfile b/provider/search-aws/build-aws/Dockerfile
index dbf21ea74004036e15e817c95587b219754eebba..bf8c0445d78e2a7d98687eabf98ad39d74e2993e 100644
--- a/provider/search-aws/build-aws/Dockerfile
+++ b/provider/search-aws/build-aws/Dockerfile
@@ -1,4 +1,4 @@
-# Copyright © Amazon Web Services
+# Copyright © 2020 Amazon Web Services
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
diff --git a/provider/search-aws/build-aws/build-info.py b/provider/search-aws/build-aws/build-info.py
index 12935424a5a4a5e9368afda46369856e1c56df45..8880bfeb764cce2f3cb7817066dff27b8652bc88 100644
--- a/provider/search-aws/build-aws/build-info.py
+++ b/provider/search-aws/build-aws/build-info.py
@@ -1,3 +1,17 @@
+# Copyright © 2020 Amazon Web Services
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
 import boto3
 import json
 import os
diff --git a/provider/search-aws/build-aws/buildspec.yaml b/provider/search-aws/build-aws/buildspec.yaml
index c0d6861f4600550511623ce86d2ee3dda961add8..05bca04ccd9dee15f7ef9ad8e169e80b7b6c92bc 100644
--- a/provider/search-aws/build-aws/buildspec.yaml
+++ b/provider/search-aws/build-aws/buildspec.yaml
@@ -1,4 +1,4 @@
-# Copyright © Amazon Web Services
+# Copyright © 2020 Amazon Web Services
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -20,7 +20,7 @@ version: 0.2
 phases:
   install:
     runtime-versions:
-      java: openjdk8
+      java: corretto8
     commands:
       - if [ $(echo $CODEBUILD_SOURCE_VERSION | grep -c  ^refs/heads.*) -eq 1 ]; then echo "Branch name found"; else echo "This build only supports branch builds" && exit 1; fi
       - apt-get update -y
@@ -29,9 +29,8 @@ phases:
       - mvn -version
       - echo $JAVA_HOME #WHY
       - mkdir -p /root/.m2
-      - aws s3 sync s3://$M2_REPO_S3_BUCKET /root/.m2 # copy previous state of the shared libraries' .m2 folder from S3 to local
       - cp ./provider/search-aws/maven/settings.xml /root/.m2/settings.xml # copy the AWS-specific settings.xml to the CodeBuild instance's .m2 folder
-      - cat /root/.m2/settings.xml
+      - export AWS_OSDU_DEV_MAVEN_AUTH_TOKEN=`aws codeartifact get-authorization-token --domain osdu-dev --domain-owner 888733619319 --query authorizationToken --output text`
   pre_build:
     commands:
       - echo "Logging in to Amazon ECR..."
diff --git a/provider/search-aws/maven/settings.xml b/provider/search-aws/maven/settings.xml
index d8b2e83a4de4eb723b11c866fe69fdfdc48e8c25..b8192246c94558d4c2d65ce1caf42871542dd79e 100644
--- a/provider/search-aws/maven/settings.xml
+++ b/provider/search-aws/maven/settings.xml
@@ -1,9 +1,41 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!--
+  Copyright © 2020 Amazon Web Services
+
+  Licensed under the Apache License, Version 2.0 (the "License");
+  you may not use this file except in compliance with the License.
+  You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+  Unless required by applicable law or agreed to in writing, software
+  distributed under the License is distributed on an "AS IS" BASIS,
+  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  See the License for the specific language governing permissions and
+  limitations under the License.
+-->
+
 <settings xmlns="http://maven.apache.org/SETTINGS/1.0.0"
           xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
           xsi:schemaLocation="http://maven.apache.org/SETTINGS/1.0.0 http://maven.apache.org/xsd/settings-1.0.0.xsd">
 
     <profiles>
+        <profile>
+            <id>aws-osdu-dev-maven</id>
+            <activation>
+                <activeByDefault>true</activeByDefault>
+            </activation>
+            <repositories>
+                <repository>
+                    <id>aws-osdu-dev-maven</id>
+                    <url>${env.AWS_OSDU_DEV_MAVEN_URL}</url>
+                </repository>
+                <repository>
+                    <id>gitlab-os-core-common-maven</id>
+                    <url>https://community.opengroup.org/api/v4/projects/67/packages/maven</url>
+                </repository>
+            </repositories>
+        </profile>
         <profile>
             <id>credentialsConfiguration</id>
             <activation>
@@ -20,13 +52,25 @@
     </profiles>
 
     <servers>
-        <!-- Azure DevOps Artifact Store -->
         <server>
-            <id>os-core</id>
-            <username>${azure.devops.username}</username>
-            <!-- The generated token was last updated on 01/13/2020 and expires on or before 01/12/2021 -->
-            <password>${azure.devops.token}</password>
+            <id>aws-osdu-dev-maven</id>
+            <username>aws</username>
+            <password>${env.AWS_OSDU_DEV_MAVEN_AUTH_TOKEN}</password>
         </server>
-
     </servers>
-</settings>
+
+    <!-- CodeArtifact doesn't support external repos yet that aren't Maven Central.  ETA Q4 2020. -->
+    <!-- <mirrors> -->
+    <!-- <mirror> -->
+    <!-- <id>aws-osdu-dev-maven</id> -->
+    <!-- <name>aws-osdu-dev-maven</name> -->
+    <!-- <url>https://osdu-dev-888733619319.d.codeartifact.us-east-1.amazonaws.com/maven/osdu-maven/</url> -->
+    <!-- <mirrorOf>*,!gitlab-os-core-common-maven</mirrorOf> -->
+    <!-- </mirror> -->
+    <!-- </mirrors> -->
+
+    <activeProfiles>
+        <activeProfile>credentialsConfiguration</activeProfile>
+    </activeProfiles>
+
+</settings>
\ No newline at end of file
diff --git a/provider/search-aws/pom.xml b/provider/search-aws/pom.xml
index 185af0e9a1eda636ac118ea8329063c6ee926b65..3c6b28877521ccaed877b804061e22a20cdc5de9 100644
--- a/provider/search-aws/pom.xml
+++ b/provider/search-aws/pom.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
-  Copyright © Amazon Web Services
+  Copyright © 2020 Amazon Web Services
 
   Licensed under the Apache License, Version 2.0 (the "License");
   you may not use this file except in compliance with the License.
@@ -52,7 +52,7 @@
         <dependency>
             <groupId>org.opengroup.osdu.core.aws</groupId>
             <artifactId>os-core-lib-aws</artifactId>
-            <version>0.3.5</version>
+            <version>0.3.7</version>
         </dependency>
         <dependency>
             <groupId>org.opengroup.osdu</groupId>
diff --git a/provider/search-aws/src/main/java/org/opengroup/osdu/search/provider/aws/di/EntitlementsFactoryAws.java b/provider/search-aws/src/main/java/org/opengroup/osdu/search/provider/aws/di/EntitlementsFactoryAws.java
new file mode 100644
index 0000000000000000000000000000000000000000..7ead19175cf451288762e26d42feedd4c6045a78
--- /dev/null
+++ b/provider/search-aws/src/main/java/org/opengroup/osdu/search/provider/aws/di/EntitlementsFactoryAws.java
@@ -0,0 +1,48 @@
+/**
+ * Copyright 2020 IBM Corp. All Rights Reserved.
+ * Copyright 2020 © Amazon Web Services
+ * 
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.opengroup.osdu.search.provider.aws.di;
+
+import org.opengroup.osdu.core.common.entitlements.EntitlementsAPIConfig;
+import org.opengroup.osdu.core.common.entitlements.EntitlementsFactory;
+import org.opengroup.osdu.core.common.entitlements.IEntitlementsFactory;
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.beans.factory.config.AbstractFactoryBean;
+import org.springframework.stereotype.Component;
+import org.springframework.web.context.annotation.RequestScope;
+
+@Component
+@RequestScope
+public class EntitlementsFactoryAws extends AbstractFactoryBean<IEntitlementsFactory> {
+	@Value("${AUTHORIZE_API}")
+	private String AUTHORIZE_API;
+
+	@Value("${AUTHORIZE_API_KEY:#{null}}")
+	private String AUTHORIZE_API_KEY;
+
+	@Override
+	protected IEntitlementsFactory createInstance() throws Exception {
+
+		return new EntitlementsFactory(
+				EntitlementsAPIConfig.builder().rootUrl(AUTHORIZE_API).apiKey(AUTHORIZE_API_KEY).build());
+	}
+
+	@Override
+	public Class<?> getObjectType() {
+		return IEntitlementsFactory.class;
+	}
+}
diff --git a/provider/search-aws/src/main/resources/application.properties b/provider/search-aws/src/main/resources/application.properties
index a6434a3f8126f7f2164755ca04da725279d2919a..7614f250f652af3ccf22408f8b8e5aa3acd8b9a8 100644
--- a/provider/search-aws/src/main/resources/application.properties
+++ b/provider/search-aws/src/main/resources/application.properties
@@ -1,6 +1,22 @@
+# Copyright © 2020 Amazon Web Services
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
 LOG_PREFIX=search
 
 server.servlet.contextPath=/api/search/v2/
+AUTHORIZE_API=${ENTITLEMENTS_BASE_URL}/api/entitlements/v1
+
 logging.level.org.springframework.web=${LOG_LEVEL}
 server.port=${APPLICATION_PORT}
 
diff --git a/testing/integration-tests/search-test-aws/pom.xml b/testing/integration-tests/search-test-aws/pom.xml
index 4be6592d32ea423ab77f88ba7ac6fd31a797ad67..a64109e39bec79ed558a37824aa46bd4bf77d56f 100644
--- a/testing/integration-tests/search-test-aws/pom.xml
+++ b/testing/integration-tests/search-test-aws/pom.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
-  Copyright © Amazon Web Services
+  Copyright © 2020 Amazon Web Services
 
   Licensed under the Apache License, Version 2.0 (the "License");
   you may not use this file except in compliance with the License.
@@ -39,7 +39,7 @@
         <dependency>
             <groupId>org.opengroup.osdu.core.aws</groupId>
             <artifactId>os-core-lib-aws</artifactId>
-            <version>0.3.5</version>
+            <version>0.3.7</version>
         </dependency>
         <!-- Third party Apache 2.0 license packages -->
         <dependency>