diff --git a/2.4/alpine3.10/Dockerfile b/2.4/alpine3.10/Dockerfile
index cd0d8e41f..753b053fa 100644
--- a/2.4/alpine3.10/Dockerfile
+++ b/2.4/alpine3.10/Dockerfile
@@ -124,7 +124,7 @@ RUN set -eux; \
 # install things globally, for great justice
 # and don't create ".bundle" in all our apps
 ENV GEM_HOME /usr/local/bundle
-ENV BUNDLE_PATH="$GEM_HOME" \
+ENV BUNDLE_PATH__SYSTEM=true \
 	BUNDLE_SILENCE_ROOT_WARNING=1 \
 	BUNDLE_APP_CONFIG="$GEM_HOME"
 # path recommendation: https://github.com/bundler/bundler/pull/6469#issuecomment-383235438
diff --git a/2.4/alpine3.9/Dockerfile b/2.4/alpine3.9/Dockerfile
index 74b6dfed5..40c2fdbf8 100644
--- a/2.4/alpine3.9/Dockerfile
+++ b/2.4/alpine3.9/Dockerfile
@@ -124,7 +124,7 @@ RUN set -eux; \
 # install things globally, for great justice
 # and don't create ".bundle" in all our apps
 ENV GEM_HOME /usr/local/bundle
-ENV BUNDLE_PATH="$GEM_HOME" \
+ENV BUNDLE_PATH__SYSTEM=true \
 	BUNDLE_SILENCE_ROOT_WARNING=1 \
 	BUNDLE_APP_CONFIG="$GEM_HOME"
 # path recommendation: https://github.com/bundler/bundler/pull/6469#issuecomment-383235438
diff --git a/2.4/jessie/Dockerfile b/2.4/jessie/Dockerfile
index 2d3da5b9f..9343b3cb5 100644
--- a/2.4/jessie/Dockerfile
+++ b/2.4/jessie/Dockerfile
@@ -83,7 +83,7 @@ RUN set -eux; \
 # install things globally, for great justice
 # and don't create ".bundle" in all our apps
 ENV GEM_HOME /usr/local/bundle
-ENV BUNDLE_PATH="$GEM_HOME" \
+ENV BUNDLE_PATH__SYSTEM=true \
 	BUNDLE_SILENCE_ROOT_WARNING=1 \
 	BUNDLE_APP_CONFIG="$GEM_HOME"
 # path recommendation: https://github.com/bundler/bundler/pull/6469#issuecomment-383235438
diff --git a/2.4/jessie/slim/Dockerfile b/2.4/jessie/slim/Dockerfile
index c8ade3a35..1f36ddc3a 100644
--- a/2.4/jessie/slim/Dockerfile
+++ b/2.4/jessie/slim/Dockerfile
@@ -108,7 +108,7 @@ RUN set -eux; \
 # install things globally, for great justice
 # and don't create ".bundle" in all our apps
 ENV GEM_HOME /usr/local/bundle
-ENV BUNDLE_PATH="$GEM_HOME" \
+ENV BUNDLE_PATH__SYSTEM=true \
 	BUNDLE_SILENCE_ROOT_WARNING=1 \
 	BUNDLE_APP_CONFIG="$GEM_HOME"
 # path recommendation: https://github.com/bundler/bundler/pull/6469#issuecomment-383235438
diff --git a/2.4/stretch/Dockerfile b/2.4/stretch/Dockerfile
index e2a875af5..d0ee63f35 100644
--- a/2.4/stretch/Dockerfile
+++ b/2.4/stretch/Dockerfile
@@ -83,7 +83,7 @@ RUN set -eux; \
 # install things globally, for great justice
 # and don't create ".bundle" in all our apps
 ENV GEM_HOME /usr/local/bundle
-ENV BUNDLE_PATH="$GEM_HOME" \
+ENV BUNDLE_PATH__SYSTEM=true \
 	BUNDLE_SILENCE_ROOT_WARNING=1 \
 	BUNDLE_APP_CONFIG="$GEM_HOME"
 # path recommendation: https://github.com/bundler/bundler/pull/6469#issuecomment-383235438
