diff --git a/2.0/Dockerfile b/2.0/Dockerfile
index 91a80ab516..36b22a2808 100644
--- a/2.0/Dockerfile
+++ b/2.0/Dockerfile
@@ -40,18 +40,17 @@ RUN set -ex \
 
 ENV BUNDLER_VERSION 1.11.2
 
-RUN gem install bundler --version "$BUNDLER_VERSION" \
-	&& bundle config --global path "$GEM_HOME" \
-	&& bundle config --global bin "$GEM_HOME/bin" \
-	&& bundle config --global silence_root_warning true
+RUN gem install bundler --version "$BUNDLER_VERSION"
 
 # install things globally, for great justice
+# and don't create ".bundle" in all our apps
 ENV GEM_HOME /usr/local/bundle
-ENV PATH $GEM_HOME/bin:$PATH
-RUN mkdir -p "$GEM_HOME" \
-	&& chmod 777 "$GEM_HOME"
-
-# don't create ".bundle" in all our apps
-ENV BUNDLE_APP_CONFIG $GEM_HOME
+ENV BUNDLE_PATH="$GEM_HOME" \
+	BUNDLE_BIN="$GEM_HOME/bin" \
+	BUNDLE_SILENCE_ROOT_WARNING=1 \
+	BUNDLE_APP_CONFIG="$GEM_HOME"
+ENV PATH $BUNDLE_BIN:$PATH
+RUN mkdir -p "$GEM_HOME" "$BUNDLE_BIN" \
+	&& chmod 777 "$GEM_HOME" "$BUNDLE_BIN"
 
 CMD [ "irb" ]
diff --git a/2.0/slim/Dockerfile b/2.0/slim/Dockerfile
index 3a43c02b5b..b41798995d 100644
--- a/2.0/slim/Dockerfile
+++ b/2.0/slim/Dockerfile
@@ -62,18 +62,17 @@ RUN set -ex \
 
 ENV BUNDLER_VERSION 1.11.2
 
-RUN gem install bundler --version "$BUNDLER_VERSION" \
-	&& bundle config --global path "$GEM_HOME" \
-	&& bundle config --global bin "$GEM_HOME/bin" \
-	&& bundle config --global silence_root_warning true
+RUN gem install bundler --version "$BUNDLER_VERSION"
 
 # install things globally, for great justice
+# and don't create ".bundle" in all our apps
 ENV GEM_HOME /usr/local/bundle
-ENV PATH $GEM_HOME/bin:$PATH
-RUN mkdir -p "$GEM_HOME" \
-	&& chmod 777 "$GEM_HOME"
-
-# don't create ".bundle" in all our apps
-ENV BUNDLE_APP_CONFIG $GEM_HOME
+ENV BUNDLE_PATH="$GEM_HOME" \
+	BUNDLE_BIN="$GEM_HOME/bin" \
+	BUNDLE_SILENCE_ROOT_WARNING=1 \
+	BUNDLE_APP_CONFIG="$GEM_HOME"
+ENV PATH $BUNDLE_BIN:$PATH
+RUN mkdir -p "$GEM_HOME" "$BUNDLE_BIN" \
+	&& chmod 777 "$GEM_HOME" "$BUNDLE_BIN"
 
 CMD [ "irb" ]
diff --git a/2.1/Dockerfile b/2.1/Dockerfile
index 68b9c2f13a..29a2c03fa0 100644
--- a/2.1/Dockerfile
+++ b/2.1/Dockerfile
@@ -40,18 +40,17 @@ RUN set -ex \
 
 ENV BUNDLER_VERSION 1.11.2
 
-RUN gem install bundler --version "$BUNDLER_VERSION" \
-	&& bundle config --global path "$GEM_HOME" \
-	&& bundle config --global bin "$GEM_HOME/bin" \
-	&& bundle config --global silence_root_warning true
+RUN gem install bundler --version "$BUNDLER_VERSION"
 
 # install things globally, for great justice
+# and don't create ".bundle" in all our apps
 ENV GEM_HOME /usr/local/bundle
-ENV PATH $GEM_HOME/bin:$PATH
-RUN mkdir -p "$GEM_HOME" \
-	&& chmod 777 "$GEM_HOME"
-
-# don't create ".bundle" in all our apps
-ENV BUNDLE_APP_CONFIG $GEM_HOME
+ENV BUNDLE_PATH="$GEM_HOME" \
+	BUNDLE_BIN="$GEM_HOME/bin" \
+	BUNDLE_SILENCE_ROOT_WARNING=1 \
+	BUNDLE_APP_CONFIG="$GEM_HOME"
+ENV PATH $BUNDLE_BIN:$PATH
+RUN mkdir -p "$GEM_HOME" "$BUNDLE_BIN" \
+	&& chmod 777 "$GEM_HOME" "$BUNDLE_BIN"
 
 CMD [ "irb" ]
diff --git a/2.1/alpine/Dockerfile b/2.1/alpine/Dockerfile
index 33e288de8a..222b14903e 100644
--- a/2.1/alpine/Dockerfile
+++ b/2.1/alpine/Dockerfile
@@ -75,18 +75,17 @@ RUN set -ex \
 
 ENV BUNDLER_VERSION 1.11.2
 
-RUN gem install bundler --version "$BUNDLER_VERSION" \
-	&& bundle config --global path "$GEM_HOME" \
-	&& bundle config --global bin "$GEM_HOME/bin" \
-	&& bundle config --global silence_root_warning true
+RUN gem install bundler --version "$BUNDLER_VERSION"
 
 # install things globally, for great justice
+# and don't create ".bundle" in all our apps
 ENV GEM_HOME /usr/local/bundle
-ENV PATH $GEM_HOME/bin:$PATH
-RUN mkdir -p "$GEM_HOME" \
-	&& chmod 777 "$GEM_HOME"
-
-# don't create ".bundle" in all our apps
-ENV BUNDLE_APP_CONFIG $GEM_HOME
+ENV BUNDLE_PATH="$GEM_HOME" \
+	BUNDLE_BIN="$GEM_HOME/bin" \
+	BUNDLE_SILENCE_ROOT_WARNING=1 \
+	BUNDLE_APP_CONFIG="$GEM_HOME"
+ENV PATH $BUNDLE_BIN:$PATH
+RUN mkdir -p "$GEM_HOME" "$BUNDLE_BIN" \
+	&& chmod 777 "$GEM_HOME" "$BUNDLE_BIN"
 
 CMD [ "irb" ]
diff --git a/2.1/slim/Dockerfile b/2.1/slim/Dockerfile
index 72992e12b9..8bc6b7a2ab 100644
--- a/2.1/slim/Dockerfile
+++ b/2.1/slim/Dockerfile
@@ -62,18 +62,17 @@ RUN set -ex \
 
 ENV BUNDLER_VERSION 1.11.2
 
-RUN gem install bundler --version "$BUNDLER_VERSION" \
-	&& bundle config --global path "$GEM_HOME" \
-	&& bundle config --global bin "$GEM_HOME/bin" \
-	&& bundle config --global silence_root_warning true
+RUN gem install bundler --version "$BUNDLER_VERSION"
 
 # install things globally, for great justice
+# and don't create ".bundle" in all our apps
 ENV GEM_HOME /usr/local/bundle
-ENV PATH $GEM_HOME/bin:$PATH
-RUN mkdir -p "$GEM_HOME" \
-	&& chmod 777 "$GEM_HOME"
-
-# don't create ".bundle" in all our apps
-ENV BUNDLE_APP_CONFIG $GEM_HOME
+ENV BUNDLE_PATH="$GEM_HOME" \
+	BUNDLE_BIN="$GEM_HOME/bin" \
+	BUNDLE_SILENCE_ROOT_WARNING=1 \
+	BUNDLE_APP_CONFIG="$GEM_HOME"
+ENV PATH $BUNDLE_BIN:$PATH
+RUN mkdir -p "$GEM_HOME" "$BUNDLE_BIN" \
+	&& chmod 777 "$GEM_HOME" "$BUNDLE_BIN"
 
 CMD [ "irb" ]
diff --git a/2.2/Dockerfile b/2.2/Dockerfile
index 541c8cff5e..72cc51aa32 100644
--- a/2.2/Dockerfile
+++ b/2.2/Dockerfile
@@ -40,18 +40,17 @@ RUN set -ex \
 
 ENV BUNDLER_VERSION 1.11.2
 
-RUN gem install bundler --version "$BUNDLER_VERSION" \
-	&& bundle config --global path "$GEM_HOME" \
-	&& bundle config --global bin "$GEM_HOME/bin" \
-	&& bundle config --global silence_root_warning true
+RUN gem install bundler --version "$BUNDLER_VERSION"
 
 # install things globally, for great justice
+# and don't create ".bundle" in all our apps
 ENV GEM_HOME /usr/local/bundle
