diff --git a/provider/indexer-aws/azure-build.yml b/provider/indexer-aws/azure-build.yml
new file mode 100644
index 0000000000000000000000000000000000000000..5c42e379dcb3f0739e45e8288344b71978b32ba9
--- /dev/null
+++ b/provider/indexer-aws/azure-build.yml
@@ -0,0 +1,55 @@
+# Maven
+# Build your Java project and run tests with Apache Maven.
+# Add steps that analyze code, save build artifacts, deploy, and more:
+# https://docs.microsoft.com/azure/devops/pipelines/languages/java
+
+trigger:
+  branches:
+    include:
+    - master
+  paths:
+    exclude:
+      - README.md
+      - .gitignore
+
+pool:
+  name: Hosted Ubuntu 1604
+  demands: maven
+
+steps:
+- task: Maven@3
+  displayName: 'build, test, code coverage'
+  inputs:
+    mavenPomFile: 'pom.xml'
+    options: '--settings ./indexer-core/maven/settings.xml -DVSTS_FEED_TOKEN=$(VSTS_FEED_TOKEN)'
+    testResultsFiles: '**/*/TEST-*.xml'
+    codeCoverageToolOption: JaCoCo
+    goals: 'install'
+
+- task: Maven@3
+  displayName: 'build, test, code coverage'
+  inputs:
+    mavenPomFile: 'pom.xml'
+    options: '--settings ./provider/indexer-aws/maven/settings.xml -DVSTS_FEED_TOKEN=$(VSTS_FEED_TOKEN) -P indexer-aws'
+    testResultsFiles: '**/*/TEST-*.xml'
+    codeCoverageToolOption: JaCoCo
+    goals: 'package'
+
+- task: CopyFiles@2
+  displayName: 'Copy AWS artifacts for maven deploy to: $(build.artifactstagingdirectory)'
+  inputs:
+    SourceFolder:
+    Contents: |
+      provider/indexer-aws/CloudFormation
+      provider/indexer-aws/buildspec-post-deploy.yml
+      provider/indexer-aws/buildspec-pre-deploy.yml
+      provider/indexer-aws/target/*-spring-boot.jar
+    TargetFolder: '$(build.artifactstagingdirectory)'
+    
+- task: PublishBuildArtifacts@1
+  displayName: 'Publish Artifact: drop'
+  inputs:
+    PathtoPublish: '$(build.artifactstagingdirectory)'
+    ArtifactName: 'drop'
+    publishLocation: 'Container'
+  condition: succeededOrFailed()
diff --git a/provider/indexer-aws/maven/settings.xml b/provider/indexer-aws/maven/settings.xml
index 8b02b81849fd07a44b35a0b6a5d61f5d19ab97d7..7a0d594c5f298ed6ff3fd19ed842f02161ffadc0 100644
--- a/provider/indexer-aws/maven/settings.xml
+++ b/provider/indexer-aws/maven/settings.xml
@@ -3,68 +3,11 @@
           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>repositoryConfiguration</id>
-      <activation>
-        <activeByDefault>true</activeByDefault>
-      </activation>
-      <properties>
-        <deployment.environment>dev</deployment.environment>
-        <aws.accessKeyId>no-default</aws.accessKeyId>
-        <aws.secretKey>no-default</aws.secretKey>
-        <deployment.repositorybucket>osdu-local-maven-repository</deployment.repositorybucket>
-        <azure.devops.token>4t46p4pkk2kinwhjet3ucjb5prhexcme5cbmt4txpuoqn4jns22q</azure.devops.token>
-      </properties>
-    </profile>
-  </profiles>
-
   <servers>
-
-    <!-- Local S3 Repository (used to the AWS Util Library) -->
-    <server>
-      <id>maven-s3-release-repo</id>
-      <username>${aws.accessKeyId}</username>
-      <password>${aws.secretKey}</password>
-    </server>
-
-    <server>
-      <id>maven-s3-snapshot-repo</id>
-      <username>${aws.accessKeyId}</username>
-      <password>${aws.secretKey}</password>
-    </server>
-
-    <server>
-      <id>s3.release</id>
-      <username>${aws.accessKeyId}</username>
-      <password>${aws.secretKey}</password>
-    </server>
-
-    <server>
-      <id>s3.snapshot</id>
-      <username>${aws.accessKeyId}</username>
-      <password>${aws.secretKey}</password>
-    </server>
-
-    <server>
-      <id>s3.site</id>
-      <username>${aws.accessKeyId}</username>
-      <password>${aws.secretKey}</password>
-    </server>
-
-    <!-- Azure DevOps Artifact Store -->
     <server>
       <id>dev-azure-com-slb-des-ext-collaboration-os-core</id>
-      <username>IntelliJ-Maven</username>
-      <!-- Treat this auth token like a password. Do not share it with anyone, including Microsoft support. -->
-      <!-- The generated token expires on or before 11/14/2019 -->
-      <password>${azure.devops.token}</password>
+			<username>os-core</username>
+      <password>${VSTS_FEED_TOKEN}</password>
     </server>
-
   </servers>
-
-  <activeProfiles>
-    <activeProfile>repositoryConfiguration</activeProfile>
-  </activeProfiles>
-
 </settings>
diff --git a/provider/indexer-gcp/azure-build.yml b/provider/indexer-gcp/azure-build.yml
index d100317636cdb97d8fabdf458c40dd6f88d0e096..cf8e0835b12a06e5b1051afad711795bdb05ba4c 100644
--- a/provider/indexer-gcp/azure-build.yml
+++ b/provider/indexer-gcp/azure-build.yml
@@ -13,7 +13,7 @@ trigger:
       - .gitignore
 
 pool:
-  name: dps-build
+  name: Hosted Ubuntu 1604
   demands: maven
 
 steps: