diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 5a2305b..a82ce96 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -1,12 +1,18 @@
 variables:
-  IMAGE_NAME: thallian/keycloak
+  CONTAINER_NAME: thallian/keycloak
+
 build:
   stage: build
+  image:
+    name: gcr.io/kaniko-project/executor:debug
+    entrypoint: [""]
   script:
-    - docker login -u $DOCKER_USER -p $DOCKER_PASSWORD $DOCKER_REGISTRY
-    - docker build -t $IMAGE_NAME:$CI_COMMIT_SHA .
-    - docker build -t $IMAGE_NAME:$CI_COMMIT_REF_NAME .
-    - docker build -t $IMAGE_NAME:latest .
-    - docker push $IMAGE_NAME:$CI_COMMIT_SHA
-    - docker push $IMAGE_NAME:$CI_COMMIT_REF_NAME
-    - docker push $IMAGE_NAME:latest
+    - mkdir -p /kaniko/.docker
+    - echo "{\"auths\":{\"$CI_REGISTRY\":{\"auth\":\"$(printf "%s:%s" "$CI_REGISTRY_USER" "$CI_REGISTRY_PASSWORD" | base64 | tr -d '\n')\"}}}" > /kaniko/.docker/config.json
+    - >-
+      /kaniko/executor
+      --context "$CI_PROJECT_DIR"
+      --dockerfile "$CI_PROJECT_DIR/Dockerfile"
+      --destination "$CONTAINER_NAME:$CI_COMMIT_SHA"
+      --destination "$CONTAINER_NAME:$CI_COMMIT_REF_NAME"
+      --destination "$CONTAINER_NAME:latest"
diff --git a/rootfs/etc/s6-overlay/s6-rc.d/keycloak/run b/rootfs/etc/s6-overlay/s6-rc.d/keycloak/run
index db35fcd..56d4a7d 100644
--- a/rootfs/etc/s6-overlay/s6-rc.d/keycloak/run
+++ b/rootfs/etc/s6-overlay/s6-rc.d/keycloak/run
@@ -1,4 +1,4 @@
-#!/command/with-contenv sh
+#!/bin/sh
 
 exec s6-setuidgid keycloak /home/keycloak/server/bin/kc.sh start \
 	--db-url-host "$DB_HOST" \