diff --git a/templates/gitlab-ci-sonar.yml b/templates/gitlab-ci-sonar.yml
index f75fe67ec71373e4e129c7b7ab41a6f6ab4d65ff..15abcbb4ffd541deb3ea0c916b8c4a0ff57482f0 100644
--- a/templates/gitlab-ci-sonar.yml
+++ b/templates/gitlab-ci-sonar.yml
@@ -426,11 +426,11 @@ sonar:
       fi
     - >-
       sonar-scanner ${TRACE+-Dsonar.verbose=true} $java_proxy_args 
-      ${SONAR_LOGIN+-Dsonar.login=$SONAR_LOGIN} 
-      ${SONAR_PASSWORD+-Dsonar.password=$SONAR_PASSWORD} 
-      ${SONAR_PROJECT_KEY+-Dsonar.projectKey=$SONAR_PROJECT_KEY} 
-      ${SONAR_PROJECT_NAME+-Dsonar.projectName=$SONAR_PROJECT_NAME} 
-      ${SONAR_QUALITY_GATE_ENABLED+-Dsonar.qualitygate.wait=$SONAR_QUALITY_GATE_ENABLED}
+      ${SONAR_LOGIN:+-Dsonar.login=$SONAR_LOGIN} 
+      ${SONAR_PASSWORD:+-Dsonar.password=$SONAR_PASSWORD} 
+      ${SONAR_PROJECT_KEY:+-Dsonar.projectKey=$SONAR_PROJECT_KEY} 
+      ${SONAR_PROJECT_NAME:+-Dsonar.projectName=$SONAR_PROJECT_NAME} 
+      ${SONAR_QUALITY_GATE_ENABLED:+-Dsonar.qualitygate.wait=$SONAR_QUALITY_GATE_ENABLED}
       $SONAR_BASE_ARGS
   rules:
     - !reference [.test-policy, rules]