diff --git a/build-scripts/docker-build-env/Dockerfile b/build-scripts/docker-build-env/Dockerfile
index 5eaaf8f3d..ef07172b5 100644
--- a/build-scripts/docker-build-env/Dockerfile
+++ b/build-scripts/docker-build-env/Dockerfile
@@ -12,7 +12,7 @@ RUN apt-get update && apt-get install -y \
     software-properties-common \
     && rm -rf /var/lib/apt/lists/*
 VOLUME /var/lib/docker
-RUN curl -fsSL https://download.docker.com/linux/ubuntu/gpg | sudo apt-key add -
+RUN curl -fsSL https://download.docker.com/linux/ubuntu/gpg | apt-key add -
 RUN add-apt-repository "deb [arch=amd64] https://download.docker.com/linux/ubuntu $(lsb_release -cs) stable"
 RUN apt-get update && apt-get install -y docker-ce && rm -rf /var/lib/apt/lists/*
 
@@ -21,9 +21,7 @@ RUN apt-get update && apt-get install -y \
     qemu-user-static \
     binfmt-support \
     && rm -rf /var/lib/apt/lists/*
-RUN mount binfmt_misc -t binfmt_misc /proc/sys/fs/binfmt_misc \
-    && update-binfmts --enable qemu-arm
 
-COPY run-docker.sh
+COPY run-docker.sh /
 
 WORKDIR /docker
diff --git a/build-scripts/docker-build-env/create_build_env.sh b/build-scripts/docker-build-env/create_build_env.sh
old mode 100644
new mode 100755
diff --git a/build-scripts/docker-build-env/run-docker.sh b/build-scripts/docker-build-env/run-docker.sh
old mode 100644
new mode 100755
index 1e2fc1bd7..ff7973da6
--- a/build-scripts/docker-build-env/run-docker.sh
+++ b/build-scripts/docker-build-env/run-docker.sh
@@ -35,6 +35,11 @@ cleanup() {
 }
 trap 'cleanup fail' SIGINT SIGTERM
 
+# Start docker
+echo "[INFO] Setup qemu-arm."
+mount binfmt_misc -t binfmt_misc /proc/sys/fs/binfmt_misc
+update-binfmts --enable qemu-arm
+
 # Start docker
 echo "[INFO] Starting docker."
 dockerd 2> /dev/null &