diff --git a/2.4/stretch/slim/Dockerfile b/2.4/stretch/slim/Dockerfile
index 8c2881acb..3870f5587 100644
--- a/2.4/stretch/slim/Dockerfile
+++ b/2.4/stretch/slim/Dockerfile
@@ -108,7 +108,7 @@ RUN set -eux; \
 # install things globally, for great justice
 # and don't create ".bundle" in all our apps
 ENV GEM_HOME /usr/local/bundle
-ENV BUNDLE_PATH="$GEM_HOME" \
+ENV BUNDLE_PATH__SYSTEM=true \
 	BUNDLE_SILENCE_ROOT_WARNING=1 \
 	BUNDLE_APP_CONFIG="$GEM_HOME"
 # path recommendation: https://github.com/bundler/bundler/pull/6469#issuecomment-383235438
diff --git a/2.5/alpine3.10/Dockerfile b/2.5/alpine3.10/Dockerfile
index af24b2328..7c1958cd7 100644
--- a/2.5/alpine3.10/Dockerfile
+++ b/2.5/alpine3.10/Dockerfile
@@ -124,7 +124,7 @@ RUN set -eux; \
 # install things globally, for great justice
 # and don't create ".bundle" in all our apps
 ENV GEM_HOME /usr/local/bundle
-ENV BUNDLE_PATH="$GEM_HOME" \
+ENV BUNDLE_PATH__SYSTEM=true \
 	BUNDLE_SILENCE_ROOT_WARNING=1 \
 	BUNDLE_APP_CONFIG="$GEM_HOME"
 # path recommendation: https://github.com/bundler/bundler/pull/6469#issuecomment-383235438
diff --git a/2.5/alpine3.9/Dockerfile b/2.5/alpine3.9/Dockerfile
index 017f7349a..52d621602 100644
--- a/2.5/alpine3.9/Dockerfile
+++ b/2.5/alpine3.9/Dockerfile
@@ -124,7 +124,7 @@ RUN set -eux; \
 # install things globally, for great justice
 # and don't create ".bundle" in all our apps
 ENV GEM_HOME /usr/local/bundle
-ENV BUNDLE_PATH="$GEM_HOME" \
+ENV BUNDLE_PATH__SYSTEM=true \
 	BUNDLE_SILENCE_ROOT_WARNING=1 \
 	BUNDLE_APP_CONFIG="$GEM_HOME"
 # path recommendation: https://github.com/bundler/bundler/pull/6469#issuecomment-383235438
diff --git a/2.5/stretch/Dockerfile b/2.5/stretch/Dockerfile
index cc2b49c30..1a7091ed8 100644
--- a/2.5/stretch/Dockerfile
+++ b/2.5/stretch/Dockerfile
@@ -83,7 +83,7 @@ RUN set -eux; \
 # install things globally, for great justice
 # and don't create ".bundle" in all our apps
 ENV GEM_HOME /usr/local/bundle
-ENV BUNDLE_PATH="$GEM_HOME" \
+ENV BUNDLE_PATH__SYSTEM=true \
 	BUNDLE_SILENCE_ROOT_WARNING=1 \
 	BUNDLE_APP_CONFIG="$GEM_HOME"
 # path recommendation: https://github.com/bundler/bundler/pull/6469#issuecomment-383235438
diff --git a/2.5/stretch/slim/Dockerfile b/2.5/stretch/slim/Dockerfile
index d16ab2171..f965d1cb0 100644
--- a/2.5/stretch/slim/Dockerfile
+++ b/2.5/stretch/slim/Dockerfile
@@ -108,7 +108,7 @@ RUN set -eux; \
 # install things globally, for great justice
 # and don't create ".bundle" in all our apps
 ENV GEM_HOME /usr/local/bundle
-ENV BUNDLE_PATH="$GEM_HOME" \
+ENV BUNDLE_PATH__SYSTEM=true \
 	BUNDLE_SILENCE_ROOT_WARNING=1 \
 	BUNDLE_APP_CONFIG="$GEM_HOME"
 # path recommendation: https://github.com/bundler/bundler/pull/6469#issuecomment-383235438
