diff --git a/all-in-one.sh b/all-in-one.sh
index 3cd8669d1..bbd4fa512 100755
--- a/all-in-one.sh
+++ b/all-in-one.sh
@@ -63,7 +63,13 @@ fi
 print_header 'Install Bundler'
 mkdir -p .bundled_gems
 export GEM_HOME=`pwd`/.bundled_gems
-gem install bundler --version 1.17.3 --no-rdoc --no-ri --verbose
+ruby <<EOF
+cmd = 'gem install bundler --no-rdoc --no-ri --verbose'
+if Gem::Version.new(RUBY_VERSION) < Gem::Version.new('2.3.0') then
+    cmd += ' -v 1.17.3'
+end
+system(cmd)
+EOF
 
 set -e
 ./run_tests.sh
diff --git a/playbooks/prepare-node-integration.yaml b/playbooks/prepare-node-integration.yaml
index 9990b41b5..156f4ae4b 100644
--- a/playbooks/prepare-node-integration.yaml
+++ b/playbooks/prepare-node-integration.yaml
@@ -41,10 +41,14 @@
         state: directory
 
     - name: Install bundler
-      gem:
-        name: bundler
-        # Required against https://bugs.launchpad.net/puppet-openstack-integration/+bug/1810401
-        version: 1.17.3
-        user_install: false
+      shell:
+        cmd: |
+          ruby <<EOF
+          cmd = 'gem install bundler --no-rdoc --no-ri --verbose'
+          if Gem::Version.new(RUBY_VERSION) < Gem::Version.new('2.3.0') then
+              cmd += ' -v 1.17.3'
+          end
+          system(cmd)
+          EOF
       environment:
         GEM_HOME: "{{ ansible_user_dir }}/workspace/puppet-openstack-integration/.bundled_gems"
diff --git a/playbooks/run-beaker-tests.yaml b/playbooks/run-beaker-tests.yaml
index 940b31578..a85fd101e 100644
--- a/playbooks/run-beaker-tests.yaml
+++ b/playbooks/run-beaker-tests.yaml
@@ -46,7 +46,13 @@
           mkdir .bundled_gems
           export GEM_HOME=`pwd`/.bundled_gems
           if [ -f Gemfile ]; then
-            gem install bundler --version 1.17.3 --no-rdoc --no-ri --verbose
+            ruby <<EOF
+          cmd = 'gem install bundler --no-rdoc --no-ri --verbose'
+          if Gem::Version.new(RUBY_VERSION) < Gem::Version.new('2.3.0') then
+              cmd += ' -v 1.17.3'
+          end
+          system(cmd)
+          EOF
             $GEM_HOME/bin/bundle install --without system_tests --retry 3
             $GEM_HOME/bin/bundle exec rspec spec/acceptance
           else
diff --git a/playbooks/run-lint-tests.yaml b/playbooks/run-lint-tests.yaml
index 6dc794dbb..05799ac74 100644
--- a/playbooks/run-lint-tests.yaml
+++ b/playbooks/run-lint-tests.yaml
@@ -20,7 +20,13 @@
           mkdir .bundled_gems
           export GEM_HOME=`pwd`/.bundled_gems
           if [ -f Gemfile ]; then
-            gem install --version 1.17.3 bundler --no-rdoc --no-ri --verbose
+            ruby <<EOF
+          cmd = 'gem install bundler --no-rdoc --no-ri --verbose'
+          if Gem::Version.new(RUBY_VERSION) < Gem::Version.new('2.3.0') then
+              cmd += ' -v 1.17.3'
+          end
+          system(cmd)
+          EOF
             $GEM_HOME/bin/bundle install --without system_tests --retry 3
             $GEM_HOME/bin/bundle exec rake lint 2>&1
             if [ -f metadata.json ]; then
diff --git a/playbooks/run-syntax-tests.yaml b/playbooks/run-syntax-tests.yaml
index ce3be6232..d9c5a79b7 100644
--- a/playbooks/run-syntax-tests.yaml
+++ b/playbooks/run-syntax-tests.yaml
@@ -5,7 +5,13 @@
           export PUPPET_GEM_VERSION='~> {{ puppet }}'
           mkdir .bundled_gems
           export GEM_HOME=`pwd`/.bundled_gems
-          gem install bundler --version 1.17.3 --no-rdoc --no-ri --verbose
+          ruby <<EOF
+          cmd = 'gem install bundler --no-rdoc --no-ri --verbose'
+          if Gem::Version.new(RUBY_VERSION) < Gem::Version.new('2.3.0') then
+              cmd += ' -v 1.17.3'
+          end
+          system(cmd)
+          EOF
           $GEM_HOME/bin/bundle install --retry 3
           $GEM_HOME/bin/bundle exec rake syntax
         chdir: '{{ ansible_user_dir }}/workspace'
diff --git a/playbooks/run-unit-tests.yaml b/playbooks/run-unit-tests.yaml
index 88f7057f1..b0fa8c5de 100644
--- a/playbooks/run-unit-tests.yaml
+++ b/playbooks/run-unit-tests.yaml
@@ -1,6 +1,7 @@
 - hosts: all
   tasks:
-    - shell:
+    - name: install ruby bundler and run it
+      shell:
         cmd: |
           if [ "{{ puppet_gem_version }}" != "latest" ]; then
             if [ "{{ puppet_gem_version }}" == "5.5" ]; then
@@ -12,7 +13,13 @@
           fi
           mkdir .bundled_gems
           export GEM_HOME=`pwd`/.bundled_gems
-          gem install bundler --version 1.17.3 --no-rdoc --no-ri --verbose
+          ruby <<EOF
+          cmd = 'gem install bundler --no-rdoc --no-ri --verbose'
+          if Gem::Version.new(RUBY_VERSION) < Gem::Version.new('2.3.0') then
+              cmd += ' -v 1.17.3'
+          end
+          system(cmd)
+          EOF
           $GEM_HOME/bin/bundle install --retry 3
           $GEM_HOME/bin/bundle exec rake spec SPEC_OPTS='--format documentation'
         chdir: '{{ ansible_user_dir }}/workspace'