diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 0cede9c9bad3f2851f2d5217bec48293ec45223b..7337859eafddd2719a6ecad9e95639f1a1f80601 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -19,15 +19,10 @@ stages:
 before_script:
   - export NG_CLI_ANALYTICS="false"
   - export MAVEN_USER_HOME=`pwd`/.maven
-  - npm ci --cache .npm --prefer-offline
 
 pmdCheckstylePrettierLint:
   stage: lint
-  cache:
-    # inherit all global cache settings
-    <<: *global_cache
-    # override the policy
-    policy: pull
+  cache: []
   when: always
   script:
     - 'export VERSION="6.40.0"'
@@ -113,6 +108,10 @@ frontend-test:
     when: always
     expire_in: 15 days
   needs: []
+  before_script:
+    - export NG_CLI_ANALYTICS="false"
+    - export MAVEN_USER_HOME=`pwd`/.maven
+    - npm ci --cache .npm --prefer-offline
 
 sonar-analyze:
   stage: analyze
@@ -128,6 +127,10 @@ sonar-analyze:
     - ./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:
@@ -178,9 +181,9 @@ e2e-test:
     <<: *global_cache
     # override the policy
     policy: pull
-  only:
-    refs:
-      - development
+  # only:
+  #   refs:
+  #     - development
   services:
     - selenium/standalone-chrome
   dependencies: