diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 62dc18186dcfdac3b44e5a906d837b32f5a8bd4a..657bc9d3e19ce00aea61fb6b00383afff77ceed6 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -13,52 +13,20 @@ test:
   script:
     - gradle --no-daemon --no-scan --no-build-cache test --fail-fast
 
-
-.build-image:
+build:
   stage: publish
-  image: docker:stable
-  services:
-    - docker:dind
+  tags:
+    - mbr
+  image:
+    name: gcr.io/kaniko-project/executor:debug
+    entrypoint: [""]
   script:
-    - docker login -u "$REGISTRY_USER" -p "$REGISTRY_PASSWORD" "$REGISTRY"
-    - docker build --pull -t "$IMAGE_TAG" -f "$DOCKERFILE" .
-    - docker push "$IMAGE_TAG"
-    - docker logout
-
-build-tagged-image:
-  extends: .build-image
-  variables:
-    IMAGE_TAG: "$CI_REGISTRY_IMAGE:$CI_COMMIT_TAG"
-    REGISTRY_PASSWORD: "$CI_REGISTRY_PASSWORD"
-    REGISTRY_USER: "$CI_REGISTRY_USER"
-    REGISTRY: "$CI_REGISTRY"
-    DOCKERFILE: "Dockerfile"
+    - mkdir -p /kaniko/.docker
+    - echo "{\"auths\":{\"$CI_REGISTRY\":{\"username\":\"$CI_REGISTRY_USER\",\"password\":\"$CI_REGISTRY_PASSWORD\"}}}" > /kaniko/.docker/config.json
+    - /kaniko/executor --context $CI_PROJECT_DIR --dockerfile $CI_PROJECT_DIR/Dockerfile --destination $CI_REGISTRY_IMAGE:$CI_COMMIT_TAG
   only:
     - tags
 
-build-latest-image:
-  extends: .build-image
-  variables:
-    IMAGE_TAG: "$CI_REGISTRY_IMAGE:latest"
-    REGISTRY_PASSWORD: "$CI_REGISTRY_PASSWORD"
-    REGISTRY_USER: "$CI_REGISTRY_USER"
-    REGISTRY: "$CI_REGISTRY"
-    DOCKERFILE: "Dockerfile"
-  only:
-    - master
-
-build-feature-branch-image:
-  extends: .build-image
-  variables:
-    IMAGE_TAG: "$CI_REGISTRY_IMAGE:$CI_COMMIT_REF_NAME"
-    REGISTRY_PASSWORD: "$CI_REGISTRY_PASSWORD"
-    REGISTRY_USER: "$CI_REGISTRY_USER"
-    REGISTRY: "$CI_REGISTRY"
-    DOCKERFILE: "Dockerfile"
-  except:
-    - master
-    - tags
-
 test-chart:
   stage: test
   image: dtzar/helm-kubectl:3.2.0