diff --git a/components/nova/values.yaml b/components/nova/values.yaml
index 4f34a1775..8090ccf35 100644
--- a/components/nova/values.yaml
+++ b/components/nova/values.yaml
@@ -289,10 +289,12 @@ annotations:
       argocd.argoproj.io/sync-options: Force=true
       argocd.argoproj.io/sync-wave: "0"
     nova_cell_setup:
-      argocd.argoproj.io/hook: PostSync
+      argocd.argoproj.io/hook: Sync
       argocd.argoproj.io/hook-delete-policy: BeforeHookCreation
       argocd.argoproj.io/sync-options: Force=true
+      argocd.argoproj.io/sync-wave: "1"
     nova_bootstrap:
       argocd.argoproj.io/hook: Sync
       argocd.argoproj.io/hook-delete-policy: BeforeHookCreation
       argocd.argoproj.io/sync-options: Force=true
+      argocd.argoproj.io/sync-wave: "2"