diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 01962456a9c23a5ef9008d6b2b9666d0a6d909e1..c9db163d6b95637012d72e42577828ef81ef1b9d 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -1,8 +1,25 @@
 stages:
-  - everything
+  - clean
+  - run_tests
+
+clean-spack:
+  stage: clean
+  script:
+    - 'rm -rf /scratch/g/gitlab-runner/autoicon-spack || :'
+    - 'rm -rf /scratch/g/gitlab-runner/autoicon-spackcache || :'
+    - 'rm -rf /scratch/g/gitlab-runner/autoicon-spackconfig || :'
+  tags:
+    - slurm.meteo.physik.lmu.de
+
+  rules:
+    - if: '$CLEAN_UP == "true"'
+      when: always
+    - when: never
+
+
 
 real-from-ideal:
-  stage: everything
+  stage: run_tests
   script:
     - ./examples/01_real-from-ideal.sh
   tags:
@@ -18,7 +35,7 @@ real-from-ideal:
     expire_in: 7 days
 
 real-from-ideal-psp:
-  stage: everything
+  stage: run_tests
   script:
     - ./examples/01_real-from-ideal+psp.sh
   tags:
@@ -34,7 +51,7 @@ real-from-ideal-psp:
     expire_in: 7 days
 
 real-from-dwd-ana:
-  stage: everything
+  stage: run_tests
   script:
     - ./examples/02_real-from-dwd-ana.sh
   tags: