diff --git a/Dockerfiles/work/Dockerfile-5.2 b/Dockerfiles/work/Dockerfile-5.2
index aaa0f6c..6f6f0c0 100644
--- a/Dockerfiles/work/Dockerfile-5.2
+++ b/Dockerfiles/work/Dockerfile-5.2
@@ -146,7 +146,9 @@ RUN set -x \
 && cd / && rm -rf /tmp/gitflow \
  \
 # grunt
-	&& npm install -g grunt grunt-cli \
+	&& npm install -g grunt \
+&& npm install -g grunt-cli \
+ \
 # linkcheck
 	&& curl https://raw.githubusercontent.com/cytopia/linkcheck/master/linkcheck > /usr/local/bin/linkcheck \
 && chmod +x /usr/local/bin/linkcheck \
@@ -201,7 +203,9 @@ RUN set -x \
 # sass
 	&& gem install sass \
 # webpack
-	&& npm install -g webpack webpack-cli \
+	&& npm install -g webpack \
+&& npm install -g webpack-cli \
+ \
 # yamllint
 	&& DEBIAN_FRONTEND=noninteractive apt-get update -qq \
 && DEBIAN_FRONTEND=noninteractive apt-get install -qq -y --no-install-recommends --no-install-suggests libpython-dev python-setuptools libyaml-dev \
diff --git a/Dockerfiles/work/Dockerfile-5.3 b/Dockerfiles/work/Dockerfile-5.3
index 00ea363..10b22d1 100644
--- a/Dockerfiles/work/Dockerfile-5.3
+++ b/Dockerfiles/work/Dockerfile-5.3
@@ -165,7 +165,9 @@ RUN set -x \
 && cd / && rm -rf /tmp/gitflow \
  \
 # grunt
-	&& npm install -g grunt grunt-cli \
+	&& npm install -g grunt \
+&& npm install -g grunt-cli \
+ \
 # linkcheck
 	&& curl https://raw.githubusercontent.com/cytopia/linkcheck/master/linkcheck > /usr/local/bin/linkcheck \
 && chmod +x /usr/local/bin/linkcheck \
@@ -235,7 +237,9 @@ RUN set -x \
 # sass
 	&& gem install sass \
 # webpack
-	&& npm install -g webpack webpack-cli \
+	&& npm install -g webpack \
+&& npm install -g webpack-cli \
+ \
 # wpcli
 	&& curl https://github.com/wp-cli/wp-cli/releases/download/v1.5.1/wp-cli-1.5.1.phar -L -o /usr/local/bin/wp \
 	&& chmod +x /usr/local/bin/wp \
diff --git a/Dockerfiles/work/Dockerfile-5.4 b/Dockerfiles/work/Dockerfile-5.4
index db32279..e3cc854 100644
--- a/Dockerfiles/work/Dockerfile-5.4
+++ b/Dockerfiles/work/Dockerfile-5.4
@@ -181,7 +181,9 @@ RUN set -x \
 && cd / && rm -rf /tmp/gitflow \
  \
 # grunt
-	&& npm install -g grunt grunt-cli \
+	&& npm install -g grunt \
+&& npm install -g grunt-cli \
+ \
 # laravel
 	&& git clone https://github.com/laravel/installer /usr/local/src/laravel-installer \
 && cd /usr/local/src/laravel-installer \
@@ -264,7 +266,9 @@ RUN set -x \
 	&& curl https://symfony.com/installer -L -o /usr/local/bin/symfony \
 	&& chmod +x /usr/local/bin/symfony \
 # webpack
-	&& npm install -g webpack webpack-cli \
+	&& npm install -g webpack \
+&& npm install -g webpack-cli \
+ \
 # wpcli
 	&& curl https://raw.githubusercontent.com/wp-cli/builds/gh-pages/phar/wp-cli.phar -L -o /usr/local/bin/wp \
 	&& chmod +x /usr/local/bin/wp \
diff --git a/Dockerfiles/work/Dockerfile-5.5 b/Dockerfiles/work/Dockerfile-5.5
index 28126f1..a176be7 100644
--- a/Dockerfiles/work/Dockerfile-5.5
+++ b/Dockerfiles/work/Dockerfile-5.5
@@ -188,7 +188,9 @@ RUN set -x \
 && cd / && rm -rf /tmp/gitflow \
  \
 # grunt
