diff --git a/devcontainer_images.gitlab-ci.yml b/devcontainer_images.gitlab-ci.yml
new file mode 100644
index 0000000000000000000000000000000000000000..da2af5ff6f43a636b2c5ffe02af6fef366a615ba
--- /dev/null
+++ b/devcontainer_images.gitlab-ci.yml
@@ -0,0 +1,7 @@
+include:
+- local: images.gitlab-ci.yml
+
+variables:
+  DOCKER_LOGIN_CMD: docker login --username $DOCKER_DEVCONTAINER_USERNAME --password $DOCKER_DEVCONTAINER_PASSWORD
+  DOCKER_LOGOUT_CMD: docker logout
+  IMAGE_PREFIX: $DOCKER_DEVCONTAINER_USERNAME
diff --git a/image_variables.gitlab-ci.yml b/image_variables.gitlab-ci.yml
index 40ff6ce2ebedc17515f08bf085837ac5d19e81f4..0ee437cc26a3ee13c7282f552c08905f0c13879a 100644
--- a/image_variables.gitlab-ci.yml
+++ b/image_variables.gitlab-ci.yml
@@ -1,4 +1,3 @@
 variables:
   IMAGE_SERVER: registry.420joos.dev
-
   DOCKER_BUILDX_IMAGE: $IMAGE_SERVER/docker-buildx:1.1
diff --git a/images.gitlab-ci.yml b/images.gitlab-ci.yml
index a0b8a560bdc76f8fea64c2c7fdb5540113e22408..b796ad8c20354facc44bf6c355109dc4ef50a775 100644
--- a/images.gitlab-ci.yml
+++ b/images.gitlab-ci.yml
@@ -30,6 +30,6 @@ variables:
     - $DOCKER_LOGIN_CMD
     - $DOCKER_PREPARE_CMD
     - $DOCKER_BUILDX_CREATE_CMD
-    - docker buildx build $IMAGE_PATH --tag $IMAGE_NAME --platform $DOCKER_BUILDX_PLATFORMS --builder $DOCKER_BUILDX_CONTEXT_NAME --push --build-arg IMAGE_SERVER="$IMAGE_SERVER"
+    - docker buildx build $IMAGE_PATH $(echo $IMAGE_NAME | awk -F',' '{for (i=1; i<=NF; i++) printf "--tag %s ", $i}') --platform $DOCKER_BUILDX_PLATFORMS --builder $DOCKER_BUILDX_CONTEXT_NAME --push --build-arg IMAGE_SERVER="$IMAGE_SERVER"
     - $DOCKER_BUILDX_DELETE_CMD
     - $DOCKER_LOGOUT_CMD