diff --git a/scripts/docker-run.sh b/scripts/docker-run.sh
index 3e6c5870e4b7..b74c656d0709 100755
--- a/scripts/docker-run.sh
+++ b/scripts/docker-run.sh
@@ -19,6 +19,8 @@ fi
 docker run -i -v "$(pwd)":/home/sof/work/sof.git \
 	--env CMAKE_BUILD_TYPE \
 	--env PRIVATE_KEY_OPTION \
-	   --user "$(id -u)" \
+	--env http_proxy=${http_proxy} \
+	--env https_proxy=${https_proxy} \
+	--user "$(id -u)" \
 	$SOF_DOCKER_RUN \
-	   sof "$@"
+	sof "$@"
diff --git a/scripts/docker_build/sof_builder/Dockerfile b/scripts/docker_build/sof_builder/Dockerfile
index 7b9c43637fa4..fbf283c83c2e 100644
--- a/scripts/docker_build/sof_builder/Dockerfile
+++ b/scripts/docker_build/sof_builder/Dockerfile
@@ -14,18 +14,24 @@
 # docker run -it  -v <insert sof dir here>:/home/sof/work/sof.git --user `id -u` sof ./incremental.sh
 #
 
-FROM ubuntu:18.04
+FROM ubuntu:20.04
 ARG UID=1000
 
-# Set up proxy from host
+# Set up proxy from host, this will be deleted at the end
 COPY apt.conf /etc/apt/
 ARG host_http_proxy
 ARG host_https_proxy
 ENV http_proxy $host_http_proxy
 ENV https_proxy $host_https_proxy
 
+# for non-interactive package install
+ARG DEBIAN_FRONTEND=noninteractive
+
 RUN apt-get -y update && \
 	    apt-get install -y \
+		dialog \
+		apt-utils \
+	    	vim \
 	    	autoconf \
 		bison \
 		build-essential \
@@ -115,3 +121,6 @@ RUN mkdir -p /home/sof/work/sof.git
 
 USER sof
 WORKDIR /home/sof/work/sof.git/
+
+# delete apt proxy setting
+RUN rm /etc/apt/apt.conf
diff --git a/scripts/docker_build/sof_qemu/Dockerfile b/scripts/docker_build/sof_qemu/Dockerfile
index 112597feb358..c60b96cb2593 100644
--- a/scripts/docker_build/sof_qemu/Dockerfile
+++ b/scripts/docker_build/sof_qemu/Dockerfile
@@ -12,7 +12,7 @@
 # ./scripts/docker-qemu.sh scrpits-or-command-you-want-run
 #
 
-FROM ubuntu:18.04
+FROM ubuntu:20.04
 ARG UID=1000
 
 # Set up proxy from host
@@ -22,8 +22,13 @@ ARG host_https_proxy
 ENV http_proxy $host_http_proxy
 ENV https_proxy $host_https_proxy
 
+# for non-interactive package install
+ARG DEBIAN_FRONTEND=noninteractive
+
 RUN apt-get -y update && \
 	    apt-get install -y \
+		dialog \
+		apt-utils \
 		autoconf \
 		build-essential \
 		git \