diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index de41f6c623745ee0591eec84a7cc819941d14e1f..3583485a325bc0d577f606271e72dd90501910d3 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -14,11 +14,21 @@ stages:
   - deploy
 
 build:
+  interruptible: true
   stage: build
+  image:
+    name: gcr.io/kaniko-project/executor:debug
+    entrypoint: [""]
   script:
-    - buildah bud -t teckids.org:latest
-  interruptible: true
-  retry: 1
+    - 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_REF_NAME
+       --cache=true
+       --cleanup
+  only:
+    - master
 
 deploy:
   stage: deploy