diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 978f37bb87dd6b3cadd22d16dd95e0ad3c1908ec..800f6fa4610ff3d1b12579f9b240414e66efa11d 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -1,6 +1,7 @@
 stages:
   - purge
   - e2e-test
+  - analysis
 
 purge-old-containers:
   image:
@@ -40,3 +41,14 @@ e2e-testing:
     - echo 'create extension "uuid-ossp";' | docker exec -i postgis psql -U postgres ehasa
   allow_failure: true
 
+sonarqube:
+  stage: analysis
+  image: ciricihq/gitlab-sonar-scanner
+  tags: ['docker']
+  only:
+    - Development
+  variables:
+    SONAR_URL: http://10.166.0.3:9000
+    SONAR_ANALYSIS_MODE: publish
+  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
diff --git a/.gitlab.ci.yml b/.gitlab.ci.yml
deleted file mode 100644
index acd85d254e68e327ed79d24edad6e78c06805639..0000000000000000000000000000000000000000
--- a/.gitlab.ci.yml
+++ /dev/null
@@ -1,11 +0,0 @@
-stages:
-  - analysis
-
-sonarqube:
-  stage: analysis
-  image: ciricihq/gitlab-sonar-scanner
-  variables:
-    SONAR_URL: http://10.166.0.3:9000
-    SONAR_ANALYSIS_MODE: publish
-  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