diff --git a/openshift/gitops/manifests/argocd/apps/configs/cnv/base/cnv-app.yaml b/openshift/gitops/manifests/argocd/apps/configs/cnv/base/cnv-app.yaml
index bcefbbcf..1cceb54a 100644
--- a/openshift/gitops/manifests/argocd/apps/configs/cnv/base/cnv-app.yaml
+++ b/openshift/gitops/manifests/argocd/apps/configs/cnv/base/cnv-app.yaml
@@ -19,3 +19,9 @@ spec:
     automated:
       prune: false
       selfHeal: true
+    retry:
+      limit: 30
+      backoff:
+        duration: 20s
+        factor: 2
+        maxDuration: 20m
diff --git a/openshift/gitops/manifests/argocd/apps/rfe/image-builder-vm/base/image-builder-vm-app.yaml b/openshift/gitops/manifests/argocd/apps/rfe/image-builder-vm/base/image-builder-vm-app.yaml
index 0fe73c70..850ad87a 100644
--- a/openshift/gitops/manifests/argocd/apps/rfe/image-builder-vm/base/image-builder-vm-app.yaml
+++ b/openshift/gitops/manifests/argocd/apps/rfe/image-builder-vm/base/image-builder-vm-app.yaml
@@ -20,3 +20,9 @@ spec:
     automated:
       prune: false
       selfHeal: true
+    retry:
+      limit: 30
+      backoff:
+        duration: 20s
+        factor: 2
+        maxDuration: 20m
diff --git a/openshift/gitops/manifests/configs/cnv/base/hyperconverged.yaml b/openshift/gitops/manifests/configs/cnv/base/hyperconverged.yaml
index ad8f9caa..a7c7dfc4 100644
--- a/openshift/gitops/manifests/configs/cnv/base/hyperconverged.yaml
+++ b/openshift/gitops/manifests/configs/cnv/base/hyperconverged.yaml
@@ -4,7 +4,7 @@ metadata:
   namespace: openshift-cnv
   name: kubevirt-hyperconverged
   annotations:
-    argocd.argoproj.io/sync-wave: "5"
+    argocd.argoproj.io/sync-wave: "1"
     argocd.argoproj.io/compare-options: IgnoreExtraneous
     argocd.argoproj.io/sync-options: SkipDryRunOnMissingResource=true
     deployOVS: "false"
diff --git a/openshift/gitops/manifests/rfe/image-builder-vm/base/image-builder-vm.yaml b/openshift/gitops/manifests/rfe/image-builder-vm/base/image-builder-vm.yaml
index a47317d2..cf86fd77 100644
--- a/openshift/gitops/manifests/rfe/image-builder-vm/base/image-builder-vm.yaml
+++ b/openshift/gitops/manifests/rfe/image-builder-vm/base/image-builder-vm.yaml
@@ -2,6 +2,9 @@ apiVersion: kubevirt.io/v1alpha3
 kind: VirtualMachine
 metadata:
   annotations:
+    argocd.argoproj.io/sync-wave: "10"
+    argocd.argoproj.io/compare-options: IgnoreExtraneous
+    argocd.argoproj.io/sync-options: SkipDryRunOnMissingResource=true
     description: RHEL 8 With Image Builder
     name.os.template.kubevirt.io/rhel8.3: Red Hat Enterprise Linux 8.0 or higher
   name: image-builder
@@ -107,4 +110,4 @@ spec:
             secretName: image-builder-ssh-key
         - name: serviceaccount
           serviceAccount:
-            serviceAccountName: rfe-automation
\ No newline at end of file
+            serviceAccountName: rfe-automation
diff --git a/openshift/gitops/manifests/rfe/image-builder-vm/base/redhat-image-downloader-ansible-job.yaml b/openshift/gitops/manifests/rfe/image-builder-vm/base/redhat-image-downloader-ansible-job.yaml
index 908e06ca..e5e11065 100644
--- a/openshift/gitops/manifests/rfe/image-builder-vm/base/redhat-image-downloader-ansible-job.yaml
+++ b/openshift/gitops/manifests/rfe/image-builder-vm/base/redhat-image-downloader-ansible-job.yaml
@@ -2,7 +2,7 @@ apiVersion: batch/v1
 kind: Job
 metadata:
   annotations:
-    argocd.argoproj.io/hook: Sync
+    argocd.argoproj.io/hook: PreSync
     argocd.argoproj.io/hook-delete-policy: HookSucceeded
   labels:
     run: redhat-image-downloader-ansible-job
@@ -46,4 +46,4 @@ spec:
       restartPolicy: OnFailure
       serviceAccount: rfe-automation
       serviceAccountName: rfe-automation
-      terminationGracePeriodSeconds: 30
\ No newline at end of file
+      terminationGracePeriodSeconds: 30