diff --git a/2.6/alpine3.10/Dockerfile b/2.6/alpine3.10/Dockerfile
index 2d73ec872..516b96f99 100644
--- a/2.6/alpine3.10/Dockerfile
+++ b/2.6/alpine3.10/Dockerfile
@@ -120,7 +120,7 @@ RUN set -eux; \
 # install things globally, for great justice
 # and don't create ".bundle" in all our apps
 ENV GEM_HOME /usr/local/bundle
-ENV BUNDLE_PATH="$GEM_HOME" \
+ENV BUNDLE_PATH__SYSTEM=true \
 	BUNDLE_SILENCE_ROOT_WARNING=1 \
 	BUNDLE_APP_CONFIG="$GEM_HOME"
 # path recommendation: https://github.com/bundler/bundler/pull/6469#issuecomment-383235438
diff --git a/2.6/alpine3.9/Dockerfile b/2.6/alpine3.9/Dockerfile
index 6d506ef53..ad0a98ddb 100644
--- a/2.6/alpine3.9/Dockerfile
+++ b/2.6/alpine3.9/Dockerfile
@@ -120,7 +120,7 @@ RUN set -eux; \
 # install things globally, for great justice
 # and don't create ".bundle" in all our apps
 ENV GEM_HOME /usr/local/bundle
-ENV BUNDLE_PATH="$GEM_HOME" \
+ENV BUNDLE_PATH__SYSTEM=true \
 	BUNDLE_SILENCE_ROOT_WARNING=1 \
 	BUNDLE_APP_CONFIG="$GEM_HOME"
 # path recommendation: https://github.com/bundler/bundler/pull/6469#issuecomment-383235438
diff --git a/2.6/stretch/Dockerfile b/2.6/stretch/Dockerfile
index 1d58f9f4d..5bb3d678e 100644
--- a/2.6/stretch/Dockerfile
+++ b/2.6/stretch/Dockerfile
@@ -79,7 +79,7 @@ RUN set -eux; \
 # install things globally, for great justice
 # and don't create ".bundle" in all our apps
 ENV GEM_HOME /usr/local/bundle
-ENV BUNDLE_PATH="$GEM_HOME" \
+ENV BUNDLE_PATH__SYSTEM=true \
 	BUNDLE_SILENCE_ROOT_WARNING=1 \
 	BUNDLE_APP_CONFIG="$GEM_HOME"
 # path recommendation: https://github.com/bundler/bundler/pull/6469#issuecomment-383235438
diff --git a/2.6/stretch/slim/Dockerfile b/2.6/stretch/slim/Dockerfile
index dbd3ca76a..870b4c16b 100644
--- a/2.6/stretch/slim/Dockerfile
+++ b/2.6/stretch/slim/Dockerfile
@@ -104,7 +104,7 @@ RUN set -eux; \
 # install things globally, for great justice
 # and don't create ".bundle" in all our apps
 ENV GEM_HOME /usr/local/bundle
-ENV BUNDLE_PATH="$GEM_HOME" \
+ENV BUNDLE_PATH__SYSTEM=true \
 	BUNDLE_SILENCE_ROOT_WARNING=1 \
 	BUNDLE_APP_CONFIG="$GEM_HOME"
 # path recommendation: https://github.com/bundler/bundler/pull/6469#issuecomment-383235438
diff --git a/2.7-rc/alpine3.10/Dockerfile b/2.7-rc/alpine3.10/Dockerfile
index 88a95e147..1759627e6 100644
--- a/2.7-rc/alpine3.10/Dockerfile
+++ b/2.7-rc/alpine3.10/Dockerfile
@@ -120,7 +120,7 @@ RUN set -eux; \
 # install things globally, for great justice
 # and don't create ".bundle" in all our apps
 ENV GEM_HOME /usr/local/bundle
-ENV BUNDLE_PATH="$GEM_HOME" \
+ENV BUNDLE_PATH__SYSTEM=true \
 	BUNDLE_SILENCE_ROOT_WARNING=1 \
 	BUNDLE_APP_CONFIG="$GEM_HOME"
 # path recommendation: https://github.com/bundler/bundler/pull/6469#issuecomment-383235438
