diff --git a/.github/workflows/sonarqube.yml b/.github/workflows/sonarqube.yml
index 3a6d996af..37b01e629 100644
--- a/.github/workflows/sonarqube.yml
+++ b/.github/workflows/sonarqube.yml
@@ -34,26 +34,25 @@ jobs:
         uses: actions/checkout@v4
 
       - name: Run SonarScanner
-        env:
-          SONAR_TOKEN: ${{ secrets.SONAR_TOKEN }}
         run: |
-          BRANCH_NAME="${GITHUB_REF#refs/heads/}"
-          SAFE_BRANCH_NAME="${BRANCH_NAME//\//_}"
-          PROJECT_KEY="odex25_standard_modules_${SAFE_BRANCH_NAME}"
-          PROJECT_NAME="Standard Modules ${SAFE_BRANCH_NAME^}"
-          SOURCE_FOLDER_NAME="${BRANCH_NAME#master_}"
-          PROJECT_VERSION="1.0"
+          export BRANCH_NAME="${GITHUB_REF#refs/heads/}"
+          export SAFE_BRANCH_NAME="${BRANCH_NAME//\//_}"
+          export PROJECT_KEY="odex25_standard_modules_${SAFE_BRANCH_NAME}"
+          export PROJECT_NAME="Standard Modules ${SAFE_BRANCH_NAME^}"
+          export SOURCE_FOLDER_NAME="${BRANCH_NAME#master_}"
+          export PROJECT_VERSION="1.0"
+          export SONAR_TOKEN=${{ secrets.SONAR_TOKEN }}
           
           sonar-scanner \
-            -Dsonar.projectKey=$PROJECT_KEY \
+            -Dsonar.projectKey="$PROJECT_KEY" \
             -Dsonar.projectName="$PROJECT_NAME" \
-            -Dsonar.projectVersion=$PROJECT_VERSION \
-            -Dsonar.sources=$SOURCE_FOLDER_NAME \
+            -Dsonar.projectVersion="$PROJECT_VERSION" \
+            -Dsonar.sources="$SOURCE_FOLDER_NAME" \
             -Dsonar.inclusions="**/*.py, **/*.xml, **/*.js" \
             -Dsonar.exclusions="**/__manifest__.py, **/migrations/**, **/__pycache__/**" \
             -Dsonar.sourceEncoding="UTF-8" \
             -Dsonar.host.url="https://sonar.odex.sa" \
-            -Dsonar.login=$SONAR_TOKEN          
+            -Dsonar.login="$SONAR_TOKEN"
 
       - name: Cleanup workspace
         if: always()