diff --git a/roles/test_operator/tasks/tempest-tests.yml b/roles/test_operator/tasks/tempest-tests.yml
index 5aa7539bef..25a5fba2b4 100644
--- a/roles/test_operator/tasks/tempest-tests.yml
+++ b/roles/test_operator/tasks/tempest-tests.yml
@@ -173,3 +173,28 @@
               test_operator_cr |
               combine({'spec': {'workflow': overriden_workflow}}, recursive=true)
           }}
+
+- name: Make sure resources are not set for worklfow step
+  when:
+    - not cifmw_test_operator_dry_run | bool
+    - stage_vars_dict.cifmw_test_operator_tempest_workflow | list | length > 0
+  block:
+    - name: Remove resources until fix for bug 2088074 reaches openstack-tempest-all image
+      when: item.resources is undefined
+      vars:
+        _no_resources_workflow_step: >-
+          {{
+              item |
+              combine({"resources": {"requests": {}, "limits": {}}}, recursive=true)
+          }}
+      ansible.builtin.set_fact:
+        no_resources_workflow: "{{ no_resources_workflow | default([]) + [_no_resources_workflow_step] }}"
+      loop: "{{ stage_vars_dict.cifmw_test_operator_tempest_workflow | list }}"
+
+    - name: Override the Tempest CR workflow
+      ansible.builtin.set_fact:
+        test_operator_cr: >-
+          {{
+              test_operator_cr |
+              combine({'spec': {'workflow': no_resources_workflow}}, recursive=true)
+          }}