diff --git a/Dockerfile b/Dockerfile
index a328794..0a0b73b 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -22,11 +22,11 @@ RUN set -eux; \
     tar -xzf crane.tar.gz; \
     mv crane /kaniko; \
     rm *; \
-    mkdir /build;
+    mkdir /kaniko/build;
 
-COPY entrypoint.sh /
+COPY entrypoint.sh /kaniko/entrypoint.sh
 
-ENTRYPOINT ["/entrypoint.sh"]
+ENTRYPOINT ["/kaniko/entrypoint.sh"]
 
 LABEL repository="https://code.thetadev.de/ThetaDev/action-kaniko" \
     maintainer="ThetaDev <thetadev@magenta.de>"
diff --git a/entrypoint.sh b/entrypoint.sh
index 55a75f6..2a9af5c 100755
--- a/entrypoint.sh
+++ b/entrypoint.sh
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/busybox/sh
 set -e pipefail
 
 if [ "$INPUT_DEBUG" = "true" ]; then
@@ -77,7 +77,7 @@ runKaniko() {
     # https://github.com/GoogleContainerTools/kaniko/issues/1803
     # https://github.com/GoogleContainerTools/kaniko/issues/1349
     IFS=''
-    kaniko_cmd="executor ${1} --reproducible --force"
+    kaniko_cmd="executor ${1} --reproducible --force --cleanup"
     echo "Running kaniko command: ${kaniko_cmd}"
     eval "${kaniko_cmd}"
     IFS=$OLDIFS
@@ -93,12 +93,12 @@ if [ -n "$INPUT_PLATFORMS" ]; then
 
         platformFn=$(echo "$platform" | sed 's#/#-#g')
 
-        DESTINATION="--no-push --tarPath /build/${platformFn}.tar --destination $IMAGE"
-        DIGEST="--image-name-tag-with-digest-file=/build/${platformFn}_image-tag-digest"
+        DESTINATION="--no-push --tarPath /kaniko/build/${platformFn}.tar --destination $IMAGE"
+        DIGEST="--image-name-tag-with-digest-file=/kaniko/build/${platformFn}_image-tag-digest"
 
         runKaniko "${ARGS} --custom-platform=${platform} $DESTINATION $DIGEST"
 
-        echo "✅ $platform image built: $(head -n 1 "/build/${platformFn}_image-tag-digest")"
+        echo "✅ $platform image built: $(head -n 1 "/kaniko/build/${platformFn}_image-tag-digest")"
     done
 
     echo; echo "🚀 Pushing images"
@@ -106,10 +106,10 @@ if [ -n "$INPUT_PLATFORMS" ]; then
     DIGESTS=""
     for platform in $platformArray; do
         platformFn=$(echo "$platform" | sed 's#/#-#g')
-        digest=$(head -n 1 "/build/${platformFn}_image-tag-digest")
+        digest=$(head -n 1 "/kaniko/build/${platformFn}_image-tag-digest")
 
         echo "Pushing $platform img $digest"
-        crane push "/build/${platformFn}.tar" "$digest"
+        crane push "/kaniko/build/${platformFn}.tar" "$digest"
         DIGESTS="$DIGESTS -m $digest"
     done
 
@@ -129,10 +129,10 @@ else
     if [ -n "$IMAGE_LATEST" ]; then
         DESTINATION="$DESTINATION --destination $IMAGE_LATEST"
     fi
-    DIGEST="--image-name-tag-with-digest-file=/build/image-tag-digest"
+    DIGEST="--image-name-tag-with-digest-file=/kaniko/build/image-tag-digest"
 
     runKaniko "${ARGS} $DESTINATION $DIGEST"
-    IMAGE_TAG_DIGEST=$(head -n 1 /build/image-tag-digest)
+    IMAGE_TAG_DIGEST=$(head -n 1 /kaniko/build/image-tag-digest)
 fi
 
 DIGEST=$(echo "$IMAGE_TAG_DIGEST" | cut -f2 -d '@')