-	&& npm install -g grunt grunt-cli \
+	&& npm install -g grunt \
+&& npm install -g grunt-cli \
+ \
 # laravel
 	&& git clone https://github.com/laravel/installer /usr/local/src/laravel-installer \
 && cd /usr/local/src/laravel-installer \
@@ -275,7 +277,9 @@ RUN set -x \
 	&& curl https://symfony.com/installer -L -o /usr/local/bin/symfony \
 	&& chmod +x /usr/local/bin/symfony \
 # webpack
-	&& npm install -g webpack webpack-cli \
+	&& npm install -g webpack \
+&& npm install -g webpack-cli \
+ \
 # wpcli
 	&& curl https://raw.githubusercontent.com/wp-cli/builds/gh-pages/phar/wp-cli.phar -L -o /usr/local/bin/wp \
 	&& chmod +x /usr/local/bin/wp \
diff --git a/Dockerfiles/work/Dockerfile-5.6 b/Dockerfiles/work/Dockerfile-5.6
index 3246f10..b209d4e 100644
--- a/Dockerfiles/work/Dockerfile-5.6
+++ b/Dockerfiles/work/Dockerfile-5.6
@@ -201,7 +201,9 @@ RUN set -x \
 && cd / && rm -rf /tmp/gitflow \
  \
 # grunt
-	&& npm install -g grunt grunt-cli \
+	&& npm install -g grunt \
+&& npm install -g grunt-cli \
+ \
 # laravel
 	&& git clone https://github.com/laravel/installer /usr/local/src/laravel-installer \
 && cd /usr/local/src/laravel-installer \
@@ -288,7 +290,9 @@ RUN set -x \
 	&& curl https://symfony.com/installer -L -o /usr/local/bin/symfony \
 	&& chmod +x /usr/local/bin/symfony \
 # webpack
-	&& npm install -g webpack webpack-cli \
+	&& npm install -g webpack \
+&& npm install -g webpack-cli \
+ \
 # wpcli
 	&& curl https://raw.githubusercontent.com/wp-cli/builds/gh-pages/phar/wp-cli.phar -L -o /usr/local/bin/wp \
 	&& chmod +x /usr/local/bin/wp \
diff --git a/Dockerfiles/work/Dockerfile-7.0 b/Dockerfiles/work/Dockerfile-7.0
index 2c3fe98..4cdffe2 100644
--- a/Dockerfiles/work/Dockerfile-7.0
+++ b/Dockerfiles/work/Dockerfile-7.0
@@ -201,7 +201,9 @@ RUN set -x \
 && cd / && rm -rf /tmp/gitflow \
  \
 # grunt
-	&& npm install -g grunt grunt-cli \
+	&& npm install -g grunt \
+&& npm install -g grunt-cli \
+ \
 # laravel
 	&& git clone https://github.com/laravel/installer /usr/local/src/laravel-installer \
 && cd /usr/local/src/laravel-installer \
@@ -288,7 +290,9 @@ RUN set -x \
 	&& curl https://symfony.com/installer -L -o /usr/local/bin/symfony \
 	&& chmod +x /usr/local/bin/symfony \
 # webpack
-	&& npm install -g webpack webpack-cli \
+	&& npm install -g webpack \
+&& npm install -g webpack-cli \
+ \
 # wpcli
 	&& curl https://raw.githubusercontent.com/wp-cli/builds/gh-pages/phar/wp-cli.phar -L -o /usr/local/bin/wp \
 	&& chmod +x /usr/local/bin/wp \
diff --git a/Dockerfiles/work/Dockerfile-7.1 b/Dockerfiles/work/Dockerfile-7.1
index 9645617..2f30629 100644
--- a/Dockerfiles/work/Dockerfile-7.1
+++ b/Dockerfiles/work/Dockerfile-7.1
@@ -201,7 +201,9 @@ RUN set -x \
 && cd / && rm -rf /tmp/gitflow \
  \
 # grunt
-	&& npm install -g grunt grunt-cli \
+	&& npm install -g grunt \
+&& npm install -g grunt-cli \
+ \
 # laravel
 	&& git clone https://github.com/laravel/installer /usr/local/src/laravel-installer \
 && cd /usr/local/src/laravel-installer \
