diff --git a/playbooks/legacy/puppet-beaker-rspec-centos-7/run.yaml b/playbooks/legacy/puppet-beaker-rspec-centos-7/run.yaml
index d76d4844..09edaad6 100644
--- a/playbooks/legacy/puppet-beaker-rspec-centos-7/run.yaml
+++ b/playbooks/legacy/puppet-beaker-rspec-centos-7/run.yaml
@@ -122,12 +122,7 @@
           export BEAKER_set=nodepool-centos7
           export BEAKER_debug=yes
           export BEAKER_color=no
-          # deploy puppet4 on experimental beaker jobs
-          # https://tickets.puppetlabs.com/browse/BKR-821
-          if [ "centos-7" == "ubuntu-xenial" ]; then
-              export PUPPET_INSTALL_TYPE=agent
-              export PUPPET_MAJ_VERSION=4
-          fi
           $GEM_HOME/bin/bundle exec rspec spec/acceptance
+        executable: /bin/bash
         chdir: '{{ ansible_user_dir }}/workspace'
       environment: '{{ zuul | zuul_legacy_vars }}'
diff --git a/playbooks/legacy/puppet-beaker-rspec-ubuntu-trusty/run.yaml b/playbooks/legacy/puppet-beaker-rspec-ubuntu-trusty/run.yaml
index 951f0831..7b006818 100644
--- a/playbooks/legacy/puppet-beaker-rspec-ubuntu-trusty/run.yaml
+++ b/playbooks/legacy/puppet-beaker-rspec-ubuntu-trusty/run.yaml
@@ -122,12 +122,7 @@
           export BEAKER_set=nodepool-trusty
           export BEAKER_debug=yes
           export BEAKER_color=no
-          # deploy puppet4 on experimental beaker jobs
-          # https://tickets.puppetlabs.com/browse/BKR-821
-          if [ "ubuntu-trusty" == "ubuntu-xenial" ]; then
-              export PUPPET_INSTALL_TYPE=agent
-              export PUPPET_MAJ_VERSION=4
-          fi
           $GEM_HOME/bin/bundle exec rspec spec/acceptance
+        executable: /bin/bash
         chdir: '{{ ansible_user_dir }}/workspace'
       environment: '{{ zuul | zuul_legacy_vars }}'
diff --git a/playbooks/legacy/puppet-beaker-rspec/run.yaml b/playbooks/legacy/puppet-beaker-rspec/run.yaml
index f47f53e0..051f9ed4 100644
--- a/playbooks/legacy/puppet-beaker-rspec/run.yaml
+++ b/playbooks/legacy/puppet-beaker-rspec/run.yaml
@@ -122,12 +122,7 @@
           export BEAKER_set=nodepool-xenial
           export BEAKER_debug=yes
           export BEAKER_color=no
-          # deploy puppet4 on experimental beaker jobs
-          # https://tickets.puppetlabs.com/browse/BKR-821
-          if [ "ubuntu-xenial" == "ubuntu-xenial" ]; then
-              export PUPPET_INSTALL_TYPE=agent
-              export PUPPET_MAJ_VERSION=4
-          fi
           $GEM_HOME/bin/bundle exec rspec spec/acceptance
         chdir: '{{ ansible_user_dir }}/workspace'
+        executable: /bin/bash
       environment: '{{ zuul | zuul_legacy_vars }}'
diff --git a/playbooks/legacy/puppet-murano-puppet-beaker-rspec/run.yaml b/playbooks/legacy/puppet-murano-puppet-beaker-rspec/run.yaml
index f7f199be..4a0ea688 100644
--- a/playbooks/legacy/puppet-murano-puppet-beaker-rspec/run.yaml
+++ b/playbooks/legacy/puppet-murano-puppet-beaker-rspec/run.yaml
@@ -122,12 +122,7 @@
           export BEAKER_set=nodepool-xenial
           export BEAKER_debug=yes
           export BEAKER_color=no