-ENV PATH $GEM_HOME/bin:$PATH
-RUN mkdir -p "$GEM_HOME" \
-	&& chmod 777 "$GEM_HOME"
-
-# don't create ".bundle" in all our apps
-ENV BUNDLE_APP_CONFIG $GEM_HOME
+ENV BUNDLE_PATH="$GEM_HOME" \
+	BUNDLE_BIN="$GEM_HOME/bin" \
+	BUNDLE_SILENCE_ROOT_WARNING=1 \
+	BUNDLE_APP_CONFIG="$GEM_HOME"
+ENV PATH $BUNDLE_BIN:$PATH
+RUN mkdir -p "$GEM_HOME" "$BUNDLE_BIN" \
+	&& chmod 777 "$GEM_HOME" "$BUNDLE_BIN"
 
 CMD [ "irb" ]
diff --git a/2.2/alpine/Dockerfile b/2.2/alpine/Dockerfile
index 3dcb0ab541..548c257cb6 100644
--- a/2.2/alpine/Dockerfile
+++ b/2.2/alpine/Dockerfile
@@ -75,18 +75,17 @@ RUN set -ex \
 
 ENV BUNDLER_VERSION 1.11.2
 
-RUN gem install bundler --version "$BUNDLER_VERSION" \
-	&& bundle config --global path "$GEM_HOME" \
-	&& bundle config --global bin "$GEM_HOME/bin" \
-	&& bundle config --global silence_root_warning true
+RUN gem install bundler --version "$BUNDLER_VERSION"
 
 # install things globally, for great justice
+# and don't create ".bundle" in all our apps
 ENV GEM_HOME /usr/local/bundle
-ENV PATH $GEM_HOME/bin:$PATH
-RUN mkdir -p "$GEM_HOME" \
-	&& chmod 777 "$GEM_HOME"
-
-# don't create ".bundle" in all our apps
-ENV BUNDLE_APP_CONFIG $GEM_HOME
+ENV BUNDLE_PATH="$GEM_HOME" \
+	BUNDLE_BIN="$GEM_HOME/bin" \
+	BUNDLE_SILENCE_ROOT_WARNING=1 \
+	BUNDLE_APP_CONFIG="$GEM_HOME"
+ENV PATH $BUNDLE_BIN:$PATH
+RUN mkdir -p "$GEM_HOME" "$BUNDLE_BIN" \
+	&& chmod 777 "$GEM_HOME" "$BUNDLE_BIN"
 
 CMD [ "irb" ]
diff --git a/2.2/slim/Dockerfile b/2.2/slim/Dockerfile
index a798ca183e..9df0a03f0a 100644
--- a/2.2/slim/Dockerfile
+++ b/2.2/slim/Dockerfile
@@ -62,18 +62,17 @@ RUN set -ex \
 
 ENV BUNDLER_VERSION 1.11.2
 
-RUN gem install bundler --version "$BUNDLER_VERSION" \
-	&& bundle config --global path "$GEM_HOME" \
-	&& bundle config --global bin "$GEM_HOME/bin" \
-	&& bundle config --global silence_root_warning true
+RUN gem install bundler --version "$BUNDLER_VERSION"
 
 # install things globally, for great justice
+# and don't create ".bundle" in all our apps
 ENV GEM_HOME /usr/local/bundle
-ENV PATH $GEM_HOME/bin:$PATH
-RUN mkdir -p "$GEM_HOME" \
-	&& chmod 777 "$GEM_HOME"
-
-# don't create ".bundle" in all our apps
-ENV BUNDLE_APP_CONFIG $GEM_HOME
+ENV BUNDLE_PATH="$GEM_HOME" \
+	BUNDLE_BIN="$GEM_HOME/bin" \
+	BUNDLE_SILENCE_ROOT_WARNING=1 \
+	BUNDLE_APP_CONFIG="$GEM_HOME"
+ENV PATH $BUNDLE_BIN:$PATH
+RUN mkdir -p "$GEM_HOME" "$BUNDLE_BIN" \
+	&& chmod 777 "$GEM_HOME" "$BUNDLE_BIN"
 
 CMD [ "irb" ]
diff --git a/2.3/Dockerfile b/2.3/Dockerfile
index a0565f00f4..ba3c2ca9c1 100644
--- a/2.3/Dockerfile
+++ b/2.3/Dockerfile
@@ -40,18 +40,17 @@ RUN set -ex \
 
 ENV BUNDLER_VERSION 1.11.2
 
-RUN gem install bundler --version "$BUNDLER_VERSION" \
-	&& bundle config --global path "$GEM_HOME" \
-	&& bundle config --global bin "$GEM_HOME/bin" \
-	&& bundle config --global silence_root_warning true
+RUN gem install bundler --version "$BUNDLER_VERSION"
 
 # install things globally, for great justice
+# and don't create ".bundle" in all our apps
 ENV GEM_HOME /usr/local/bundle
-ENV PATH $GEM_HOME/bin:$PATH
-RUN mkdir -p "$GEM_HOME" \
-	&& chmod 777 "$GEM_HOME"
-
-# don't create ".bundle" in all our apps
-ENV BUNDLE_APP_CONFIG $GEM_HOME
+ENV BUNDLE_PATH="$GEM_HOME" \
+	BUNDLE_BIN="$GEM_HOME/bin" \
+	BUNDLE_SILENCE_ROOT_WARNING=1 \
+	BUNDLE_APP_CONFIG="$GEM_HOME"
+ENV PATH $BUNDLE_BIN:$PATH
+RUN mkdir -p "$GEM_HOME" "$BUNDLE_BIN" \
+	&& chmod 777 "$GEM_HOME" "$BUNDLE_BIN"
 
 CMD [ "irb" ]
diff --git a/2.3/alpine/Dockerfile b/2.3/alpine/Dockerfile
index 68c3dc179e..b141e34f49 100644
--- a/2.3/alpine/Dockerfile
+++ b/2.3/alpine/Dockerfile
@@ -75,18 +75,17 @@ RUN set -ex \
 
 ENV BUNDLER_VERSION 1.11.2
 
-RUN gem install bundler --version "$BUNDLER_VERSION" \
-	&& bundle config --global path "$GEM_HOME" \
-	&& bundle config --global bin "$GEM_HOME/bin" \
-	&& bundle config --global silence_root_warning true
+RUN gem install bundler --version "$BUNDLER_VERSION"
 
 # install things globally, for great justice
+# and don't create ".bundle" in all our apps
 ENV GEM_HOME /usr/local/bundle
-ENV PATH $GEM_HOME/bin:$PATH
-RUN mkdir -p "$GEM_HOME" \
-	&& chmod 777 "$GEM_HOME"
-
-# don't create ".bundle" in all our apps
-ENV BUNDLE_APP_CONFIG $GEM_HOME
+ENV BUNDLE_PATH="$GEM_HOME" \
+	BUNDLE_BIN="$GEM_HOME/bin" \
+	BUNDLE_SILENCE_ROOT_WARNING=1 \
+	BUNDLE_APP_CONFIG="$GEM_HOME"
+ENV PATH $BUNDLE_BIN:$PATH
+RUN mkdir -p "$GEM_HOME" "$BUNDLE_BIN" \
+	&& chmod 777 "$GEM_HOME" "$BUNDLE_BIN"
 
 CMD [ "irb" ]
diff --git a/2.3/slim/Dockerfile b/2.3/slim/Dockerfile
index 4dd5dbf848..1bf7121739 100644
--- a/2.3/slim/Dockerfile
+++ b/2.3/slim/Dockerfile
@@ -62,18 +62,17 @@ RUN set -ex \
 
 ENV BUNDLER_VERSION 1.11.2
 
-RUN gem install bundler --version "$BUNDLER_VERSION" \
-	&& bundle config --global path "$GEM_HOME" \
-	&& bundle config --global bin "$GEM_HOME/bin" \
-	&& bundle config --global silence_root_warning true
+RUN gem install bundler --version "$BUNDLER_VERSION"
 
 # install things globally, for great justice
+# and don't create ".bundle" in all our apps
 ENV GEM_HOME /usr/local/bundle
-ENV PATH $GEM_HOME/bin:$PATH
-RUN mkdir -p "$GEM_HOME" \
-	&& chmod 777 "$GEM_HOME"
-
-# don't create ".bundle" in all our apps
-ENV BUNDLE_APP_CONFIG $GEM_HOME
+ENV BUNDLE_PATH="$GEM_HOME" \
+	BUNDLE_BIN="$GEM_HOME/bin" \
+	BUNDLE_SILENCE_ROOT_WARNING=1 \
+	BUNDLE_APP_CONFIG="$GEM_HOME"
+ENV PATH $BUNDLE_BIN:$PATH
+RUN mkdir -p "$GEM_HOME" "$BUNDLE_BIN" \
+	&& chmod 777 "$GEM_HOME" "$BUNDLE_BIN"
 
 CMD [ "irb" ]
diff --git a/Dockerfile-alpine.template b/Dockerfile-alpine.template
index 2374f072cb..72e77b7dd2 100644
--- a/Dockerfile-alpine.template
+++ b/Dockerfile-alpine.template
@@ -75,18 +75,17 @@ RUN set -ex \
 
 ENV BUNDLER_VERSION %%BUNDLER%%
 
