diff --git a/.github/workflows/maven_settings_template.xml b/.github/workflows/maven_settings_template.xml
new file mode 100644
index 0000000..12e3153
--- /dev/null
+++ b/.github/workflows/maven_settings_template.xml
@@ -0,0 +1,47 @@
+<settings>
+  <servers>
+    <server>
+      <id>tip-wlan-cloud-maven-repo</id>
+      <username>${env.MAVEN_REPO_USERNAME}</username>
+      <password>${env.MAVEN_REPO_PASSWORD}</password>
+    </server>
+    <server>
+      <id>jfrog-spring-milestones</id>
+      <username>${env.MAVEN_REPO_USERNAME}</username>
+      <password>${env.MAVEN_REPO_PASSWORD}</password>
+    </server>
+    <server>
+      <id>jfrog-maven-central</id>
+      <username>${env.MAVEN_REPO_USERNAME}</username>
+      <password>${env.MAVEN_REPO_PASSWORD}</password>
+    </server>
+  </servers>
+  <mirrors>
+    <mirror>
+      <id>jfrog-maven-central</id>
+      <name>Mirror Repository</name>
+      <url>https://tip.jfrog.io/artifactory/maven-central</url>
+      <mirrorOf>central</mirrorOf>
+    </mirror>
+    <mirror>
+      <id>jfrog-spring-milestones</id>
+      <url>https://tip.jfrog.io/artifactory/spring-milestones</url>
+      <mirrorOf>spring-milestones</mirrorOf>
+    </mirror>
+  </mirrors>
+
+  <profiles>
+    <profile>
+      <id>schema-publisher</id>
+      <properties>
+        <schema-repository-user>${env.MAVEN_REPO_USERNAME}</schema-repository-user>
+        <schema-repository-password>${env.MAVEN_REPO_PASSWORD}</schema-repository-password>
+      </properties>
+    </profile>
+  </profiles>
+
+  <activeProfiles>
+    <activeProfile>schema-publisher</activeProfile>
+  </activeProfiles>
+
+</settings>
\ No newline at end of file
diff --git a/.github/workflows/sonar.yml b/.github/workflows/sonar.yml
index bd3d9ec..ab65c61 100644
--- a/.github/workflows/sonar.yml
+++ b/.github/workflows/sonar.yml
@@ -40,18 +40,24 @@ jobs:
       uses: actions/setup-java@v1
       with:
         java-version: 14
-        server-id: tip-wlan-cloud-maven-repo
-        server-username: MAVEN_REPO_USERNAME
-        server-password: MAVEN_REPO_PASSWORD
+    - name: Cache Maven packages
+      uses: actions/cache@v1
+      with:
+        path: ~/.m2/repository/
+        key: ${{ runner.os }}-m2
+    - name: Configure maven settings.xml
+      run: cp wlan-cloud-opensync-controller/.github/workflows/maven_settings_template.xml /home/runner/.m2/settings.xml
     - name: Maven build
       working-directory: wlan-cloud-opensync-controller/${{ matrix.project }}
       env:
         MAVEN_REPO_USERNAME: build-pipeline
         MAVEN_REPO_PASSWORD: ${{ secrets.MAVEN_REPO_PASSWORD }}
+        GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
       run: mvn clean install
     - name: Run sonar
       working-directory: wlan-cloud-opensync-controller/${{ matrix.project }}
       env:
         MAVEN_REPO_USERNAME: build-pipeline
         MAVEN_REPO_PASSWORD: ${{ secrets.MAVEN_REPO_PASSWORD }}
+        GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
       run: mvn sonar:sonar -Dsonar.host.url=${{ env.SONAR_URL }} -Dsonar.login=${{ secrets.SONAR_LOGIN }} -Dsonar.organization=${{ env.SONAR_ORGANIZATION }} -Dsonar.projectKey=com.telecominfraproject.wlan:${{ matrix.project }}