diff --git a/Dockerfile b/Dockerfile
index c08185ef..83bf98eb 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -55,6 +55,6 @@ RUN echo "gem: --no-ri --no-rdoc --no-document" > /root/.gemrc
 
 COPY . /build_scripts
 
-RUN gem install bundler
+RUN gem install bundler -v '< 2.5'
 
 ENTRYPOINT ["/build_scripts/container-assets/user-entrypoint.sh"]
diff --git a/Gemfile b/Gemfile
index 5099f668..3b5f7852 100644
--- a/Gemfile
+++ b/Gemfile
@@ -2,6 +2,7 @@ source 'https://rubygems.org'
 
 gem 'awesome_spawn',  ">=1.3.0"
 gem 'aws-sdk-s3'
+gem 'bundler',        "< 2.5"
 gem 'config'
 gem 'droplet_kit',    "~>3.7",    :require => false
 gem 'manageiq-style'