-RUN gem install bundler --version "$BUNDLER_VERSION" \
-	&& bundle config --global path "$GEM_HOME" \
-	&& bundle config --global bin "$GEM_HOME/bin" \
-	&& bundle config --global silence_root_warning true
+RUN gem install bundler --version "$BUNDLER_VERSION"
 
 # install things globally, for great justice
+# and don't create ".bundle" in all our apps
 ENV GEM_HOME /usr/local/bundle
-ENV PATH $GEM_HOME/bin:$PATH
-RUN mkdir -p "$GEM_HOME" \
-	&& chmod 777 "$GEM_HOME"
-
-# don't create ".bundle" in all our apps
-ENV BUNDLE_APP_CONFIG $GEM_HOME
+ENV BUNDLE_PATH="$GEM_HOME" \
+	BUNDLE_BIN="$GEM_HOME/bin" \
+	BUNDLE_SILENCE_ROOT_WARNING=1 \
+	BUNDLE_APP_CONFIG="$GEM_HOME"
+ENV PATH $BUNDLE_BIN:$PATH
+RUN mkdir -p "$GEM_HOME" "$BUNDLE_BIN" \
+	&& chmod 777 "$GEM_HOME" "$BUNDLE_BIN"
 
 CMD [ "irb" ]
diff --git a/Dockerfile-slim.template b/Dockerfile-slim.template
index 9ec27b123e..dd440ce0a4 100644
--- a/Dockerfile-slim.template
+++ b/Dockerfile-slim.template
@@ -62,18 +62,17 @@ RUN set -ex \
 
 ENV BUNDLER_VERSION %%BUNDLER%%
 
-RUN gem install bundler --version "$BUNDLER_VERSION" \
-	&& bundle config --global path "$GEM_HOME" \
-	&& bundle config --global bin "$GEM_HOME/bin" \
-	&& bundle config --global silence_root_warning true
+RUN gem install bundler --version "$BUNDLER_VERSION"
 
 # install things globally, for great justice
+# and don't create ".bundle" in all our apps
 ENV GEM_HOME /usr/local/bundle
-ENV PATH $GEM_HOME/bin:$PATH
-RUN mkdir -p "$GEM_HOME" \
-	&& chmod 777 "$GEM_HOME"
-
-# don't create ".bundle" in all our apps
-ENV BUNDLE_APP_CONFIG $GEM_HOME
+ENV BUNDLE_PATH="$GEM_HOME" \
+	BUNDLE_BIN="$GEM_HOME/bin" \
+	BUNDLE_SILENCE_ROOT_WARNING=1 \
+	BUNDLE_APP_CONFIG="$GEM_HOME"
+ENV PATH $BUNDLE_BIN:$PATH
+RUN mkdir -p "$GEM_HOME" "$BUNDLE_BIN" \
+	&& chmod 777 "$GEM_HOME" "$BUNDLE_BIN"
 
 CMD [ "irb" ]
diff --git a/Dockerfile.template b/Dockerfile.template
index d81627ac1d..baf423d171 100644
--- a/Dockerfile.template
+++ b/Dockerfile.template
@@ -40,18 +40,17 @@ RUN set -ex \
 
 ENV BUNDLER_VERSION %%BUNDLER%%
 
-RUN gem install bundler --version "$BUNDLER_VERSION" \
-	&& bundle config --global path "$GEM_HOME" \
-	&& bundle config --global bin "$GEM_HOME/bin" \
-	&& bundle config --global silence_root_warning true
+RUN gem install bundler --version "$BUNDLER_VERSION"
 
 # install things globally, for great justice
+# and don't create ".bundle" in all our apps
 ENV GEM_HOME /usr/local/bundle
-ENV PATH $GEM_HOME/bin:$PATH
-RUN mkdir -p "$GEM_HOME" \
-	&& chmod 777 "$GEM_HOME"
-
-# don't create ".bundle" in all our apps
-ENV BUNDLE_APP_CONFIG $GEM_HOME
+ENV BUNDLE_PATH="$GEM_HOME" \
+	BUNDLE_BIN="$GEM_HOME/bin" \
+	BUNDLE_SILENCE_ROOT_WARNING=1 \
+	BUNDLE_APP_CONFIG="$GEM_HOME"
+ENV PATH $BUNDLE_BIN:$PATH
+RUN mkdir -p "$GEM_HOME" "$BUNDLE_BIN" \
+	&& chmod 777 "$GEM_HOME" "$BUNDLE_BIN"
 
 CMD [ "irb" ]