diff --git a/roles/test_operator/defaults/main.yml b/roles/test_operator/defaults/main.yml
index 86fe393856..da9c82dd16 100644
--- a/roles/test_operator/defaults/main.yml
+++ b/roles/test_operator/defaults/main.yml
@@ -101,7 +101,7 @@ cifmw_test_operator_tempest_config:
   apiVersion: test.openstack.org/v1beta1
   kind: Tempest
   metadata:
-    name: "{{ test_operator_job_name }}"
+    name: "{{ test_operator_instance_name }}"
     namespace: "{{ cifmw_test_operator_namespace }}"
   spec:
     containerImage: "{{ cifmw_test_operator_tempest_image }}:{{ cifmw_test_operator_tempest_image_tag }}"
@@ -200,7 +200,7 @@ cifmw_test_operator_ansibletest_config:
   apiVersion: test.openstack.org/v1beta1
   kind: AnsibleTest
   metadata:
-    name: "{{ test_operator_job_name }}"
+    name: "{{ test_operator_instance_name }}"
     namespace: "{{ cifmw_test_operator_namespace }}"
   spec:
     containerImage: "{{ cifmw_test_operator_ansibletest_image }}:{{ cifmw_test_operator_ansibletest_image_tag }}"
diff --git a/roles/test_operator/tasks/main.yml b/roles/test_operator/tasks/main.yml
index b745d7da2c..9204099aef 100644
--- a/roles/test_operator/tasks/main.yml
+++ b/roles/test_operator/tasks/main.yml
@@ -136,7 +136,7 @@
   vars:
     run_test_fw: tempest
     test_operator_config: "{{ cifmw_test_operator_tempest_config }}"
-    test_operator_job_name: "{{ cifmw_test_operator_tempest_name }}"
+    test_operator_instance_name: "{{ cifmw_test_operator_tempest_name }}"
     test_operator_kind_name: "{{ cifmw_test_operator_tempest_kind_name }}"
     test_operator_crd_name: "{{ cifmw_test_operator_tempest_crd_name }}"
     test_operator_workflow: "{{ cifmw_test_operator_tempest_workflow }}"
@@ -148,7 +148,7 @@
   vars:
     run_test_fw: ansibletest
     test_operator_config: "{{ cifmw_test_operator_ansibletest_config }}"
-    test_operator_job_name: "{{ cifmw_test_operator_ansibletest_name }}"
+    test_operator_instance_name: "{{ cifmw_test_operator_ansibletest_name }}"
     test_operator_kind_name: "{{ cifmw_test_operator_ansibletest_kind_name }}"
     test_operator_crd_name: "{{ cifmw_test_operator_ansibletest_crd_name }}"
     test_operator_workflow: "{{ cifmw_test_operator_ansibletest_workflow }}"
@@ -159,7 +159,7 @@
   vars:
     run_test_fw: horizontest
     test_operator_config: "{{ cifmw_test_operator_horizontest_config }}"
-    test_operator_job_name: "{{ cifmw_test_operator_horizontest_name }}"
+    test_operator_instance_name: "{{ cifmw_test_operator_horizontest_name }}"
     test_operator_kind_name: "{{ cifmw_test_operator_horizontest_kind_name }}"
     test_operator_crd_name: "{{ cifmw_test_operator_horizontest_crd_name }}"
     test_operator_workflow: []
@@ -171,7 +171,7 @@
   vars:
     run_test_fw: tobiko
     test_operator_config: "{{ cifmw_test_operator_tobiko_config }}"
-    test_operator_job_name: "{{ cifmw_test_operator_tobiko_name }}"
+    test_operator_instance_name: "{{ cifmw_test_operator_tobiko_name }}"
     test_operator_kind_name: "{{ cifmw_test_operator_tobiko_kind_name }}"
     test_operator_crd_name: "{{ cifmw_test_operator_tobiko_crd_name }}"
     test_operator_workflow: "{{ cifmw_test_operator_tobiko_workflow }}"
diff --git a/roles/test_operator/tasks/run-test-operator-job.yml b/roles/test_operator/tasks/run-test-operator-job.yml
index 2299b250b3..8bbb02d4f6 100644
--- a/roles/test_operator/tasks/run-test-operator-job.yml
+++ b/roles/test_operator/tasks/run-test-operator-job.yml
@@ -37,35 +37,47 @@
     definition: "{{ test_operator_cr }}"
   when: not cifmw_test_operator_dry_run | bool
 
-- name: Wait for the last job to be Completed - {{ run_test_fw }}
+- name: Wait for the last Pod to be Completed - {{ run_test_fw }}
   kubernetes.core.k8s_info:
     kubeconfig: "{{ cifmw_openshift_kubeconfig }}"
     api_key: "{{ cifmw_openshift_token | default(omit) }}"
     context: "{{ cifmw_openshift_context | default(omit) }}"
     namespace: "{{ cifmw_test_operator_namespace }}"
-    kind: Job
+    kind: Pod
     label_selectors:
       - "workflowStep={{ [(test_operator_workflow | length) - 1, 0] | max }}"
-      - "instanceName={{ test_operator_job_name }}"
-  retries: "{{ (cifmw_test_operator_timeout / 10) | round | int }}"
-  delay: 10
+      - "instanceName={{ test_operator_instance_name }}"
+  # retries: "{{ (cifmw_test_operator_timeout / 10) | round | int }}"
+  # delay: 10
   until: >
