diff --git a/streamserver/Dockerfile b/streamserver/Dockerfile
index bb47826..092ee49 100644
--- a/streamserver/Dockerfile
+++ b/streamserver/Dockerfile
@@ -1,4 +1,6 @@
-ARG NGINX_VERSION=1.19.2
+ARG NGINX_VERSION=1.20.1
+
+FROM icedream/nginx as icedream-nginx
 
 FROM nginx:${NGINX_VERSION}-alpine AS ffmpeg-build
 
@@ -46,12 +48,11 @@ FROM nginx:${NGINX_VERSION}-alpine
 RUN \
 	export DEBIAN_FRONTEND=noninteractive &&\
 	if command -v apk >/dev/null 2>/dev/null; then apk add --no-cache gnupg; else  apt-get update && apt-get install -y gnupg wget ca-certificates && apt-get clean; fi
-COPY nginx/rootfs/ /
-RUN chmod +x /usr/local/bin/*
+COPY --from=icedream-nginx /usr/local/bin/docker-* /usr/local/bin/
 
 COPY --from=module-source /usr/src/ /usr/src/nginx-modules/
-COPY --from=0 /usr/src/packages/ /packages/
-COPY --from=0 /etc/apk/keys/ /etc/apk/keys/
+COPY --from=ffmpeg-build /usr/src/packages/ /packages/
+COPY --from=ffmpeg-build /etc/apk/keys/ /etc/apk/keys/
 RUN echo "http://dl-cdn.alpinelinux.org/alpine/edge/testing" >> /etc/apk/repositories
 RUN sed -i '1s#^#/packages/community\n#' /etc/apk/repositories
 RUN cat /etc/apk/repositories