diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 48c2fe3..7f1b329 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -51,6 +51,17 @@ build-all:
     - docker tag ${DOCKER_NS}:${DOCKER_TAG} ${DOCKER_NS}:${DOCKER_TAG_NEW}
     - docker push ${DOCKER_NS}:${DOCKER_TAG_NEW}
 
+buildx-docker-build:
+  extends: .docker-build
+  variables:
+    DOCKER_NS: ${CI_REGISTRY}/digiresilience/link/link-stack/buildx
+    DOCKERFILE_PATH: ./docker/buildx/Dockerfile
+
+buildx-docker-release:
+  extends: .docker-release
+  variables:
+    DOCKER_NS: ${CI_REGISTRY}/digiresilience/link/link-stack/buildx
+
 link-docker-build:
   extends: .docker-build
   variables:
diff --git a/docker/buildx/Dockerfile b/docker/buildx/Dockerfile
new file mode 100644
index 0000000..17b96ca
--- /dev/null
+++ b/docker/buildx/Dockerfile
@@ -0,0 +1,11 @@
+FROM docker:git
+
+RUN set -ex; \
+  apk add --no-cache --update \
+  make \
+  curl \
+  bash \
+  jq  ;
+COPY --from=docker/buildx-bin /buildx /usr/libexec/docker/cli-plugins/docker-buildx
+RUN docker buildx install
+RUN docker buildx version