-    testjob.resources[0].status.succeeded | default(0) | int >= 1 or
-    testjob.resources[0].status.failed | default(0) | int >= 1
+    testpod.resources[0].status.phase == "Succeeded" or
+    testpod.resources[0].phase == "Failed"
   ignore_errors: true
-  register: testjob
+  register: testpod
   when: not cifmw_test_operator_dry_run | bool
 
+# - name: message
+#   debug:
+#     msg: "{{ testpod.status }}"
+
+# - name: fail
+#   fail:
+#     msg: "tortuga"
+
+# - name: debug
+#   debug:
+#     var: testpod
+
 - name: Check whether timed out - {{ run_test_fw }}
   ansible.builtin.set_fact:
-    testjob_timed_out: >-
-      {{ testjob.attempts == (cifmw_test_operator_timeout / 10) | round | int }}
+    testpod_timed_out: >-
+      {{ testpod.attempts == (cifmw_test_operator_timeout / 10) | round | int }}
   when: not cifmw_test_operator_dry_run | bool
 
 - name: Collect logs
   when:
     - not cifmw_test_operator_dry_run | bool
-    - not testjob_timed_out
+    - not testpod_timed_out
   block:
     - name: Reset volumes and volume_mounts to an empty list
       ansible.builtin.set_fact:
@@ -79,7 +91,7 @@
         context: "{{ cifmw_openshift_context | default(omit)}}"
         kind: PersistentVolumeClaim
         label_selectors:
-          - "instanceName={{ test_operator_job_name }}"
+          - "instanceName={{ test_operator_instance_name }}"
       register: logsPVCs
 
     - name: Set up volume mounts and volumes for all PVCs
@@ -88,7 +100,7 @@
           {{
             (volume_mounts | default([])) + [{
               'name': "logs-volume-" ~ index,
-              'mountPath': "/mnt/logs-{{ test_operator_job_name }}-step-" ~ index
+              'mountPath': "/mnt/logs-{{ test_operator_instance_name }}-step-" ~ index
             }]
           }}
         volumes: >
@@ -115,7 +127,7 @@
           apiVersion: v1
           kind: Pod
           metadata:
-            name: "test-operator-logs-pod-{{ run_test_fw }}-{{ test_operator_job_name }}"
+            name: "test-operator-logs-pod-{{ run_test_fw }}-{{ test_operator_instance_name }}"
             namespace: "{{ cifmw_test_operator_namespace }}"
           spec:
             containers:
@@ -134,7 +146,7 @@
         context: "{{ cifmw_openshift_context | default(omit) }}"
         namespace: "{{ cifmw_test_operator_namespace }}"
         kind: Pod
-        name: "test-operator-logs-pod-{{ run_test_fw }}-{{ test_operator_job_name }}"
+        name: "test-operator-logs-pod-{{ run_test_fw }}-{{ test_operator_instance_name }}"
         wait: true
       register: logs_pod
       until: logs_pod.resources[0].status.phase == "Running"
@@ -146,10 +158,10 @@
         KUBECONFIG: "{{ cifmw_openshift_kubeconfig }}"
         PATH: "{{ cifmw_path }}"
       vars:
-        pod_path: mnt/logs-{{ test_operator_job_name }}-step-{{ index }}
+        pod_path: mnt/logs-{{ test_operator_instance_name }}-step-{{ index }}
       ansible.builtin.shell: >
         oc cp -n {{ cifmw_test_operator_namespace }}
-        openstack/test-operator-logs-pod-{{ run_test_fw }}-{{ test_operator_job_name }}:{{ pod_path }}
+        openstack/test-operator-logs-pod-{{ run_test_fw }}-{{ test_operator_instance_name }}:{{ pod_path }}
         {{ cifmw_test_operator_artifacts_basedir }}
       loop: "{{ logsPVCs.resources }}"
       loop_control:
@@ -174,7 +186,7 @@
     namespace: "{{ cifmw_test_operator_namespace }}"
     kind: Pod
     label_selectors:
-      - "instanceName={{ test_operator_job_name }}"
+      - "instanceName={{ test_operator_instance_name }}"
   when: not cifmw_test_operator_dry_run | bool
 
 - name: Get status from test pods
@@ -225,7 +237,7 @@
         kind: "{{ test_operator_kind_name }}"
         state: absent
         api_version: test.openstack.org/v1beta1
-        name: "{{ test_operator_job_name }}"
+        name: "{{ test_operator_instance_name }}"
         namespace: "{{ cifmw_test_operator_namespace }}"
         wait: true
         wait_timeout: 600
@@ -251,7 +263,7 @@
     kind: Pod
     state: absent
     api_version: v1
-    name: "test-operator-logs-pod-{{ run_test_fw }}-{{ test_operator_job_name }}"
+    name: "test-operator-logs-pod-{{ run_test_fw }}-{{ test_operator_instance_name }}"
     namespace: "{{ cifmw_test_operator_namespace }}"
     wait: true
     wait_timeout: 600
diff --git a/roles/test_operator/tasks/tempest-tests.yml b/roles/test_operator/tasks/tempest-tests.yml
index b94ce91070..665854028f 100644
--- a/roles/test_operator/tasks/tempest-tests.yml
+++ b/roles/test_operator/tasks/tempest-tests.yml
@@ -29,7 +29,7 @@
       tempest_list_allowed:
         yaml_file: "{{ cifmw_test_operator_artifacts_basedir }}/list_allowed.yml"
         groups: "{{ cifmw_test_operator_default_groups }}"
-        job: "{{ cifmw_test_operator_job_name | default(omit) }}"
+        job: "{{ cifmw_test_operator_instance_name | default(omit) }}"
       register:
         list_allowed