diff --git a/tool-sonar8.gitlab-ci.yml b/tool-sonar8.gitlab-ci.yml
index fe50c6a..724d60e 100644
--- a/tool-sonar8.gitlab-ci.yml
+++ b/tool-sonar8.gitlab-ci.yml
@@ -18,8 +18,8 @@
       "-Dsonar.projectKey=$SONAR_PROJECT_KEY"
       "-Dsonar.projectName=$SONAR_PROJECT_NAME"
       "-Dsonar.exclusions=$SONAR_EXCLUSIONS"
-      "-Dsonar.qualitygate.wait=$SONAR_QUERY_MAX_ATTEMPTS_BUILD_BREAKER"
-      "-Dsonar.qualitygate.timeout=$SONAR_QUERY_INTERVAL_BUILD_BREAKER"
+      "-Dsonar.qualitygate.wait=true"
+      "-Dsonar.qualitygate.timeout=300"
 
 .sonar-template-gradle:
   extends: .sonar-template-common
@@ -31,5 +31,5 @@
       "-Dsonar.projectKey=$SONAR_PROJECT_KEY"
       "-Dsonar.projectName=$SONAR_PROJECT_NAME"
       "-Dsonar.exclusions=$SONAR_EXCLUSIONS"
-      "-Dsonar.qualitygate.wait=$SONAR_QUERY_MAX_ATTEMPTS_BUILD_BREAKER"
+      "-Dsonar.qualitygate.wait=$SONAR_QUALITYGATE_WAIT"
       "-Dsonar.qualitygate.timeout=$SONAR_QUERY_INTERVAL_BUILD_BREAKER"