diff --git a/theforeman.org/scripts/test/test_develop.sh b/theforeman.org/scripts/test/test_develop.sh
index 2a24cee9..6462df1b 100644
--- a/theforeman.org/scripts/test/test_develop.sh
+++ b/theforeman.org/scripts/test/test_develop.sh
@@ -15,7 +15,13 @@ rvm use ruby-${ruby}@${gemset} --create
 rvm gemset empty --force
 set -x
 
-gem install bundler --no-document
+if ["${ruby}" = '2.7']
+then
+    gem install bundler -v 2.4.22 --no-document
+else
+    gem install bundler --no-document
+fi
+
 
 # Retry as rubygems (being external to us) can be intermittent
 bundle install --without=development --jobs=5 --retry=5
diff --git a/theforeman.org/scripts/test/test_hammer_cli_foreman_discovery.sh b/theforeman.org/scripts/test/test_hammer_cli_foreman_discovery.sh
index 1bc829c0..049b87d4 100644
--- a/theforeman.org/scripts/test/test_hammer_cli_foreman_discovery.sh
+++ b/theforeman.org/scripts/test/test_hammer_cli_foreman_discovery.sh
@@ -6,7 +6,13 @@
 gemset=$(echo ${JOB_NAME} | cut -d/ -f1)-${EXECUTOR_NUMBER}
 rvm use ruby-${ruby}@${gemset} --create
 rvm gemset empty --force
-gem install bundler --no-document
+
+if ["${ruby}" = '2.7']
+then
+    gem install bundler -v 2.4.22 --no-document
+else
+    gem install bundler --no-document
+fi
 
 # Link hammer_cli from github
 echo 'gem "hammer_cli", :github => "theforeman/hammer-cli"' > Gemfile.local
diff --git a/theforeman.org/scripts/test/test_hammer_cli_foreman_pull_request.sh b/theforeman.org/scripts/test/test_hammer_cli_foreman_pull_request.sh
index d35fb777..76823919 100644
--- a/theforeman.org/scripts/test/test_hammer_cli_foreman_pull_request.sh
+++ b/theforeman.org/scripts/test/test_hammer_cli_foreman_pull_request.sh
@@ -10,7 +10,12 @@ rvm use ruby-${ruby}@${gemset} --create
 rvm gemset empty --force
 set -x
 
-gem install bundler --no-document
+if ["${ruby}" = '2.7']
+then
+    gem install bundler -v 2.4.22 --no-document
+else
+    gem install bundler --no-document
+fi
 
 # Link hammer_cli from github
 if [ "$ghprbTargetBranch" = "master" ]; then
diff --git a/theforeman.org/scripts/test/test_hammer_cli_pull_request.sh b/theforeman.org/scripts/test/test_hammer_cli_pull_request.sh
index 834f2c95..2993d946 100644
--- a/theforeman.org/scripts/test/test_hammer_cli_pull_request.sh
+++ b/theforeman.org/scripts/test/test_hammer_cli_pull_request.sh
@@ -10,7 +10,12 @@ rvm use ruby-${ruby}@${gemset} --create
 rvm gemset empty --force
 set -x
 
-gem install bundler --no-document
+if ["${ruby}" = '2.7']
+then
+    gem install bundler -v 2.4.22 --no-document
+else
+    gem install bundler --no-document
+fi
 
 bundle install --without development --jobs=5 --retry=5
 bundle exec rake ci:setup:minitest test TESTOPTS="-v"
diff --git a/theforeman.org/scripts/test/test_katello.sh b/theforeman.org/scripts/test/test_katello.sh
index 0287f8bc..0da15183 100644
--- a/theforeman.org/scripts/test/test_katello.sh
+++ b/theforeman.org/scripts/test/test_katello.sh
@@ -40,7 +40,12 @@ rvm use ruby-${ruby}@${gemset} --create
 rvm gemset empty --force
 set -x
 
-gem install bundler --no-document
+if ["${ruby}" = '2.7']
+then
+    gem install bundler -v 2.4.22 --no-document
+else
+    gem install bundler --no-document
+fi
 
 # Now let's introduce the plugin
 echo "gemspec :path => '${PLUGIN_ROOT}', :development_group => :katello_dev" >> bundler.d/Gemfile.local.rb
diff --git a/theforeman.org/scripts/test/test_plugin.sh b/theforeman.org/scripts/test/test_plugin.sh
index f49102df..4d426866 100644
--- a/theforeman.org/scripts/test/test_plugin.sh
+++ b/theforeman.org/scripts/test/test_plugin.sh
@@ -22,7 +22,13 @@ rvm use ruby-${ruby}@${gemset} --create
 rvm gemset empty --force
 
 set -x
-gem install bundler --no-document
+
+if ["${ruby}" = '2.7']
+then
+    gem install bundler -v 2.4.22 --no-document
+else
+    gem install bundler --no-document
+fi
 
 # Retry as rubygems (being external to us) can be intermittent
 bundle install --without=development --jobs=5 --retry=5
diff --git a/theforeman.org/yaml/builders/foreman-plugins-pull-request.yaml b/theforeman.org/yaml/builders/foreman-plugins-pull-request.yaml
index 1649a5c5..f5f7187e 100644
--- a/theforeman.org/yaml/builders/foreman-plugins-pull-request.yaml
+++ b/theforeman.org/yaml/builders/foreman-plugins-pull-request.yaml
@@ -28,7 +28,13 @@
           gemset=$(echo ${{JOB_NAME}} | cut -d/ -f1)-${{EXECUTOR_NUMBER}}
           rvm use ruby-${{ruby}}@${{gemset}} --create
           rvm gemset empty --force
-          gem install bundler --no-document
+          
+          if ["${{ruby}}" = '2.7']
+          then
+              gem install bundler -v 2.4.22 --no-document
+          else
+              gem install bundler --no-document
+          fi
 
           bundle install --without development --jobs=5 --retry=5
 
diff --git a/theforeman.org/yaml/builders/smart-proxy-plugin.yaml b/theforeman.org/yaml/builders/smart-proxy-plugin.yaml
index d4a3240a..05bd4d71 100644
--- a/theforeman.org/yaml/builders/smart-proxy-plugin.yaml
+++ b/theforeman.org/yaml/builders/smart-proxy-plugin.yaml
@@ -13,7 +13,12 @@
           rvm gemset empty --force
           set -x
 
-          gem install bundler --no-document
+          if ["${{ruby}}" = '2.7']
+          then
+              gem install bundler -v 2.4.22 --no-document
+          else
+              gem install bundler --no-document
+          fi
 
           bundle install --retry 5 --jobs 5
           bundle exec rake TESTOPTS="--verbose"