diff --git a/2.7-rc/buster/Dockerfile b/2.7-rc/buster/Dockerfile
index d9d01c846..758d272cd 100644
--- a/2.7-rc/buster/Dockerfile
+++ b/2.7-rc/buster/Dockerfile
@@ -79,7 +79,7 @@ RUN set -eux; \
 # install things globally, for great justice
 # and don't create ".bundle" in all our apps
 ENV GEM_HOME /usr/local/bundle
-ENV BUNDLE_PATH="$GEM_HOME" \
+ENV BUNDLE_PATH__SYSTEM=true \
 	BUNDLE_SILENCE_ROOT_WARNING=1 \
 	BUNDLE_APP_CONFIG="$GEM_HOME"
 # path recommendation: https://github.com/bundler/bundler/pull/6469#issuecomment-383235438
diff --git a/2.7-rc/buster/slim/Dockerfile b/2.7-rc/buster/slim/Dockerfile
index faf5ca5e0..285ce88ae 100644
--- a/2.7-rc/buster/slim/Dockerfile
+++ b/2.7-rc/buster/slim/Dockerfile
@@ -105,7 +105,7 @@ RUN set -eux; \
 # install things globally, for great justice
 # and don't create ".bundle" in all our apps
 ENV GEM_HOME /usr/local/bundle
-ENV BUNDLE_PATH="$GEM_HOME" \
+ENV BUNDLE_PATH__SYSTEM=true \
 	BUNDLE_SILENCE_ROOT_WARNING=1 \
 	BUNDLE_APP_CONFIG="$GEM_HOME"
 # path recommendation: https://github.com/bundler/bundler/pull/6469#issuecomment-383235438
diff --git a/Dockerfile-alpine.template b/Dockerfile-alpine.template
index dd9f0d86d..8c01af63f 100644
--- a/Dockerfile-alpine.template
+++ b/Dockerfile-alpine.template
@@ -7,7 +7,7 @@ RUN apk add --no-cache \
 RUN set -eux; \
 	mkdir -p /usr/local/etc; \
 	{ \
-		echo 'install: --no-document'; \
+	echo 'install: --no-document'; \
 		echo 'update: --no-document'; \
 	} >> /usr/local/etc/gemrc
 
@@ -124,7 +124,7 @@ RUN set -eux; \
 # install things globally, for great justice
 # and don't create ".bundle" in all our apps
 ENV GEM_HOME /usr/local/bundle
-ENV BUNDLE_PATH="$GEM_HOME" \
+ENV BUNDLE_PATH__SYSTEM=true \
 	BUNDLE_SILENCE_ROOT_WARNING=1 \
 	BUNDLE_APP_CONFIG="$GEM_HOME"
 # path recommendation: https://github.com/bundler/bundler/pull/6469#issuecomment-383235438
diff --git a/Dockerfile-debian.template b/Dockerfile-debian.template
index 8f2c9fcac..4f1d55e7f 100644
--- a/Dockerfile-debian.template
+++ b/Dockerfile-debian.template
@@ -83,7 +83,7 @@ RUN set -eux; \
 # install things globally, for great justice
 # and don't create ".bundle" in all our apps
 ENV GEM_HOME /usr/local/bundle
-ENV BUNDLE_PATH="$GEM_HOME" \
+ENV BUNDLE_PATH__SYSTEM=true \
 	BUNDLE_SILENCE_ROOT_WARNING=1 \
 	BUNDLE_APP_CONFIG="$GEM_HOME"
 # path recommendation: https://github.com/bundler/bundler/pull/6469#issuecomment-383235438
diff --git a/Dockerfile-slim.template b/Dockerfile-slim.template
index 1bb46314b..78bdd4296 100644
--- a/Dockerfile-slim.template
+++ b/Dockerfile-slim.template
@@ -109,7 +109,7 @@ RUN set -eux; \
 # install things globally, for great justice
 # and don't create ".bundle" in all our apps
 ENV GEM_HOME /usr/local/bundle
-ENV BUNDLE_PATH="$GEM_HOME" \
+ENV BUNDLE_PATH__SYSTEM=true \
 	BUNDLE_SILENCE_ROOT_WARNING=1 \
 	BUNDLE_APP_CONFIG="$GEM_HOME"
 # path recommendation: https://github.com/bundler/bundler/pull/6469#issuecomment-383235438