diff --git a/images.gitlab-ci.yml b/images.gitlab-ci.yml
index b796ad8c20354facc44bf6c355109dc4ef50a775..a634eeaecc586ae8e6fef5ea6ecfe2d83af46cc7 100644
--- a/images.gitlab-ci.yml
+++ b/images.gitlab-ci.yml
@@ -1,10 +1,9 @@
-include:
-- local: image_variables.gitlab-ci.yml
-
 stages:
 - build
 
 variables:
+  IMAGE_SERVER: registry.420joos.dev
+  DOCKER_BUILDX_IMAGE: ${IMAGE_SERVER}/docker-buildx:1.1
   DOCKER_BUILDX_CONTEXT_NAME: autobuilder
   DOCKER_BUILDX_PLATFORMS: linux/amd64,linux/arm64
   DOCKER_BUILDX_CREATE_CMD:  docker buildx create --name $DOCKER_BUILDX_CONTEXT_NAME --platform $DOCKER_BUILDX_PLATFORMS --driver docker-container --bootstrap # --config testbuilder.toml only needed when using http image registry
@@ -30,6 +29,6 @@ variables:
     - $DOCKER_LOGIN_CMD
     - $DOCKER_PREPARE_CMD
     - $DOCKER_BUILDX_CREATE_CMD
-    - 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 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"
     - $DOCKER_BUILDX_DELETE_CMD
     - $DOCKER_LOGOUT_CMD