diff --git a/Dockerfile b/Dockerfile
index 17268dc08d..8291ecd6f5 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,7 +1,8 @@
 FROM node:boron
 
-# Upgrade NPM to v5
-RUN npm install -g npm@5
+# 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 grunt-cli bower mocha
 
diff --git a/Dockerfile-Production b/Dockerfile-Production
index e95dd80094..59c29dead2 100644
--- a/Dockerfile-Production
+++ b/Dockerfile-Production
@@ -1,7 +1,8 @@
 FROM node:boron
 
-# Upgrade NPM to v5
-RUN npm install -g npm@5
+# 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 grunt-cli bower mocha