@@ -288,7 +290,9 @@ RUN set -x \
 	&& curl https://symfony.com/installer -L -o /usr/local/bin/symfony \
 	&& chmod +x /usr/local/bin/symfony \
 # webpack
-	&& npm install -g webpack webpack-cli \
+	&& npm install -g webpack \
+&& npm install -g webpack-cli \
+ \
 # wpcli
 	&& curl https://raw.githubusercontent.com/wp-cli/builds/gh-pages/phar/wp-cli.phar -L -o /usr/local/bin/wp \
 	&& chmod +x /usr/local/bin/wp \
diff --git a/Dockerfiles/work/Dockerfile-7.2 b/Dockerfiles/work/Dockerfile-7.2
index 86e8226..e110f8b 100644
--- a/Dockerfiles/work/Dockerfile-7.2
+++ b/Dockerfiles/work/Dockerfile-7.2
@@ -201,7 +201,9 @@ RUN set -x \
 && cd / && rm -rf /tmp/gitflow \
  \
 # grunt
-	&& npm install -g grunt grunt-cli \
+	&& npm install -g grunt \
+&& npm install -g grunt-cli \
+ \
 # laravel
 	&& git clone https://github.com/laravel/installer /usr/local/src/laravel-installer \
 && cd /usr/local/src/laravel-installer \
@@ -288,7 +290,9 @@ RUN set -x \
 	&& curl https://symfony.com/installer -L -o /usr/local/bin/symfony \
 	&& chmod +x /usr/local/bin/symfony \
 # webpack
-	&& npm install -g webpack webpack-cli \
+	&& npm install -g webpack \
+&& npm install -g webpack-cli \
+ \
 # wpcli
 	&& curl https://raw.githubusercontent.com/wp-cli/builds/gh-pages/phar/wp-cli.phar -L -o /usr/local/bin/wp \
 	&& chmod +x /usr/local/bin/wp \
diff --git a/Dockerfiles/work/Dockerfile-7.3 b/Dockerfiles/work/Dockerfile-7.3
index 6d46532..b493b22 100644
--- a/Dockerfiles/work/Dockerfile-7.3
+++ b/Dockerfiles/work/Dockerfile-7.3
@@ -201,7 +201,9 @@ RUN set -x \
 && cd / && rm -rf /tmp/gitflow \
  \
 # grunt
-	&& npm install -g grunt grunt-cli \
+	&& npm install -g grunt \
+&& npm install -g grunt-cli \
+ \
 # laravel
 	&& git clone https://github.com/laravel/installer /usr/local/src/laravel-installer \
 && cd /usr/local/src/laravel-installer \
@@ -277,7 +279,9 @@ RUN set -x \
 	&& curl https://symfony.com/installer -L -o /usr/local/bin/symfony \
 	&& chmod +x /usr/local/bin/symfony \
 # webpack
-	&& npm install -g webpack webpack-cli \
+	&& npm install -g webpack \
+&& npm install -g webpack-cli \
+ \
 # wpcli
 	&& curl https://raw.githubusercontent.com/wp-cli/builds/gh-pages/phar/wp-cli.phar -L -o /usr/local/bin/wp \
 	&& chmod +x /usr/local/bin/wp \
diff --git a/build/ansible/group_vars/all.yml b/build/ansible/group_vars/all.yml
index 551a22c..9e6d5d8 100644
--- a/build/ansible/group_vars/all.yml
+++ b/build/ansible/group_vars/all.yml
@@ -414,7 +414,9 @@ software_available:
   grunt:
     check: grunt --version | grep -E '[.0-9]+'
     all:
-      command: npm install -g grunt grunt-cli
+      command: |
+        npm install -g grunt \
+        && npm install -g grunt-cli \
   laravel:
     check: laravel --version | grep -E '(Installer|version)\s*[.0-9]+'
     disabled: [5.2, 5.3]
@@ -606,7 +608,9 @@ software_available:
   webpack:
     check: webpack --version | grep -E '[.0-9]+'
     all:
-      command: npm install -g webpack webpack-cli
+      command: |
+        npm install -g webpack \
+        && npm install -g webpack-cli \
   yamllint:
     check: yamllint --version 2>&1 | grep -E '[.0-9]+'
     all: