diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index d43bb24665ba27605a39568926e3f6318733750f..9b5e324d77a332502a191e5d94595d923ff5c449 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -43,13 +43,18 @@ e2e-testing:
 
 sonarqube:
   stage: analysis
-  image: jramcast/gitlab-ci-sonarqube
-  tags: ['docker']
-  only:
-    - Development
+  image: ciricihq/gitlab-sonar-scanner
+  variables:
+    SONAR_URL: http://10.166.0.3:9000
+    SONAR_ANALYSIS_MODE: preview
+  script:
+    - gitlab-sonar-scanner -Dsonar.host.url=http://10.166.0.3:9000 -Dsonar.projectKey=backend -Dsonar.login=$SONAR_USER -Dsonar.password=$SONAR_PASS -Dsonar.gitlab.project_id=$CI_PROJECT_ID -Dsonar.gitlab.commit_sha=$CI_COMMIT_REF -Dsonar.gitlab.ref_name=$CI_COMMIT_REF_NAME
+
+sonarqube-reports:
+  stage: analysis
+  image: ciricihq/gitlab-sonar-scanner
   variables:
     SONAR_URL: http://10.166.0.3:9000
-    SONAR_LOGIN: $SONAR_TOKEN
+    SONAR_ANALYSIS_MODE: publish
   script:
-    - sonar-scanner-preview
-    - sonar-scanner
+    - gitlab-sonar-scanner -Dsonar.host.url=http://10.166.0.3:9000 -Dsonar.projectKey=backend -Dsonar.login=$SONAR_USER -Dsonar.password=$SONAR_PASS -Dsonar.gitlab.project_id=$CI_PROJECT_ID -Dsonar.gitlab.commit_sha=$CI_COMMIT_REF -Dsonar.gitlab.ref_name=$CI_COMMIT_REF_NAME
diff --git a/sonar-project.properties b/sonar-project.properties
index 767f2d194366d447fdd8b1bd1f0e4af429a32c81..ba1161bc77a9b76a8295597871277acb32e4552f 100644
--- a/sonar-project.properties
+++ b/sonar-project.properties
@@ -2,4 +2,3 @@ sonar.projectKey=backend
 sonar.projectName=OverflowBackend
 sonar.projectVersion=1.0
 sonar.sources=.
-sonar.analysis.mode=publish