diff --git a/Dockerfile b/Dockerfile
index 668f513..4e123a8 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -21,6 +21,9 @@ RUN bundle config build.nokogiri --use-system-libraries && \
 
 # Exclude 'development' and 'test' dependency groups when building the
 # base/production Service Broker image.
-RUN bundle install --no-deployment --frozen --system --without development test
+RUN bundle config set --local frozen 'true' && \
+    bundle config set --local system 'true' && \ 
+    bundle config set --local without 'development test' && \
+    bundle install --no-deployment
 
 COPY . /app/
diff --git a/Dockerfile.dev b/Dockerfile.dev
index 6a32546..d155102 100644
--- a/Dockerfile.dev
+++ b/Dockerfile.dev
@@ -16,10 +16,10 @@ COPY Gemfile \
      Gemfile.lock /tmp/
 WORKDIR /tmp
 
-# For bundle version < 2.0, bundle remembers the groups that had been
-# excluded for the previous invocation of bundle. So use `--with`
-# to explicitly include the development group.
-RUN bundle install --no-deployment --frozen --system --with development
+RUN bundle config set --local frozen 'true' && \
+    bundle config set --local system 'true' && \
+    bundle config set --local with 'development' && \
+    bundle install --no-deployment
 
 RUN mkdir -p /app
 WORKDIR /app
diff --git a/Dockerfile.test b/Dockerfile.test
index 210d0a8..4f43b54 100644
--- a/Dockerfile.test
+++ b/Dockerfile.test
@@ -27,10 +27,11 @@ COPY Gemfile \
      Gemfile.lock /tmp/
 WORKDIR /tmp
 
-# For bundle version < 2.0, bundle remembers the groups that had been
-# excluded for the previous invocation of bundle. So use `--with`
-# to explicitly include the test group.
-RUN bundle install --no-deployment --frozen --system --with test --without development
+RUN bundle config set --local frozen 'true' && \
+    bundle config set --local system 'true' && \
+    bundle config set --local with 'test' && \
+    bundle config set --local without 'development' && \
+    bundle install --no-deployment
 
 RUN mkdir -p /app
 WORKDIR /app