diff --git a/.github/workflows/maven-release.yml b/.github/workflows/maven-release.yml
index 8c7f38d6..95e1cbe6 100644
--- a/.github/workflows/maven-release.yml
+++ b/.github/workflows/maven-release.yml
@@ -210,20 +210,20 @@ jobs:
       - name: AEM6.5 Build
         run: mvn clean deploy -DskipTests -Paem65deps,aem65,release
         env:
-          MAVEN_USERNAME: ${{ secrets.SONATYPE_USERNAME }}
-          MAVEN_CENTRAL_TOKEN: ${{ secrets.SONATYPE_PASSWORD }}
+          MAVEN_USERNAME: ${{ secrets.AIO_MAVEN_USER_NAME }}
+          MAVEN_CENTRAL_TOKEN: ${{ secrets.AIO_MAVEN_TOKEN }}
           MAVEN_GPG_PASSPHRASE: ${{ secrets.GPG_PASSPHRASE }}
 
       - name: AEMaaCS Build
         run: mvn clean deploy -DskipTests -PaemaacsDeps,aemaacs,release,attach-javadoc,attach-source
         env:
-          MAVEN_USERNAME: ${{ secrets.SONATYPE_USERNAME }}
-          MAVEN_CENTRAL_TOKEN: ${{ secrets.SONATYPE_PASSWORD }}
+          MAVEN_USERNAME: ${{ secrets.AIO_MAVEN_USER_NAME }}
+          MAVEN_CENTRAL_TOKEN: ${{ secrets.AIO_MAVEN_TOKEN }}
           MAVEN_GPG_PASSPHRASE: ${{ secrets.GPG_PASSPHRASE }}
 
       - name: Main Build
         run: mvn clean deploy -DskipTests
         env:
-          MAVEN_USERNAME: ${{ secrets.SONATYPE_USERNAME }}
-          MAVEN_CENTRAL_TOKEN: ${{ secrets.SONATYPE_PASSWORD }}
+          MAVEN_USERNAME: ${{ secrets.AIO_MAVEN_USER_NAME }}
+          MAVEN_CENTRAL_TOKEN: ${{ secrets.AIO_MAVEN_TOKEN }}
           MAVEN_GPG_PASSPHRASE: ${{ secrets.GPG_PASSPHRASE }}
diff --git a/.github/workflows/maven-snapshot.yml b/.github/workflows/maven-snapshot.yml
index 5ed899e9..cd051b7e 100644
--- a/.github/workflows/maven-snapshot.yml
+++ b/.github/workflows/maven-snapshot.yml
@@ -36,21 +36,21 @@ jobs:
       - name: AEM6.5 Build
         run: mvn clean deploy -DskipTests -Paem65deps,aem65,release
         env:
-          MAVEN_USERNAME: ${{ secrets.SONATYPE_USERNAME }}
-          MAVEN_CENTRAL_TOKEN: ${{ secrets.SONATYPE_PASSWORD }}
+          MAVEN_USERNAME: ${{ secrets.AIO_MAVEN_USER_NAME }}
+          MAVEN_CENTRAL_TOKEN: ${{ secrets.AIO_MAVEN_TOKEN }}
           MAVEN_GPG_PASSPHRASE: ${{ secrets.GPG_PASSPHRASE }}
 
       - name: AEMaaCS Build
         run: mvn clean deploy -PaemaacsDeps,aemaacs,release,attach-javadoc,attach-source
         env:
-          MAVEN_USERNAME: ${{ secrets.SONATYPE_USERNAME }}
-          MAVEN_CENTRAL_TOKEN: ${{ secrets.SONATYPE_PASSWORD }}
+          MAVEN_USERNAME: ${{ secrets.AIO_MAVEN_USER_NAME }}
+          MAVEN_CENTRAL_TOKEN: ${{ secrets.AIO_MAVEN_TOKEN }}
           MAVEN_GPG_PASSPHRASE: ${{ secrets.GPG_PASSPHRASE }}
           
       - name: Main Build
         run: mvn clean deploy -DskipTests
         env:
-          MAVEN_USERNAME: ${{ secrets.SONATYPE_USERNAME }}
-          MAVEN_CENTRAL_TOKEN: ${{ secrets.SONATYPE_PASSWORD }}
+          MAVEN_USERNAME: ${{ secrets.AIO_MAVEN_USER_NAME }}
+          MAVEN_CENTRAL_TOKEN: ${{ secrets.AIO_MAVEN_TOKEN }}
           MAVEN_GPG_PASSPHRASE: ${{ secrets.GPG_PASSPHRASE }}
 
diff --git a/.mvn/maven.config b/.mvn/maven.config
new file mode 100644
index 00000000..89f6445d
--- /dev/null
+++ b/.mvn/maven.config
@@ -0,0 +1,2 @@
+--settings
+./.mvn/settings.xml
diff --git a/.mvn/settings.xml b/.mvn/settings.xml
new file mode 100644
index 00000000..557c5c3b
--- /dev/null
+++ b/.mvn/settings.xml
@@ -0,0 +1,29 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+
+    ADOBE CONFIDENTIAL
+    ___________________
+
+    Copyright 2017 Adobe Systems Incorporated
+    All Rights Reserved.
+
+    NOTICE:  All information contained herein is, and remains
+    the property of Adobe Systems Incorporated and its suppliers,
+    if any.  The intellectual and technical concepts contained
+    herein are proprietary to Adobe Systems Incorporated and its
+    suppliers and are protected by trade secret or copyright law.
+    Dissemination of this information or reproduction of this material
+    is strictly forbidden unless prior written permission is obtained
+    from Adobe Systems Incorporated.
+
+-->
+<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">
+    <interactiveMode>false</interactiveMode>
+    <servers>
+        <server>
+            <id>central</id>
+            <username>${env.MAVEN_USERNAME}</username>
+            <password>${env.MAVEN_CENTRAL_TOKEN}</password>
+        </server>
+    </servers>
+</settings>
\ No newline at end of file