diff --git a/charts/gitops-runtime/templates/hooks/pre-uninstall/cleanup-resources.yaml b/charts/gitops-runtime/templates/hooks/pre-uninstall/cleanup-resources.yaml
index a8e612fb..ecd385a8 100644
--- a/charts/gitops-runtime/templates/hooks/pre-uninstall/cleanup-resources.yaml
+++ b/charts/gitops-runtime/templates/hooks/pre-uninstall/cleanup-resources.yaml
@@ -3,13 +3,14 @@ kind: Job
 metadata:
   name: cleanup-runtime-resources
   annotations:
-    "helm.sh/hook": pre-delete
-    "helm.sh/hook-delete-policy": hook-succeeded,before-hook-creation
+    helm.sh/hook: pre-delete
+    helm.sh/hook-weight: "5"
+    helm.sh/hook-delete-policy: hook-succeeded,before-hook-creation
 spec:
   backoffLimit: 3
   template:
     spec:
-      serviceAccount: argocd-application-controller
+      serviceAccount: runtime-cleanup
       restartPolicy: Never
       containers:
       - name: cleanup-runtime-resources
diff --git a/charts/gitops-runtime/templates/hooks/pre-uninstall/delete-runtime-from-platform.yaml b/charts/gitops-runtime/templates/hooks/pre-uninstall/delete-runtime-from-platform.yaml
index f669b104..bdb55e11 100644
--- a/charts/gitops-runtime/templates/hooks/pre-uninstall/delete-runtime-from-platform.yaml
+++ b/charts/gitops-runtime/templates/hooks/pre-uninstall/delete-runtime-from-platform.yaml
@@ -8,8 +8,8 @@ kind: Job
 metadata:
   name: delete-runtime-from-platform
   annotations:
-    "helm.sh/hook": pre-delete
-    "helm.sh/hook-delete-policy": hook-succeeded,before-hook-creation,hook-failed
+    helm.sh/hook: pre-delete
+    helm.sh/hook-delete-policy: hook-succeeded,before-hook-creation,hook-failed
 spec:
   backoffLimit: 3
   template:
diff --git a/charts/gitops-runtime/templates/hooks/pre-uninstall/rbac.yaml b/charts/gitops-runtime/templates/hooks/pre-uninstall/rbac.yaml
index 62a62301..fb63a752 100644
--- a/charts/gitops-runtime/templates/hooks/pre-uninstall/rbac.yaml
+++ b/charts/gitops-runtime/templates/hooks/pre-uninstall/rbac.yaml
@@ -1,10 +1,20 @@
+apiVersion: v1
+kind: ServiceAccount
+metadata:
+  name: runtime-cleanup
+  annotations:
+    helm.sh/hook: pre-delete
+    helm.sh/hook-weight: "-10"
+    helm.sh/hook-delete-policy: hook-succeeded,before-hook-creation,hook-failed
+---
 apiVersion: rbac.authorization.k8s.io/v1
 kind: Role
 metadata:
   name: runtime-cleanup
   annotations:
-    "helm.sh/hook": pre-delete
-    "helm.sh/hook-delete-policy": hook-succeeded,before-hook-creation,hook-failed
+    helm.sh/hook: pre-delete
+    helm.sh/hook-weight: "-10"
+    helm.sh/hook-delete-policy: hook-succeeded,before-hook-creation,hook-failed
 rules:
   - apiGroups:
       - "*"
@@ -18,8 +28,9 @@ kind: RoleBinding
 metadata:
   name: runtime-cleanup
   annotations:
-    "helm.sh/hook": pre-delete
-    "helm.sh/hook-delete-policy": hook-succeeded,before-hook-creation,hook-failed
+    helm.sh/hook: pre-delete
+    helm.sh/hook-weight: "-10"
+    helm.sh/hook-delete-policy: hook-succeeded,before-hook-creation,hook-failed
 roleRef:
   apiGroup: ""
   kind: Role
@@ -27,11 +38,3 @@ roleRef:
 subjects:
   - kind: ServiceAccount
     name: runtime-cleanup
----
-apiVersion: v1
-kind: ServiceAccount
-metadata:
-  name: runtime-cleanup
-  annotations:
-    "helm.sh/hook": pre-delete
-    "helm.sh/hook-delete-policy": hook-succeeded,before-hook-creation,hook-failed