diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index f584452da717016af305439e8d41a357664f4737..26184fe096c93520a95c5cda225011a90249e3f6 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -156,10 +156,12 @@ test:arch:
   variables:
     DOCKER_DRIVER: overlay2
     DOCKER_HOST: docker
-    IMAGE_TAG_NIGHTLY_FULL: $CI_REGISTRY_IMAGE/nightly:latest
-    IMAGE_TAG_NIGHTLY_CLI:  $CI_REGISTRY_IMAGE/nightly-cli:latest
-    IMAGE_TAG_RELEASE: $CI_REGISTRY_IMAGE:$CI_COMMIT_REF_NAME
-    IMAGE_TAG_LATEST: $CI_REGISTRY_IMAGE:latest
+    IMAGE_TAG_NIGHTLY_ALL:        $CI_REGISTRY_IMAGE/nightly:latest
+    IMAGE_TAG_NIGHTLY_CLI:        $CI_REGISTRY_IMAGE/nightly-cli:latest
+    IMAGE_TAG_RELEASE_ALL:        $CI_REGISTRY_IMAGE:$CI_COMMIT_REF_NAME
+    IMAGE_TAG_RELEASE_LATEST_ALL: $CI_REGISTRY_IMAGE:latest
+    IMAGE_TAG_RELEASE_CLI:        $CI_REGISTRY_IMAGE/cli:$CI_COMMIT_REF_NAME
+    IMAGE_TAG_RELEASE_LATEST_CLI: $CI_REGISTRY_IMAGE/cli:latest
   services:
     - docker:dind
   before_script:
@@ -176,11 +178,11 @@ docker:build-nightly:
     variables:
       - $SCHEDULED_NIGHTLY
   script:
-    - docker build -f extra/docker/master/Dockerfile     -t "$IMAGE_TAG_NIGHTLY_FULL" .
+    - docker build -f extra/docker/master/Dockerfile     -t "$IMAGE_TAG_NIGHTLY_ALL" .
     - docker build -f extra/docker/master-cli/Dockerfile -t "$IMAGE_TAG_NIGHTLY_CLI" .
-    - docker run "$IMAGE_TAG_NIGHTLY_FULL" /usr/bin/aql2 --help
+    - docker run "$IMAGE_TAG_NIGHTLY_ALL" /usr/bin/aql2 --help
     - docker run "$IMAGE_TAG_NIGHTLY_CLI"  /usr/bin/aql2 --help
-    - docker push "$IMAGE_TAG_NIGHTLY_FULL"
+    - docker push "$IMAGE_TAG_NIGHTLY_ALL"
     - docker push "$IMAGE_TAG_NIGHTLY_CLI"
 
 docker:build-release:
@@ -190,7 +192,11 @@ docker:build-release:
   except:
     - branches
   script:
-    - docker build -f extra/docker/master/Dockerfile -t "$IMAGE_TAG_RELEASE" -t "$IMAGE_TAG_LATEST" .
-    - docker run "$IMAGE_TAG_RELEASE" /usr/bin/aql2 --help
-    - docker push "$IMAGE_TAG_RELEASE"
-    - docker push "$IMAGE_TAG_LATEST"
+    - docker build -f extra/docker/master/Dockerfile     -t "$IMAGE_TAG_RELEASE_ALL" -t "$IMAGE_TAG_LATEST_ALL" .
+    - docker build -f extra/docker/master-cli/Dockerfile -t "$IMAGE_TAG_RELEASE_CLI"  -t "$IMAGE_TAG_LATEST_CLI" .
+    - docker run "$IMAGE_TAG_RELEASE_ALL" /usr/bin/aql2 --help
+    - docker run "$IMAGE_TAG_RELEASE_CLI"  /usr/bin/aql2 --help
+    - docker push "$IMAGE_TAG_RELEASE_ALL"
+    - docker push "$IMAGE_TAG_RELEASE_CLI"
+    - docker push "$IMAGE_TAG_RELEASE_LATEST_ALL"
+    - docker push "$IMAGE_TAG_RELEASE_LATEST_CLI"
diff --git a/Dockerfile b/Dockerfile
deleted file mode 120000
index e33724c1251fdf413402dd9ebe1598ea4218b6f0..0000000000000000000000000000000000000000
--- a/Dockerfile
+++ /dev/null
@@ -1 +0,0 @@
-extra/docker/master/Dockerfile
\ No newline at end of file