diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 0f6e7c4080e7c1a936b066cc887a9550ae49a708..595f8542d652d158b404d8d635ce2f1e31917ad6 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -1,9 +1,6 @@
 ---
 image: mathiwr/amdis-base:debian9
 
-cache:
-  - install/
-
 stages:
   - build
   - demo
@@ -15,6 +12,9 @@ build:9-debug-gcc:
   stage: build
   script:
   - tools/build_amdis.sh --stage build --config Debug
+  artifacts:
+    paths:
+    - install/
   only:
   - master
 
@@ -22,6 +22,9 @@ build:9-release-gcc:
   stage: build
   script:
   - tools/build_amdis.sh --stage build --config Release
+  artifacts:
+    paths:
+    - install/
   only:
   - master
 
@@ -29,6 +32,9 @@ build:9-parallel-debug-gcc:
   stage: build
   script:
   - tools/build_amdis.sh --stage build --config Debug --parallel
+  artifacts:
+    paths:
+    - install/
   only:
   - master
 
@@ -36,6 +42,9 @@ build:9-parallel-release-gcc:
   stage: build
   script:
   - tools/build_amdis.sh --stage build --config Release --parallel
+  artifacts:
+    paths:
+    - install/
   only:
   - master
 
@@ -45,6 +54,8 @@ demo:9-debug-gcc:
   stage: demo
   script:
   - tools/build_amdis.sh --stage demo --config Debug
+  dependencies:
+  - build:9-debug-gcc
   only:
   - master
 
@@ -52,6 +63,8 @@ demo:9-release-gcc:
   stage: demo
   script:
   - tools/build_amdis.sh --stage demo --config Release
+  dependencies:
+  - build:9-release-gcc
   only:
   - master
 
@@ -59,6 +72,8 @@ demo:9-parallel-debug-gcc:
   stage: demo
   script:
   - tools/build_amdis.sh --stage demo --config Debug --parallel
+  dependencies:
+  - build:9-parallel-debug-gcc
   only:
   - master
 
@@ -66,6 +81,8 @@ demo:9-parallel-release-gcc:
   stage: demo
   script:
   - tools/build_amdis.sh --stage demo --config Release --parallel
+  dependencies:
+  - build:9-parallel-release-gcc
   only:
   - master
 
@@ -75,6 +92,8 @@ test:9-debug-gcc:
   stage: test
   script:
   - tools/build_amdis.sh --stage test --config Debug
+  dependencies:
+  - build:9-debug-gcc
   only:
   - master
 
@@ -82,6 +101,8 @@ test:9-release-gcc:
   stage: test
   script:
   - tools/build_amdis.sh --stage test --config Release
+  dependencies:
+  - build:9-release-gcc
   only:
   - master
 
@@ -89,6 +110,8 @@ test:9-parallel-debug-gcc:
   stage: test
   script:
   - tools/build_amdis.sh --stage test --config Debug --parallel
+  dependencies:
+  - build:9-parallel-debug-gcc
   only:
   - master
 
@@ -96,6 +119,8 @@ test:9-parallel-release-gcc:
   stage: test
   script:
   - tools/build_amdis.sh --stage test --config Release --parallel
+  dependencies:
+  - build:9-parallel-release-gcc
   only:
   - master