diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index c41de0e..dad6b7b 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -127,11 +127,6 @@ test_fe:
   before_script:
     - docker login -u $DOCKER_USER -p $DOCKER_PW
     - mkdir ./img
-  artifacts:
-    when: always
-    expire_in: 1 week
-    paths:
-      - /img
   tags:
     - docker
 
@@ -149,6 +144,9 @@ docker-build-fe:
     - .docker-setup
   needs:
     - test_fe
+  artifacts:
+    paths:
+      - img/waecm_g4_fe
 
 docker-build-be:
   script:
@@ -160,6 +158,9 @@ docker-build-be:
     - .docker-setup
   needs:
     - build_be
+  artifacts:
+    paths:
+      - img/waecm_g4_be
 
 ########
 # DOCKER-PUSH