diff --git a/gating.yaml b/gating.yaml
index d4f33f2..b9116d9 100644
--- a/gating.yaml
+++ b/gating.yaml
@@ -1,4 +1,4 @@
-# recipients: sssd-team, ftrivino
+# recipients: sssd-qe, ftrivino
 --- !Policy
 product_versions:
   - rhel-9
diff --git a/sssd.spec b/sssd.spec
index d3713e7..b807584 100644
--- a/sssd.spec
+++ b/sssd.spec
@@ -27,7 +27,7 @@
 
 Name: sssd
 Version: 2.4.2
-Release: 5%{?dist}
+Release: 6%{?dist}
 Summary: System Security Services Daemon
 License: GPLv3+
 URL: https://github.com/SSSD/sssd/
@@ -1015,9 +1015,6 @@ fi
 %systemd_postun_with_restart sssd.service
 
 %changelog
-* Tue Jun 01 2021 Steeve Goveas <sgoveas@redhat.com> - 2.4.2-5
-- Rebuilt for RHEL 9 BETA to add gating tests (rhbz#1954686)
-
 * Fri Apr 16 2021 Mohan Boddu <mboddu@redhat.com> - 2.4.2-4
 - Rebuilt for RHEL 9 BETA on Apr 15th 2021. Related: rhbz#1947937
 
diff --git a/tests/sssd-tasks.yml b/tests/sssd-tasks.yml
index f37e203..b741561 100644
--- a/tests/sssd-tasks.yml
+++ b/tests/sssd-tasks.yml
@@ -1,19 +1,22 @@
 ---
 - name: Set ansible_python_interpreter to /usr/libexec/platform-python
   set_fact:
-     ansible_python_interpreter: '/usr/libexec/platform-python'
- 
+     ansible_python_interpreter: auto
+
 - name: Define remote_artificats
   set_fact:
     remote_artifacts: /tmp/artifacts
   when: remote_artifacts is not defined
- 
+
 - name: Install testing requirements
   package: name={{ item }} state=present
   with_items:
     - rsync
   when: ansible_pkg_mgr != 'unknown'
- 
+
+- name: Install sshpass from epel
+  shell: yum --enablerepo epel install sshpass -y
+
 - name: Install required packages
   dnf:
     name: >
@@ -21,23 +24,23 @@
       openldap-clients, dbus-tools, python3-virtualenv, make,
       python3-pip, krb5-devel, sssd, sssd-kcm, libsss_sudo,
       ldb-tools, sssd-tools, nss-tools, sssd-dbus, python3-devel
- 
+
 - name: Install 389-ds-base krb5 server and workstation
   dnf:
     name: >
       389-ds-base, krb5-server, krb5-workstation
- 
+
 - name: clone upstream sssd git to run tests
   git:
     repo: "{{ upstream_sssd_git }}"
     dest: "{{ upstream_src_dir }}"
     version: "{{ upstream_git_branch }}"
- 
+
 - name: Update /etc/hosts file with current hostname
   lineinfile:
     path: /etc/hosts
     line: "{{ ansible_default_ipv4.address }} {{ ansible_hostname }}"
- 
+
 - name: Create Multihost configuration files
   blockinfile:
     dest: /tmp/mhc.yaml
@@ -53,56 +56,49 @@
                role: master
     create: yes
     marker: ""
- 
+
 - name: Install pytest-multihost and other test dependencies
   pip:
-    name: "{{ item }}"
+    name: >
+      setuptools, pytz, paramiko, pep8, pylint,
+      pytest-multihost, python-ldap, pytest, pyyaml
     virtualenv: "{{ venv_dir }}"
     virtualenv_command: /usr/bin/virtualenv
-  with_items:
-    - setuptools
-    - pytz
-    - paramiko
-    - pep8
-    - pylint
-    - pytest-multihost
-    - python-ldap
-    - pytest
-    - pyyaml
- 
+
 - name: Find directory python searches for path
   shell: python3 -m site --user-site
   register: pypath
- 
+
 - name: Create Python path dir
   file:
     path: "{{ pypath.stdout }}"
     state: directory
- 
+
 - name: Create file with sssd testlib path
   copy:
     dest: "{{ pypath.stdout }}/sssdlib.pth"
     content: "{{ upstream_src_dir }}/src/tests/multihost"
- 
+
 - name: create artifacts directory
   file:
     path: "{{ remote_artifacts }}"
     state: directory
     mode: 0755
- 
+
 - name: Test block
   block:
     - name: Execute pytest
       shell: |
+         PYTESTMULTIHOST_SSH_TRANSPORT=openssh \
          "{{ venv_dir }}/bin/pytest" -v \
          --junit-xml="{{ remote_artifacts }}/junit.xml" \
          --multihost-config=/tmp/mhc.yaml \
          "{{ test_dir }}" 1> "{{ remote_artifacts }}/test.log"
- 
+
   always:
     - name: copy sssd logs to "{{ remote_artifacts }}"
       command: cp -a /var/log/sssd {{ remote_artifacts }}
- 
+
     - name: Pull out logs
       synchronize:
         dest: "{{ artifacts }}"