-          # deploy puppet4 on experimental beaker jobs
-          # https://tickets.puppetlabs.com/browse/BKR-821
-          if [ "ubuntu-xenial" == "ubuntu-xenial" ]; then
-              export PUPPET_INSTALL_TYPE=agent
-              export PUPPET_MAJ_VERSION=4
-          fi
           $GEM_HOME/bin/bundle exec rspec spec/acceptance
+        executable: /bin/bash
         chdir: '{{ ansible_user_dir }}/workspace'
       environment: '{{ zuul | zuul_legacy_vars }}'
diff --git a/playbooks/legacy/puppet-openstackci-puppet-beaker-rspec-centos-7/run.yaml b/playbooks/legacy/puppet-openstackci-puppet-beaker-rspec-centos-7/run.yaml
index 5796d266..2c366587 100644
--- a/playbooks/legacy/puppet-openstackci-puppet-beaker-rspec-centos-7/run.yaml
+++ b/playbooks/legacy/puppet-openstackci-puppet-beaker-rspec-centos-7/run.yaml
@@ -123,12 +123,7 @@
           export BEAKER_set=nodepool-centos7
           export BEAKER_debug=yes
           export BEAKER_color=no
-          # deploy puppet4 on experimental beaker jobs
-          # https://tickets.puppetlabs.com/browse/BKR-821
-          if [ "centos-7" == "ubuntu-xenial" ]; then
-              export PUPPET_INSTALL_TYPE=agent
-              export PUPPET_MAJ_VERSION=4
-          fi
           $GEM_HOME/bin/bundle exec rspec spec/acceptance
+        executable: /bin/bash
         chdir: '{{ ansible_user_dir }}/workspace'
       environment: '{{ zuul | zuul_legacy_vars }}'
diff --git a/playbooks/legacy/puppet-openstackci-puppet-beaker-rspec-ubuntu-trusty/run.yaml b/playbooks/legacy/puppet-openstackci-puppet-beaker-rspec-ubuntu-trusty/run.yaml
index c3701d5d..f1caee63 100644
--- a/playbooks/legacy/puppet-openstackci-puppet-beaker-rspec-ubuntu-trusty/run.yaml
+++ b/playbooks/legacy/puppet-openstackci-puppet-beaker-rspec-ubuntu-trusty/run.yaml
@@ -123,12 +123,7 @@
           export BEAKER_set=nodepool-trusty
           export BEAKER_debug=yes
           export BEAKER_color=no
-          # deploy puppet4 on experimental beaker jobs
-          # https://tickets.puppetlabs.com/browse/BKR-821
-          if [ "ubuntu-trusty" == "ubuntu-xenial" ]; then
-              export PUPPET_INSTALL_TYPE=agent
-              export PUPPET_MAJ_VERSION=4
-          fi
           $GEM_HOME/bin/bundle exec rspec spec/acceptance
+        executable: /bin/bash
         chdir: '{{ ansible_user_dir }}/workspace'
       environment: '{{ zuul | zuul_legacy_vars }}'
diff --git a/playbooks/legacy/puppet-openstackci-puppet-beaker-rspec/run.yaml b/playbooks/legacy/puppet-openstackci-puppet-beaker-rspec/run.yaml
index 6d714c2a..4bb0a4cc 100644
--- a/playbooks/legacy/puppet-openstackci-puppet-beaker-rspec/run.yaml
+++ b/playbooks/legacy/puppet-openstackci-puppet-beaker-rspec/run.yaml
@@ -123,12 +123,7 @@
           export BEAKER_set=nodepool-xenial
           export BEAKER_debug=yes
           export BEAKER_color=no
-          # deploy puppet4 on experimental beaker jobs
-          # https://tickets.puppetlabs.com/browse/BKR-821
-          if [ "ubuntu-xenial" == "ubuntu-xenial" ]; then
-              export PUPPET_INSTALL_TYPE=agent
-              export PUPPET_MAJ_VERSION=4
-          fi
           $GEM_HOME/bin/bundle exec rspec spec/acceptance
+        executable: /bin/bash
         chdir: '{{ ansible_user_dir }}/workspace'
       environment: '{{ zuul | zuul_legacy_vars }}'