diff --git a/install/0000_80_machine-config_00_v1alpha1-mcn-cleanup-job.yaml b/install/0000_80_machine-config_00_v1alpha1-mcn-cleanup-job.yaml
deleted file mode 100644
index 1da2b0e40c..0000000000
--- a/install/0000_80_machine-config_00_v1alpha1-mcn-cleanup-job.yaml
+++ /dev/null
@@ -1,104 +0,0 @@
-apiVersion: batch/v1
-kind: CronJob
-metadata:
-  name: machine-config-nodes-crd-cleanup
-  namespace: openshift-machine-config-operator
-  annotations:
-    include.release.openshift.io/self-managed-high-availability: "true"
-    include.release.openshift.io/single-node-developer: "true"
-    # exclude from hypershift
-    exclude.release.openshift.io/internal-openshift-hosted: "true"
-    release.openshift.io/feature-set: Default
-    # This prevent an update of this cronjob once the child job suspends on a successful run
-    release.openshift.io/create-only: "true"
-spec:
-  # Run every minute initially to trigger an immediate run
-  schedule: "* * * * *"  
-  # Don't suspend initially - let it run once
-  suspend: false  
-  # Only allow 1 concurrent job and prevent overlapping
-  concurrencyPolicy: Forbid  
-  jobTemplate:
-    spec:        
-      backOffLimit: 3      
-      template:
-        metadata:
-          labels:
-            app: machine-config-nodes-crd-cleanup
-          annotations:
-            target.workload.openshift.io/management: '{"effect": "PreferredDuringScheduling"}'
-            openshift.io/required-scc: nonroot-v2
-        spec:
-          serviceAccountName: machine-config-operator
-          restartPolicy: OnFailure
-          containers:
-          - name: crd-cleanup
-            image: placeholder.url.oc.will.replace.this.org/placeholdernamespace:rhel-coreos
-            terminationMessagePolicy: FallbackToLogsOnError
-            command:
-            - /bin/bash
-            - -c
-            - |
-              set -euo pipefail
-              
-              # Set trap to suspend cronjob on successful exit (exit code 0)
-              trap 'if [ $? -eq 0 ]; then echo "Suspending cronjob..."; oc patch cronjob machine-config-nodes-crd-cleanup -p "{\"spec\":{\"suspend\":true}}" --field-manager=machine-config-operator || echo "Failed to suspend cronjob"; fi' EXIT
-              
-              CRD_NAME="machineconfignodes.machineconfiguration.openshift.io"
-              
-              echo "Checking for MachineConfigNodes CRD with v1alpha1 version..."
-              
-              # Check if CRD exists
-              if ! oc get crd "$CRD_NAME" >/dev/null 2>&1; then
-                echo "CRD $CRD_NAME does not exist, nothing to clean up"
-                exit 0
-              fi
-              
-              # Check if CRD has v1alpha1 version
-              HAS_V1ALPHA1=$(oc get crd "$CRD_NAME" -o jsonpath='{.spec.versions[?(@.name=="v1alpha1")].name}' 2>/dev/null || echo "")
-              
-              if [ -z "$HAS_V1ALPHA1" ]; then
-                echo "CRD $CRD_NAME does not have v1alpha1 version, nothing to clean up"
-                exit 0
-              fi
-              
-              echo "Found CRD $CRD_NAME with v1alpha1 version, deleting it..."
-              
-              # Delete the CRD
-              if oc delete crd "$CRD_NAME"; then
-                echo "Successfully deleted CRD $CRD_NAME"
-              else
-                echo "Failed to delete CRD $CRD_NAME"
-                exit 1
-              fi
-              
-              echo "CRD cleanup completed successfully"
-            resources:
-              requests:
-                cpu: 10m
-                memory: 50Mi
-            securityContext:
-              allowPrivilegeEscalation: false
-              capabilities:
-                drop:
-                - ALL
-          securityContext:
-            runAsNonRoot: true
-            runAsUser: 65534
-            seccompProfile:
-              type: RuntimeDefault
-          nodeSelector:
-            node-role.kubernetes.io/control-plane: ""
-          priorityClassName: "system-cluster-critical"
-          tolerations:
-          - effect: NoSchedule
-            key: node-role.kubernetes.io/master
-            operator: Exists
-          - effect: NoExecute
-            key: node.kubernetes.io/unreachable
-            operator: Exists
-            tolerationSeconds: 120
-          - effect: NoExecute
-            key: node.kubernetes.io/not-ready
-            operator: Exists
-            tolerationSeconds: 120
diff --git a/install/0000_90_machine-config_90_deletion.yaml b/install/0000_90_machine-config_90_deletion.yaml
index ba7ee70928..a9fbaf9162 100644
--- a/install/0000_90_machine-config_90_deletion.yaml
+++ b/install/0000_90_machine-config_90_deletion.yaml
@@ -17,3 +17,14 @@ roleRef:
   kind: ClusterRole
   name: cluster-admin
   apiGroup: rbac.authorization.k8s.io
+---
+apiVersion: batch/v1
+kind: CronJob
+metadata:
+  name: machine-config-nodes-crd-cleanup
+  namespace: openshift-machine-config-operator
+  annotations:
+    include.release.openshift.io/self-managed-high-availability: "true"
+    include.release.openshift.io/single-node-developer: "true"
+    release.openshift.io/feature-set: Default
+    release.openshift.io/delete: "true"