diff --git a/zuul.d/playbooks/pre.yml b/zuul.d/playbooks/pre.yml
index a367d6c17..27105f343 100644
--- a/zuul.d/playbooks/pre.yml
+++ b/zuul.d/playbooks/pre.yml
@@ -15,17 +15,6 @@
       include_role:
         name: ensure-pip
 
-    # https://github.com/containers/podman/issues/8965
-    # podman rootless systemd is broken in 2.0.5, so we use 1.6.4
-    - name: Pin container-tools
-      become: true
-      shell: |
-        dnf module disable container-tools:rhel8 -y
-        dnf module enable container-tools:2.0 -y
-      when:
-        - (ansible_os_family | lower) == "redhat"
-        - (ansible_distribution_major_version | int) >= 8
-
     - name: Setup bindep
       pip:
         name: "bindep"
diff --git a/zuul.d/playbooks/run.yml b/zuul.d/playbooks/run.yml
index 7c12b360a..05796bcdf 100644
--- a/zuul.d/playbooks/run.yml
+++ b/zuul.d/playbooks/run.yml
@@ -20,11 +20,13 @@
       when: tripleo_role_name is not defined
 
   tasks:
+    # Remove 'systemd-run --scope --user' when podman has version >2.0.5
+    # see issue: https://github.com/containers/podman/issues/8965
     - name: Run role test job
       shell: |-
         . {{ ansible_user_dir }}/test-python/bin/activate
         . {{ tripleo_ansible_project_path }}/ansible-test-env.rc
-        pytest --color=no \
+        systemd-run --scope --user pytest --color=no \
                --html={{ ansible_user_dir }}/zuul-output/logs/reports.html \
                --self-contained-html \
                --ansible-args='{{ tripleo_job_ansible_args | default('') }}' \