diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index bb59a3f..60e1b5c 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -2,20 +2,21 @@ stages:
   - build
 
 variables:
-  IMAGE_NAME: thallian/alpine-s6
-  DOWNSTREAM_PROJECTS: "11 12 14 15 17 18"
+  CI_REGISTRY_IMAGE: thallian/alpine-s6
+  DOWNSTREAM_PROJECTS: ""
 
 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
-    - |
-      for proj in $DOWNSTREAM_PROJECTS; do
-        curl --request POST --form "token=$CI_JOB_TOKEN" --form ref=master $CI_API_V4_URL/projects/$proj/trigger/pipeline
-      done
+    - 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 "$CI_REGISTRY_IMAGE:$CI_COMMIT_SHA"
+      --destination "$CI_REGISTRY_IMAGE:$CI_COMMIT_REF_NAME"
+      --destination "$CI_REGISTRY_IMAGE:latest"
diff --git a/Dockerfile b/Dockerfile
index 8da52f7..0687ca4 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -23,7 +23,6 @@ RUN tar -Jxpf s6-overlay-x86_64-$S6_OVERLAY_VERSION.tar.xz -C /overlay
 FROM alpine:3.15
 
 ENV LANG=en_US.UTF-8
-ENV S6_KEEP_ENV=1
 
 COPY --from=builder /overlay /