diff --git a/.github/workflows/kind-awx.yaml b/.github/workflows/kind-awx.yaml
index dfcb3771..e29ab1f0 100644
--- a/.github/workflows/kind-awx.yaml
+++ b/.github/workflows/kind-awx.yaml
@@ -161,7 +161,7 @@ jobs:
           kubectl apply -f test-e2e/tests/job-deprecated.yaml
           kubectl wait ansiblejob -n awx demo-job-deprecated --for condition=Successful=True --timeout=80s
           kubectl apply -f config/samples/tower_v1alpha1_ansiblejob-broken-dep.yaml -n awx
-          kubectl wait ansiblejob -n awx broke-job-deprecated --for condition=Successful=True --timeout=80s
+          kubectl wait ansiblejob -n awx broke-job-deprecated --for condition=Successful=True --timeout=100s
 
       - name: launch a template
         run: |
diff --git a/roles/common/tasks/main.yml b/roles/common/tasks/main.yml
new file mode 100644
index 00000000..ed97d539
--- /dev/null
+++ b/roles/common/tasks/main.yml
@@ -0,0 +1 @@
+---
diff --git a/roles/common/tasks/unset-ownerref.yml b/roles/common/tasks/unset-ownerref.yml
new file mode 100644
index 00000000..a35f3703
--- /dev/null
+++ b/roles/common/tasks/unset-ownerref.yml
@@ -0,0 +1,15 @@
+---
+- name: Remove ownerReferences on persistent resources
+  k8s:
+    definition:
+      apiVersion: "{{ item.apiVersion }}"
+      kind: "{{ item.kind }}"
+      metadata:
+        name: "resource-operator-controller-manager-job"
+        namespace: '{{ ansible_operator_meta.namespace }}'
+        ownerReferences: null
+  loop:
+    - { kind: 'ServiceAccount', apiVersion: 'v1' }
+    - { kind: 'Role', apiVersion: 'rbac.authorization.k8s.io/v1' }
+    - { kind: 'RoleBinding', apiVersion: 'rbac.authorization.k8s.io/v1' }
+  no_log: "{{ no_log }}"
diff --git a/roles/credential/tasks/main.yml b/roles/credential/tasks/main.yml
index 0962dc8b..7c7f8b2c 100644
--- a/roles/credential/tasks/main.yml
+++ b/roles/credential/tasks/main.yml
@@ -68,6 +68,9 @@
     state: present
     definition: "{{ lookup('template', 'service_account.yml.j2') }}"
 
+- name: Unset ownerReference on ServiceAccount, Role, and RoleBinding
+  include_tasks: ../common/tasks/unset-ownerref.yml
+
 - name: Start K8s Runner Job
   kubernetes.core.k8s:
     state: present
diff --git a/roles/instancegroup/tasks/main.yml b/roles/instancegroup/tasks/main.yml
index 0b064ae9..d25d5927 100644
--- a/roles/instancegroup/tasks/main.yml
+++ b/roles/instancegroup/tasks/main.yml
@@ -82,6 +82,9 @@
     state: present
     definition: "{{ lookup('template', 'service_account.yml.j2') }}"
 
+- name: Unset ownerReference on ServiceAccount, Role, and RoleBinding
+  include_tasks: ../common/tasks/unset-ownerref.yml
+
 - name: Start K8s Runner Job
   kubernetes.core.k8s:
     state: present
diff --git a/roles/inventory/defaults/main.yml b/roles/inventory/defaults/main.yml
index 59d1966e..8bde0c77 100644
--- a/roles/inventory/defaults/main.yml
+++ b/roles/inventory/defaults/main.yml
@@ -2,4 +2,3 @@
 # defaults file for Inventory
 job_ttl: 3600
 backoff_limit: 1
-
diff --git a/roles/inventory/tasks/main.yml b/roles/inventory/tasks/main.yml
index a542ed45..981cbb60 100644
--- a/roles/inventory/tasks/main.yml
+++ b/roles/inventory/tasks/main.yml
@@ -57,4 +57,3 @@
       message: "There was an error when creating the inventory"
   when:
     - inventory.failed
-
diff --git a/roles/job/tasks/main.yml b/roles/job/tasks/main.yml
index a1bde476..2060f546 100644
--- a/roles/job/tasks/main.yml
+++ b/roles/job/tasks/main.yml
@@ -94,6 +94,9 @@
     state: present
     definition: "{{ lookup('template', 'service_account.yml.j2') }}"
 
+- name: Unset ownerReference on ServiceAccount, Role, and RoleBinding
+  include_tasks: ../common/tasks/unset-ownerref.yml
+
 - name: Start K8s Runner Job
   kubernetes.core.k8s:
     state: present
diff --git a/roles/jobtemplate/tasks/main.yml b/roles/jobtemplate/tasks/main.yml
index dc40dcb0..518b2c41 100644
--- a/roles/jobtemplate/tasks/main.yml
+++ b/roles/jobtemplate/tasks/main.yml
@@ -102,4 +102,3 @@
       message: "There was an error in the job template"
   when:
     - job_template.failed
-
diff --git a/roles/project/tasks/main.yml b/roles/project/tasks/main.yml
index 908eb226..525cb998 100644
--- a/roles/project/tasks/main.yml
+++ b/roles/project/tasks/main.yml
@@ -68,6 +68,9 @@
     state: present
     definition: "{{ lookup('template', 'service_account.yml.j2') }}"
 
+- name: Unset ownerReference on ServiceAccount, Role, and RoleBinding
+  include_tasks: ../common/tasks/unset-ownerref.yml
+
 - name: Start K8s Runner Job
   kubernetes.core.k8s:
     state: present
diff --git a/roles/schedule/tasks/main.yml b/roles/schedule/tasks/main.yml
index 951756b7..56172ffb 100644
--- a/roles/schedule/tasks/main.yml
+++ b/roles/schedule/tasks/main.yml
@@ -68,6 +68,9 @@
     state: present
     definition: "{{ lookup('template', 'service_account.yml.j2') }}"
 
+- name: Unset ownerReference on ServiceAccount, Role, and RoleBinding
+  include_tasks: ../common/tasks/unset-ownerref.yml
+
 - name: Start K8s Runner Job
   kubernetes.core.k8s:
     state: present
diff --git a/roles/workflow/tasks/main.yml b/roles/workflow/tasks/main.yml
index 13df4b27..e1dd175b 100644
--- a/roles/workflow/tasks/main.yml
+++ b/roles/workflow/tasks/main.yml
@@ -94,6 +94,9 @@
     state: present
     definition: "{{ lookup('template', 'service_account.yml.j2') }}"
 
+- name: Unset ownerReference on ServiceAccount, Role, and RoleBinding
+  include_tasks: ../common/tasks/unset-ownerref.yml
+
 - name: Start K8s Runner Job
   kubernetes.core.k8s:
     state: present
diff --git a/test-e2e/tests/job-deprecated.yaml b/test-e2e/tests/job-deprecated.yaml
index 4aab0363..9c84dd5e 100644
--- a/test-e2e/tests/job-deprecated.yaml
+++ b/test-e2e/tests/job-deprecated.yaml
@@ -7,4 +7,3 @@ spec:
   tower_auth_secret: awxaccess
   job_template_name: Demo Job Template
   runner_pull_policy: IfNotPresent
-