diff --git a/entrypoint.sh b/entrypoint.sh
index 1acac0d..52bd246 100644
--- a/entrypoint.sh
+++ b/entrypoint.sh
@@ -34,7 +34,7 @@ if [ -n "$INPUT_PLATFORM" ]; then
 fi
 
 if [ "$INPUT_PUSH_IMAGE" = "true" ]; then
-  DOCKER_BUILD_OPTIONS+=("--push")
+  DOCKER_BUILD_OPTIONS+=("--push" "--output=type=image,push=true")
 fi
 
 if [ "$INPUT_PULL_CACHE" = "true" ]; then
@@ -48,6 +48,7 @@ if [ -n "$INPUT_EXPORT_TAR" ]; then
   DOCKER_BUILD_OPTIONS+=("--output" "type=docker,dest=$INPUT_EXPORT_TAR")
 fi
 
+DOCKER_BUILD_OPTIONS+=("--rm")
 DOCKER_BUILD_OPTIONS+=("${INPUT_DOCKERFILE_PATH}")
 # shellcheck disable=SC2145
 echo "Running docker buildx with options: ${DOCKER_BUILD_OPTIONS[@]}"