diff --git a/build.gradle b/build.gradle
index 10fa8b7a..2a0fa405 100644
--- a/build.gradle
+++ b/build.gradle
@@ -14,15 +14,17 @@ buildscript {
     */
 
     repositories {
+        // If you don't have access to the package feed below, uncomment the maven central repo
+        // mavenCentral()
+        mavenLocal()
         google()
-        mavenCentral()
         maven {
-            // msazure and aria are consumed via upstream sources of the AndroidADAL feed.
-            name "vsts-maven-adal-android"
-            url "https://identitydivision.pkgs.visualstudio.com/_packaging/AndroidADAL/maven/v1"
+            // msazure and aria are consumed via upstream sources of the NewAndroid feed.
+            name "vsts-maven-new-android"
+            url "https://identitydivision.pkgs.visualstudio.com/_packaging/NewAndroid/maven/v1"
             credentials {
-                username System.getenv("ENV_VSTS_MVN_ANDROID_MSAL_USERNAME") != null ? System.getenv("ENV_VSTS_MVN_ANDROID_MSAL_USERNAME") : project.findProperty("vstsUsername")
-                password System.getenv("ENV_VSTS_MVN_ANDROIDADACCOUNTS_ACCESSTOKEN") != null ? System.getenv("ENV_VSTS_MVN_ANDROIDADACCOUNTS_ACCESSTOKEN") : project.findProperty("vstsMavenAccessToken")
+                username System.getenv("ENV_VSTS_MVN_CRED_USERNAME") != null ? System.getenv("ENV_VSTS_MVN_CRED_USERNAME") : project.findProperty("vstsUsername")
+                password System.getenv("ENV_VSTS_MVN_CRED_ACCESSTOKEN") != null ? System.getenv("ENV_VSTS_MVN_CRED_ACCESSTOKEN") : project.findProperty("vstsMavenAccessToken")
             }
         }
     }
@@ -44,21 +46,19 @@ plugins {
     id "com.microsoft.hydralab.client-util" version "1.1.14"
 }
 
-project.ext.vstsUsername = System.getenv("ENV_VSTS_MVN_ANDROID_MSAL_USERNAME") != null ? System.getenv("ENV_VSTS_MVN_ANDROID_MSAL_USERNAME") : project.findProperty("vstsUsername")
-project.ext.vstsMavenAccessToken = System.getenv("ENV_VSTS_MVN_ANDROIDADACCOUNTS_ACCESSTOKEN") != null ? System.getenv("ENV_VSTS_MVN_ANDROIDADACCOUNTS_ACCESSTOKEN") : project.findProperty("vstsMavenAccessToken")
+project.ext.vstsUsername = System.getenv("ENV_VSTS_MVN_CRED_USERNAME") != null ? System.getenv("ENV_VSTS_MVN_CRED_USERNAME") : project.findProperty("vstsUsername")
+project.ext.vstsMavenAccessToken = System.getenv("ENV_VSTS_MVN_CRED_ACCESSTOKEN") != null ? System.getenv("ENV_VSTS_MVN_CRED_ACCESSTOKEN") : project.findProperty("vstsMavenAccessToken")
 
 allprojects {
     repositories {
         mavenLocal()
         google()
-        mavenCentral()
-        maven {
-            url 'https://pkgs.dev.azure.com/MicrosoftDeviceSDK/DuoSDK-Public/_packaging/Duo-SDK-Feed/maven/v1'
-        }
+        // If you don't have access to the package feed uncomment the maven central repo
+        //  mavenCentral()
         maven {
-            // msazure and aria are consumed via upstream sources of the AndroidADAL feed.
-            name "vsts-maven-adal-android"
-            url "https://identitydivision.pkgs.visualstudio.com/_packaging/AndroidADAL/maven/v1"
+            // msazure and aria are consumed via upstream sources of the NewAndroid feed.
+            name "vsts-maven-new-android"
+            url "https://identitydivision.pkgs.visualstudio.com/_packaging/NewAndroid/maven/v1"
             credentials {
                 username project.vstsUsername
                 password project.vstsMavenAccessToken
diff --git a/java-complete/build.gradle b/java-complete/build.gradle
index ca40412c..db67539e 100644
--- a/java-complete/build.gradle
+++ b/java-complete/build.gradle
@@ -1,11 +1,21 @@
-project.ext.vstsUsername = System.getenv("ENV_VSTS_MVN_ANDROID_MSAL_USERNAME") != null ? System.getenv("ENV_VSTS_MVN_ANDROID_MSAL_USERNAME") : project.findProperty("vstsUsername")
-project.ext.vstsMavenAccessToken = System.getenv("ENV_VSTS_MVN_ANDROIDADACCOUNTS_ACCESSTOKEN") != null ? System.getenv("ENV_VSTS_MVN_ANDROIDADACCOUNTS_ACCESSTOKEN") : project.findProperty("vstsMavenAccessToken")
+project.ext.vstsUsername = System.getenv("ENV_VSTS_MVN_CRED_USERNAME") != null ? System.getenv("ENV_VSTS_MVN_CRED_USERNAME") : project.findProperty("vstsUsername")
+project.ext.vstsMavenAccessToken = System.getenv("ENV_VSTS_MVN_CRED_ACCESSTOKEN") != null ? System.getenv("ENV_VSTS_MVN_CRED_ACCESSTOKEN") : project.findProperty("vstsMavenAccessToken")
 buildscript {
     apply from: rootProject.file("../gradle/versions.gradle")
     
     repositories {
+        // If you don't have access to the package feed below, uncomment the maven central repo
+        // mavenCentral()
         google()
-        mavenCentral()
+        maven {
+            // msazure and aria are consumed via upstream sources of the NewAndroid feed.
+            name "vsts-maven-new-android"
+            url "https://identitydivision.pkgs.visualstudio.com/_packaging/NewAndroid/maven/v1"
+            credentials {
+                username project.vstsUsername
+                password project.vstsMavenAccessToken
+            }
+        }
     }
     
     dependencies {
@@ -15,16 +25,13 @@ buildscript {
 
 allprojects {
     repositories {
+        // If you don't have access to the package feed below, uncomment the maven central repo
+        // mavenCentral()
         mavenLocal()
         google()
-        mavenCentral()
-        maven {
-            url 'https://pkgs.dev.azure.com/MicrosoftDeviceSDK/DuoSDK-Public/_packaging/Duo-SDK-Feed/maven/v1'
-        }
         maven {
-            // msazure and aria are consumed via upstream sources of the AndroidADAL feed.
-            name "vsts-maven-adal-android"
-            url "https://identitydivision.pkgs.visualstudio.com/_packaging/AndroidADAL/maven/v1"
+            name "vsts-maven-new-android"
+            url "https://identitydivision.pkgs.visualstudio.com/_packaging/NewAndroid/maven/v1"
             credentials {
                 username project.vstsUsername
                 password project.vstsMavenAccessToken
diff --git a/java-complete/settings.gradle b/java-complete/settings.gradle
index b06f4354..603fdf6d 100644
--- a/java-complete/settings.gradle
+++ b/java-complete/settings.gradle
@@ -8,10 +8,20 @@
  */
 pluginManagement {
     repositories {
+        // If you don't have access to the package feed below, uncomment the maven central repo
+        // mavenCentral()
         mavenLocal()
         google()
-        mavenCentral()
         gradlePluginPortal()
+        maven {
+            // msazure and aria are consumed via upstream sources of the NewAndroid feed.
+            name "vsts-maven-new-android"
+            url "https://identitydivision.pkgs.visualstudio.com/_packaging/NewAndroid/maven/v1"
+            credentials {
+                username System.getenv("ENV_VSTS_MVN_CRED_USERNAME") != null ? System.getenv("ENV_VSTS_MVN_CRED_USERNAME") : vstsUsername
+                password System.getenv("ENV_VSTS_MVN_CRED_ACCESSTOKEN") != null ? System.getenv("ENV_VSTS_MVN_CRED_ACCESSTOKEN") : vstsMavenAccessToken
+            }
+        }
     }
 }
 
@@ -44,4 +54,3 @@ project(':java-linux-test-app').projectDir = new File('../broker/java-linux-test
 
 include(':LabApiUtilities')
 project(':LabApiUtilities').projectDir = new File('../common/LabApiUtilities')
-
diff --git a/plugins/buildsystem/build.gradle b/plugins/buildsystem/build.gradle
index fe64581f..8ed9d8ab 100644
--- a/plugins/buildsystem/build.gradle
+++ b/plugins/buildsystem/build.gradle
@@ -41,6 +41,14 @@ repositories {
     mavenCentral()
     google()
     gradlePluginPortal()
+    maven {
+        name "vsts-maven-new-android"
+        url "https://identitydivision.pkgs.visualstudio.com/_packaging/NewAndroid/maven/v1"
+        credentials {
+            username System.getenv("ENV_VSTS_MVN_CRED_USERNAME") != null ? System.getenv("ENV_VSTS_MVN_CRED_USERNAME") : project.findProperty("vstsUsername")
+            password System.getenv("ENV_VSTS_MVN_CRED_ACCESSTOKEN") != null ? System.getenv("ENV_VSTS_MVN_CRED_ACCESSTOKEN") : project.findProperty("vstsMavenAccessToken")
+        }
+    }
 }
 
 dependencies {
diff --git a/settings.gradle b/settings.gradle
index c91d8833..86566439 100644
--- a/settings.gradle
+++ b/settings.gradle
@@ -10,15 +10,16 @@ pluginManagement {
     repositories {
         mavenLocal()
         google()
-        mavenCentral()
+        // If you don't have access to the package feed below, uncomment the maven central repo
+        // mavenCentral()
         gradlePluginPortal()
         maven {
-            // msazure and aria are consumed via upstream sources of the AndroidADAL feed.
-            name "vsts-maven-adal-android"
-            url "https://identitydivision.pkgs.visualstudio.com/_packaging/AndroidADAL/maven/v1"
+            // msazure and aria are consumed via upstream sources of the NewAndroid feed.
+            name "vsts-maven-new-android"
+            url "https://identitydivision.pkgs.visualstudio.com/_packaging/NewAndroid/maven/v1"
             credentials {
-                username System.getenv("ENV_VSTS_MVN_ANDROID_MSAL_USERNAME") != null ? System.getenv("ENV_VSTS_MVN_ANDROID_MSAL_USERNAME") : vstsUsername
-                password System.getenv("ENV_VSTS_MVN_ANDROIDADACCOUNTS_ACCESSTOKEN") != null ? System.getenv("ENV_VSTS_MVN_ANDROIDADACCOUNTS_ACCESSTOKEN") : vstsMavenAccessToken
+                username System.getenv("ENV_VSTS_MVN_CRED_USERNAME") != null ? System.getenv("ENV_VSTS_MVN_CRED_USERNAME") : vstsUsername
+                password System.getenv("ENV_VSTS_MVN_CRED_ACCESSTOKEN") != null ? System.getenv("ENV_VSTS_MVN_CRED_ACCESSTOKEN") : vstsMavenAccessToken
             }
         }
     }