diff --git a/support/docker/production/Dockerfile.stretch b/support/docker/production/Dockerfile.stretch
index 5025341f1..0cc764508 100644
--- a/support/docker/production/Dockerfile.stretch
+++ b/support/docker/production/Dockerfile.stretch
@@ -1,14 +1,14 @@
 FROM node:8-stretch
 
-# Allow to pass extra options to the npm run build
+# Allow to pass extra options to the yarn run build
 # eg: --light --light-fr to not build all client languages
 #     (speed up build time if i18n is not required)
 ARG NPM_RUN_BUILD_OPTS
 
 RUN set -ex; \
     if ! command -v gpg > /dev/null; then \
-      apt-get update; \
-      apt-get install -y --no-install-recommends \
+      apt update; \
+      apt install -y --no-install-recommends \
         gnupg \
         dirmngr \
       ; \
@@ -16,8 +16,8 @@ RUN set -ex; \
 fi
 
 # Install dependencies
-RUN apt-get update \
-    && apt-get -y install ffmpeg \
+RUN apt update \
+    && apt -y install ffmpeg \
     && rm /var/lib/apt/lists/* -fR
 
 # Add peertube user
@@ -26,8 +26,8 @@ RUN groupadd -r peertube \
 
 # grab gosu for easy step-down from root
 RUN set -eux; \
-	apt-get update; \
-	apt-get install -y gosu; \
+	apt update; \
+	apt install -y gosu; \
 	rm -rf /var/lib/apt/lists/*; \
 	gosu nobody true
 
@@ -59,5 +59,5 @@ COPY ./support/docker/production/docker-entrypoint.sh /usr/local/bin/docker-entr
 ENTRYPOINT ["/usr/local/bin/docker-entrypoint.sh"]
 
 # Run the application
-CMD ["npm", "start"]
+CMD ["yarn", "start"]
 EXPOSE 9000