diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 798243b..46efcda 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -1,39 +1,16 @@
-image: docker:19.03
-services:
-  - docker:19.03-dind
+image: registry.gitlab.tictex.eu/docker/docker-with-buildx-git:latest
+
 variables:
-  DOCKER_DRIVER: overlay
+  DOCKER_HOST: tcp://docker:2375/
+  DOCKER_DRIVER: overlay2
   DOCKER_TLS_CERTDIR: ""
-stages:
-  - buildx
-  - deploy
 
-buildx:
-  image: docker:19.03-git
-  stage: buildx
-  variables:
-    GIT_STRATEGY: none
-  artifacts:
-    paths:
-      - buildx
-    expire_in: 1 hour
-  services:
-    - docker:19.03-dind
+services:
+  - docker:dind
+
+build:
+  stage: build
   script:
-    - export DOCKER_BUILDKIT=1
-    - git clone git://github.com/docker/buildx ./docker-buildx
-    - docker build --platform=local -o . ./docker-buildx
-
-deploy:
-  image: docker:19.03
-  stage: deploy
-  services:
-    - name: docker:19.03-dind
-      command: ["--experimental"]
-  before_script:
-    - mkdir -p ~/.docker/cli-plugins
-    - mv buildx ~/.docker/cli-plugins/docker-buildx
-    - docker run --rm --privileged multiarch/qemu-user-static --reset -p yes
   variables:
     IMAGE_TAG: $CI_REGISTRY_IMAGE:$CI_COMMIT_REF_SLUG
   script: