diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 85866205a91153ac01d160013d2f020cc1314b28..84c4f14e16f1c695f1a2017caedfcb7f91961ef2 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -11,10 +11,10 @@ stages:
   - lint
   - build
   - test
-  - analyze
   - release
   - deploy
   - e2e
+  - analyze
 
 before_script:
   - export NG_CLI_ANALYTICS="false"
@@ -113,25 +113,6 @@ frontend-test:
     - export MAVEN_USER_HOME=`pwd`/.maven
     - npm ci --cache .npm --prefer-offline
 
-sonar-analyze:
-  stage: analyze
-  cache:
-    # inherit all global cache settings
-    <<: *global_cache
-    # override the policy
-    policy: pull
-  dependencies:
-    - maven-test
-    - frontend-test
-  script:
-    - ./mvnw -ntp org.jacoco:jacoco-maven-plugin:prepare-agent initialize sonar:sonar -Dsonar.organization=codeAbility -Dsonar.host.url=https://qe-sonarqube.uibk.ac.at/ -Dsonar.login=${SONAR_TOKEN_QE} -Dmaven.repo.local=$MAVEN_USER_HOME
-  #    - ./mvnw -ntp org.jacoco:jacoco-maven-plugin:prepare-agent initialize sonar:sonar -Dsonar.organization=codeAbility -Dsonar.host.url=https://server.arctis.at/sonar/ -Dsonar.login=${SONAR_TOKEN} -Dmaven.repo.local=$MAVEN_USER_HOME
-  allow_failure: true
-  before_script:
-    - export NG_CLI_ANALYTICS="false"
-    - export MAVEN_USER_HOME=`pwd`/.maven
-    - npm ci --cache .npm --prefer-offline
-
 # Uncomment the following line to use gitlabs container registry. You need to adapt the REGISTRY_URL in case you are not using gitlab.com
 docker-push:
   stage: release
@@ -143,7 +124,6 @@ docker-push:
     REGISTRY_URL: sharing-codeability.uibk.ac.at:5051
     IMAGE_TAG: sharing-codeability.uibk.ac.at:5051/sharing/codeability-sharing-platform
   script:
-    - rm -rf /builds/sharing/codeability-sharing-platform/target/*
     - ./mvnw package -Pprod verify -DskipTests jib:build -Djib.to.image=$IMAGE_TAG -Djib.to.auth.username=gitlab-ci-token  -Djib.to.auth.password=$CI_BUILD_TOKEN -Dmaven.repo.local=$MAVEN_USER_HOME
   when: on_success
 
@@ -190,3 +170,22 @@ e2e-test:
     - export E2E_PASSWORD=$E2E_PASSWORD
     - npm run e2e --host=selenium__standalone-chrome
   when: on_success
+
+sonar-analyze:
+  stage: analyze
+  cache:
+    # inherit all global cache settings
+    <<: *global_cache
+    # override the policy
+    policy: pull
+  dependencies:
+    - maven-test
+    - frontend-test
+  script:
+    - ./mvnw -ntp org.jacoco:jacoco-maven-plugin:prepare-agent initialize sonar:sonar -Dsonar.organization=codeAbility -Dsonar.host.url=https://qe-sonarqube.uibk.ac.at/ -Dsonar.login=${SONAR_TOKEN_QE} -Dmaven.repo.local=$MAVEN_USER_HOME
+  #    - ./mvnw -ntp org.jacoco:jacoco-maven-plugin:prepare-agent initialize sonar:sonar -Dsonar.organization=codeAbility -Dsonar.host.url=https://server.arctis.at/sonar/ -Dsonar.login=${SONAR_TOKEN} -Dmaven.repo.local=$MAVEN_USER_HOME
+  allow_failure: true
+  before_script:
+    - export NG_CLI_ANALYTICS="false"
+    - export MAVEN_USER_HOME=`pwd`/.maven
+    - npm ci --cache .npm --prefer-offline