diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 2c63ca8..f4f7804 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -1,3 +1,7 @@
+variables:
+  DOCKER_USER: pfingstfrosch
+  ASSIGNMENT: waecm-2021-group-04-bsp-3
+
 stages:
   - build
   - lint
@@ -98,10 +102,13 @@ test_fe:
 .docker-setup:
   before_script:
     - echo $DOCKER_PW | docker login -u $DOCKER_USER --password-stdin
+  artifacts:
+    untracked: true
 
 docker-build-fe:
   script:
-    - echo ""
+    - docker-compose build waecm_g4_fe
+    - docker save -o waecm_g4_fe ${DOCKER_USER}/${ASSIGNMENT}-fe
   extends:
     - .docker-build
     - .docker-setup
@@ -110,7 +117,8 @@ docker-build-fe:
 
 docker-build-be:
   script:
-    - echo ""
+    - docker-compose build waecm_g4_be
+    - docker save -o waecm_g4_be ${DOCKER_USER}/${ASSIGNMENT}-be
   extends:
     - .docker-build
     - .docker-setup