diff --git a/builder.sh b/builder.sh
index 03cfa13..0bb4ded 100755
--- a/builder.sh
+++ b/builder.sh
@@ -17,7 +17,6 @@ DOCKER_PUSH=true
 DOCKER_USER=
 DOCKER_PASSWORD=
 DOCKER_LOCAL=false
-CROSSBUILD_CLEANUP=true
 SELF_CACHE=false
 CUSTOM_CACHE_TAG=
 RELEASE_TAG=false
@@ -115,8 +114,6 @@ Options:
        Username to login into docker with
     --docker-password
        Password to login into docker with
-    --no-crossbuild-cleanup
-       Don't cleanup the crosscompile feature (for multiple builds)
 
     Use the host docker socket if mapped into container:
        /var/run/docker.sock
@@ -681,30 +678,14 @@ function extract_machine_build() {
 #### initialized cross-build ####
 
 function init_crosscompile() {
-    bashio::log.info "Setup crosscompiling feature"
-    (
-        mount binfmt_misc -t binfmt_misc /proc/sys/fs/binfmt_misc
-        update-binfmts --enable qemu-arm
-        update-binfmts --enable qemu-aarch64
-    ) > /dev/null 2>&1 || bashio::log.warning "Can't enable crosscompiling feature"
-}
-
-
-function clean_crosscompile() {
-    if [ "$CROSSBUILD_CLEANUP" == "false" ]; then
-        bashio::log.info "Skeep crosscompiling cleanup"
+    if [[ "$(uname -m)" != "x86_64" ]]; then
+        bashio::log.info "No crossbuild support on host"
         return 0
     fi
 
-    bashio::log.info "Clean crosscompiling feature"
-    if [ -f /proc/sys/fs/binfmt_misc ]; then
-        umount /proc/sys/fs/binfmt_misc || true
-    fi
-
-    (
-        update-binfmts --disable qemu-arm
-        update-binfmts --disable qemu-aarch64
-    ) > /dev/null 2>&1 || bashio::log.warning "No crosscompiling feature found for cleanup"
+    bashio::log.info "Setup crosscompiling feature"
+    docker run --rm --privileged multiarch/qemu-user-static --reset -p yes \
+        > /dev/null 2>&1 || bashio::log.warning "Can't enable crosscompiling feature"
 }
 
 #### Error handling ####
@@ -783,9 +764,6 @@ while [[ $# -gt 0 ]]; do
             DOCKER_PASSWORD=$2
             shift
 	    ;;
-        --no-crossbuild-cleanup)
-            CROSSBUILD_CLEANUP=false
-            ;;
         --armhf)
             BUILD_LIST+=("armhf")
             ;;
@@ -950,7 +928,6 @@ fi
 wait "${BUILD_TASKS[@]}"
 
 # Cleanup docker env
-clean_crosscompile
 stop_docker
 
 # No Errors