diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 4b309704024e283a4b5e93f45af25b31d9b2a1aa..61b0eb834e1be76cf8ca93bccd7f961194acc63e 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -1,31 +1,17 @@
- image: docker:stable
+image: docker:stable
 
- variables:
-   # When using dind service we need to instruct docker, to talk with the
-   # daemon started inside of the service. The daemon is available with
-   # a network connection instead of the default /var/run/docker.sock socket.
-   #
-   # The 'docker' hostname is the alias of the service container as described at
-   # https://docs.gitlab.com/ee/ci/docker/using_docker_images.html#accessing-the-services
-   #
-   # Note that if you're using the Kubernetes executor, the variable should be set to
-   # tcp://localhost:2375/ because of how the Kubernetes executor connects services
-   # to the job container
-   # DOCKER_HOST: tcp://localhost:2375/
-   #
-   # For non-Kubernetes executors, we use tcp://docker:2375/
-   DOCKER_HOST: tcp://docker:2375/
-   # When using dind, it's wise to use the overlayfs driver for
-   # improved performance.
-   DOCKER_DRIVER: overlay2
+variables:
+  DOCKER_HOST: tcp://docker:2375/
+  DOCKER_DRIVER: overlay2
+  IMAGE_TAG: $CI_REGISTRY_IMAGE:$CI_COMMIT_REF_SLUG
 
- services:
-   - docker:dind
+services:
+  - docker:dind
 
- build:
-   stage: build
-   script:
-     - docker login -u $CI_REGISTRY_USER -p $CI_REGISTRY_PASSWORD $CI_REGISTRY
-     - docker build -t fsr-protokolle .
-     - docker push $CI_REGISTRY/fsr-protokolle
+build:
+  stage: build
+  script:
+    - docker login -u $CI_REGISTRY_USER -p $CI_REGISTRY_PASSWORD $CI_REGISTRY
+    - docker build -t $IMAGE_TAG .
+    - docker push $IMAGE_TAG