diff --git a/.github/workflows/maven-cli.yml b/.github/workflows/maven-cli.yml
index ffdb9aa..f103de1 100644
--- a/.github/workflows/maven-cli.yml
+++ b/.github/workflows/maven-cli.yml
@@ -25,12 +25,13 @@ jobs:
 
       - id: run_sonarqube
         name: sonarqube
+        env:
+          SONAR_TOKEN: ${{ secrets.CG_SONAR_HOST_URL }}
         run: |
           mvn \
             -s .mvn/settings.xml \
             --no-transfer-progress \
             --batch-mode \
             -Pcoverage \
-            -Dsonar.host.url=${{ secrets.CG_SONAR_HOST_URL }} \
-            -Dsonar.login=${{ secrets.CG_SONAR_LOGIN }} \
+            -Psonar \
             clean verify sonar:sonar
diff --git a/.mvn/settings.xml b/.mvn/settings.xml
index 355bbc2..526545d 100644
--- a/.mvn/settings.xml
+++ b/.mvn/settings.xml
@@ -24,4 +24,16 @@
             <password>${env.OPENEPCIS_OSSRH_PASSWORD}</password>
         </server>
     </servers>
+    <profiles>
+        <profile>
+            <id>sonar</id>
+            <activation>
+                <activeByDefault>true</activeByDefault>
+            </activation>
+            <properties>
+                <sonar.host.url>https://sonar.company-group.com</sonar.host.url>
+                <sonar.login>${env.SONAR_TOKEN}</sonar.login>
+            </properties>
+        </profile>
+    </profiles>
 </settings>
\ No newline at end of file