diff --git a/roles/shiftstack/README.md b/roles/shiftstack/README.md
index 8d76b8ef5..f18e4f994 100644
--- a/roles/shiftstack/README.md
+++ b/roles/shiftstack/README.md
@@ -19,8 +19,8 @@ Role for triggering Openshift on Openstack QA automation (installation and tests
 * `cifmw_shiftstack_manifests_dir`: (*string*) Directory name for the role generated Openshift manifests. Defaults to `"{{ cifmw_shiftstack_basedir }}/manifests"`.
 * `cifmw_shiftstack_project_name`: (*string*) The Openstack project name. Defaults to `shiftstack`.
 * `cifmw_shiftstack_proxy`: (*string*) The proxy url that should be used to reach the underlying OCP. Defaults to omit.
-* `cifmw_shiftstack_qa_gerrithub_change`: (*string*) The gerrithub change to fetch from the `cifmw_shiftstack_qa_repo` repository (i.e. 'refs/changes/29/1188429/50)'. Defaults to ''.
-* `cifmw_shiftstack_qa_repo`: (*string*) The repository containing the Openshift on Openstack QA automation. Defaults to `https://review.gerrithub.io/shiftstack/shiftstack-qa`.
+* `cifmw_shiftstack_qa_change_ref`: (*string*) A git ref to fetch and checkout from the `cifmw_shiftstack_qa_repo` repository. Supports GitHub PR refs (e.g. `refs/pull/5/head`) and GerritHub change refs (e.g. `refs/changes/29/1188429/50`). Defaults to `''`.
+* `cifmw_shiftstack_qa_repo`: (*string*) The repository containing the Openshift on Openstack QA automation. Defaults to `https://github.com/shiftstack/shiftstack-qa`.
 * `cifmw_shiftstack_run_playbook`: (*string*) The playbook to be run from the `cifmw_shiftstack_qa_repo` repository. Defaults to `ocp_testing.yaml`.
 * `cifmw_shiftstack_sc`: (*string*) The storage class to be used for PVC for the shiftstackclient pod. Defaults to `local-storage`.
 * `cifmw_shiftstack_shiftstackclient_artifacts_dir`: (*string*) The artifacts directory path for the shiftstackclient pod. Defaults to `/home/cloud-admin/artifacts`.
@@ -40,7 +40,7 @@ cifmw_run_test_role: shiftstack
 cifmw_run_test_shiftstack_testconfig:
   - 4.17_ovnkubernetes_ipi.yaml
   - 4.17_ovnkubernetes_upi.yaml
-cifmw_shiftstack_qa_gerrithub_change: refs/changes/29/1188429/50 #optional
+cifmw_shiftstack_qa_change_ref: refs/pull/5/head #optional
 
-$ ansible-playbook deploy-edpm.yml --extra-vars "cifmw_run_tests=true cifmw_run_test_role=shiftstack cifmw_test_operator_stages=[] cifmw_openshift_kubeconfig={{ ansible_user_dir }}/.kube/config cifmw_run_test_shiftstack_testconfig=4.15_ovnkubernetes_ipi_va1.yaml cifmw_shiftstack_qa_gerrithub_change=refs/changes/29/1188429/50"
+$ ansible-playbook deploy-edpm.yml --extra-vars "cifmw_run_tests=true cifmw_run_test_role=shiftstack cifmw_test_operator_stages=[] cifmw_openshift_kubeconfig={{ ansible_user_dir }}/.kube/config cifmw_run_test_shiftstack_testconfig=4.15_ovnkubernetes_ipi_va1.yaml cifmw_shiftstack_qa_change_ref=refs/pull/5/head"
 ```
diff --git a/roles/shiftstack/defaults/main.yml b/roles/shiftstack/defaults/main.yml
index 963d13210..8f801503a 100644
--- a/roles/shiftstack/defaults/main.yml
+++ b/roles/shiftstack/defaults/main.yml
@@ -33,8 +33,8 @@ cifmw_shiftstack_hypervisor: "{{ hostvars[hostvars['controller-0']['cifmw_hyperv
 cifmw_shiftstack_installation_dir: "{{ cifmw_shiftstack_basedir }}/installation"
 cifmw_shiftstack_manifests_dir: "{{ cifmw_shiftstack_basedir }}/manifests"
 cifmw_shiftstack_project_name: "shiftstack"
-cifmw_shiftstack_qa_gerrithub_change: ""
-cifmw_shiftstack_qa_repo: "https://review.gerrithub.io/shiftstack/shiftstack-qa"
+cifmw_shiftstack_qa_change_ref: ""
+cifmw_shiftstack_qa_repo: "https://github.com/shiftstack/shiftstack-qa"
 cifmw_shiftstack_run_playbook: "ocp_testing.yaml"
 cifmw_shiftstack_sc: "local-storage"
 cifmw_shiftstack_shiftstackclient_artifacts_dir: "/home/cloud-admin/artifacts"
diff --git a/roles/shiftstack/tasks/exec_command_in_pod.yml b/roles/shiftstack/tasks/exec_command_in_pod.yml
index 5ef3f416c..a5c1dd06b 100644
--- a/roles/shiftstack/tasks/exec_command_in_pod.yml
+++ b/roles/shiftstack/tasks/exec_command_in_pod.yml
@@ -14,6 +14,58 @@
 # License for the specific language governing permissions and limitations
 # under the License.
 
+- name: Kill any previous background command
+  environment:
+    PATH: "{{ cifmw_path }}"
+    KUBECONFIG: "{{ cifmw_openshift_kubeconfig }}"
+  ansible.builtin.command:
+    cmd: >-
+      oc exec -n {{ namespace }} {{ pod_name }} --
+      bash -c 'if [ -f /tmp/cifmw_cmd_pid ]; then
+      kill $(cat /tmp/cifmw_cmd_pid) 2>/dev/null; fi'
+  changed_when: false
+  failed_when: false
+
+- name: Clear previous run markers
+  environment:
+    PATH: "{{ cifmw_path }}"
+    KUBECONFIG: "{{ cifmw_openshift_kubeconfig }}"
+  ansible.builtin.command:
+    cmd: >-
+      oc exec -n {{ namespace }} {{ pod_name }} --
+      bash -c 'rm -f /tmp/cifmw_cmd_rc /tmp/cifmw_cmd_pid
+      /tmp/cifmw_cmd_script.sh /tmp/cifmw_cmd_output.log'
+  changed_when: false
+  failed_when: false
+
+- name: Write the command to a local script file
+  ansible.builtin.copy:
+    content: |
+      #!/bin/bash
+      {{ command }}
+    dest: /tmp/cifmw_cmd_script.sh
+    mode: "0755"
+
+- name: Copy the script into the pod
+  environment:
+    PATH: "{{ cifmw_path }}"
+    KUBECONFIG: "{{ cifmw_openshift_kubeconfig }}"
+  ansible.builtin.shell:
+    cmd: >-
+      oc exec -i -n {{ namespace }} {{ pod_name }} --
+      tee /tmp/cifmw_cmd_script.sh > /dev/null
+      < /tmp/cifmw_cmd_script.sh
+  changed_when: true
+
+- name: Make the script executable in the pod
+  environment:
+    PATH: "{{ cifmw_path }}"
+    KUBECONFIG: "{{ cifmw_openshift_kubeconfig }}"
+  ansible.builtin.command:
+    cmd: >-
+      oc exec -n {{ namespace }} {{ pod_name }} --
+      chmod +x /tmp/cifmw_cmd_script.sh
+
 - name: Command execution block
   block:
     - name: Execute in the pod the command '{{ command }}'
@@ -21,13 +73,42 @@
         PATH: "{{ cifmw_path }}"
         KUBECONFIG: "{{ cifmw_openshift_kubeconfig }}"
       ansible.builtin.command:
-        cmd: "oc rsh -n {{ namespace }} {{ pod_name }} bash -c '{{ command }}'"
+        cmd: >-
+          oc exec -n {{ namespace }} {{ pod_name }} --
+          bash -c 'nohup bash -c "/tmp/cifmw_cmd_script.sh; echo \$? > /tmp/cifmw_cmd_rc"
+          > /tmp/cifmw_cmd_output.log 2>&1 &
+          echo $! > /tmp/cifmw_cmd_pid && cat /tmp/cifmw_cmd_pid'
       register: pod_command_result
 
+    - name: Wait for the command to complete in the pod
+      environment:
+        PATH: "{{ cifmw_path }}"
+        KUBECONFIG: "{{ cifmw_openshift_kubeconfig }}"
+      ansible.builtin.command:
+        cmd: >-
+          oc exec -n {{ namespace }} {{ pod_name }} --
+          bash -c 'cat /tmp/cifmw_cmd_rc'
+      register: pod_exit_code
+      changed_when: false
+      until: pod_exit_code.rc == 0
+      retries: "{{ cifmw_shiftstack_exec_retries | default(2160) }}"
+      delay: "{{ cifmw_shiftstack_exec_delay | default(5) }}"
+
+    - name: Fail if the command failed inside the pod
+      ansible.builtin.fail:
+        msg: >-
+          "{{ command }}" failed inside the pod with
+          exit code {{ pod_exit_code.stdout | trim }}.
+      when: (pod_exit_code.stdout | trim) != '0'
+
   rescue:
     - name: Fail when the command module fails
       ansible.builtin.fail:
-        msg: '"{{ command }}" command execution failed with exit code "{{ pod_command_result.rc }}" and error: "{{ pod_command_result.stderr }}".'
+        msg: >-
+          "{{ command }}" failed.
+          oc exit code: {{ pod_command_result.rc | default('N/A') }},
+          pod exit code: {{ pod_exit_code.stdout | default('N/A') | trim }},
+          stderr: {{ pod_command_result.stderr | default('') }}{{ pod_exit_code.stderr | default('') }}.
 
   always:
     - name: Command execution log saving block
@@ -45,6 +126,7 @@
               pod_name: "{{ pod_name }}"
               command: "{{ command }}"
               pod_command_result: "{{ pod_command_result }}"
+              pod_exit_code: "{{ pod_exit_code | default('N/A') }}"
           ansible.builtin.copy:
             content: "{{ command_info | to_nice_yaml }}"
             dest: "{{ cifmw_shiftstack_ansible_command_logs_dir }}/{{ current_date.stdout }}.{{ log_file_name }}"
diff --git a/roles/shiftstack/tasks/test_shiftstack.yml b/roles/shiftstack/tasks/test_shiftstack.yml
index 25f0e36e3..67a42ad5d 100644
--- a/roles/shiftstack/tasks/test_shiftstack.yml
+++ b/roles/shiftstack/tasks/test_shiftstack.yml
@@ -23,18 +23,18 @@
     log_file_name: "clone_shiftstack_qa_repo.log"
   ansible.builtin.include_tasks: exec_command_in_pod.yml
 
-- name: Fetch the gerrithub change '{{ cifmw_shiftstack_qa_gerrithub_change }}'
+- name: Fetch the change ref '{{ cifmw_shiftstack_qa_change_ref }}'
   vars:
     namespace: "{{ cifmw_shiftstack_client_pod_namespace }}"
     pod_name: "{{ cifmw_shiftstack_client_pod_name }}"
     command: >-
       cd shiftstack-qa &&
-      git fetch {{ cifmw_shiftstack_qa_repo }} {{ cifmw_shiftstack_qa_gerrithub_change }} &&
+      git fetch {{ cifmw_shiftstack_qa_repo }} {{ cifmw_shiftstack_qa_change_ref }} &&
       git checkout FETCH_HEAD
-    log_file_name: "fetch_shiftstack_qa_gerrithub_change.log"
+    log_file_name: "fetch_shiftstack_qa_change_ref.log"
   when:
-    - cifmw_shiftstack_qa_gerrithub_change is defined
-    - cifmw_shiftstack_qa_gerrithub_change != ''
+    - cifmw_shiftstack_qa_change_ref is defined
+    - cifmw_shiftstack_qa_change_ref != ''
   ansible.builtin.include_tasks: exec_command_in_pod.yml
 
 - name: Install the ansible collections