diff --git a/docker/production/.gitlab-ci.yml b/docker/production/.gitlab-ci.yml
index d570d371..76eee47b 100644
--- a/docker/production/.gitlab-ci.yml
+++ b/docker/production/.gitlab-ci.yml
@@ -9,9 +9,12 @@ docker-build-rolling:
     - docker:23.0.3-dind
   variables:
     TAG: $CI_COMMIT_BRANCH
+    DOCKER_BUILDKIT: 1
+    DOCKER_HOST: tcp://docker:2376
   script:
     - mkdir -p /root/.docker
     - cp ${DOCKER_HUB_CONFIG} /root/.docker/config.json
+    - docker buildx create --use
     - docker buildx build --push --platform=linux/amd64,linux/arm64 --file=docker/production/web-server/Dockerfile --tag=${DOCKER_IMAGE_WEB_SERVER}:${TAG} .
     - docker buildx build --push --platform=linux/amd64,linux/arm64 --file=docker/production/app/Dockerfile --tag=${DOCKER_IMAGE_APP}:${TAG} .
     - docker buildx build --push --platform=linux/amd64,linux/arm64 --file=docker/production/video-clipper/Dockerfile --tag=${DOCKER_IMAGE_VIDEO_CLIPPER}:${TAG} .
@@ -29,10 +32,14 @@ docker-build-main-release:
     name: docker.io/docker:23.0.3-dind
   services:
     - docker:23.0.3-dind
+  variables:
+    DOCKER_BUILDKIT: 1
+    DOCKER_HOST: tcp://docker:2376
   script:
     - mkdir -p /root/.docker
     - cp ${DOCKER_HUB_CONFIG} /root/.docker/config.json
     - export CP_VERSION=$(cat CP_VERSION.env)
+    - docker buildx create --use
     - docker buildx build --push --platform=linux/amd64,linux/arm64 --file=docker/production/web-server/Dockerfile --tag=${DOCKER_IMAGE_WEB_SERVER}:${CP_VERSION} --tag={DOCKER_IMAGE_WEB_SERVER}:latest .
     - docker buildx build --push --platform=linux/amd64,linux/arm64 --file=docker/production/app/Dockerfile --tag=${DOCKER_IMAGE_APP}:${CP_VERSION} --tag=${DOCKER_IMAGE_APP}:latest .
     - docker buildx build --push --platform=linux/amd64,linux/arm64 --file=docker/production/video-clipper/Dockerfile --tag=${DOCKER_IMAGE_VIDEO_CLIPPER}:${CP_VERSION} --tag=${DOCKER_IMAGE_VIDEO_CLIPPER}:latest .
@@ -52,10 +59,13 @@ docker-build-alpha-beta-release:
     - docker:23.0.3-dind
   variables:
     TAG: $CI_COMMIT_BRANCH
+    DOCKER_BUILDKIT: 1
+    DOCKER_HOST: tcp://docker:2376
   script:
     - mkdir -p /root/.docker
     - cp ${DOCKER_HUB_CONFIG} /root/.docker/config.json
     - export CP_VERSION=$(cat CP_VERSION.env)
+    - docker buildx create --use
     - docker buildx build --push --platform=linux/amd64,linux/arm64 --file=docker/production/web-server/Dockerfile --tag=${DOCKER_IMAGE_WEB_SERVER}:${CP_VERSION} --tag={DOCKER_IMAGE_WEB_SERVER}:${TAG} .
     - docker buildx build --push --platform=linux/amd64,linux/arm64 --file=docker/production/app/Dockerfile --tag=${DOCKER_IMAGE_APP}:${CP_VERSION} --tag=${DOCKER_IMAGE_APP}:${TAG} .
     - docker buildx build --push --platform=linux/amd64,linux/arm64 --file=docker/production/video-clipper/Dockerfile --tag=${DOCKER_IMAGE_VIDEO_CLIPPER}:${CP_VERSION} --tag=${DOCKER_IMAGE_VIDEO_CLIPPER}:${TAG} .