diff --git a/Dockerfile b/Dockerfile
index 168de8b0b9..e5a4dbc4b3 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,8 +1,5 @@
 FROM node:8
 
-# Upgrade NPM to v5 (Yarn is needed because of this bug https://github.com/npm/npm/issues/16807)
-# The used solution is suggested here https://github.com/npm/npm/issues/16807#issuecomment-313591975
-RUN yarn global add npm@5
 # Install global packages
 RUN npm install -g gulp-cli mocha
 
diff --git a/Dockerfile-Production b/Dockerfile-Production
index a65c000ba2..47c5b40cd4 100644
--- a/Dockerfile-Production
+++ b/Dockerfile-Production
@@ -11,9 +11,6 @@ ENV GOOGLE_CLIENT_ID 1035232791481-32vtplgnjnd1aufv3mcu1lthf31795fq.apps.googleu
 ENV NODE_ENV production
 ENV STRIPE_PUB_KEY pk_85fQ0yMECHNfHTSsZoxZXlPSwSNfA
 
-# Upgrade NPM to v5 (Yarn is needed because of this bug https://github.com/npm/npm/issues/16807)
-# The used solution is suggested here https://github.com/npm/npm/issues/16807#issuecomment-313591975
-RUN yarn global add npm@5
 # Install global packages
 RUN npm install -g gulp-cli mocha