diff --git a/components/keystone/values.yaml b/components/keystone/values.yaml
index 1e7fd017e..b3ef70e06 100644
--- a/components/keystone/values.yaml
+++ b/components/keystone/values.yaml
@@ -389,3 +389,7 @@ annotations:
       argocd.argoproj.io/hook: Sync
       argocd.argoproj.io/hook-delete-policy: BeforeHookCreation
       argocd.argoproj.io/sync-options: Replace=true
+    keystone_domain_manage:
+      argocd.argoproj.io/hook: Sync
+      argocd.argoproj.io/hook-delete-policy: BeforeHookCreation
+      argocd.argoproj.io/sync-options: Replace=true
diff --git a/components/nova/values.yaml b/components/nova/values.yaml
index 967dbdeb7..808486df3 100644
--- a/components/nova/values.yaml
+++ b/components/nova/values.yaml
@@ -195,7 +195,7 @@ annotations:
     nova_cell_setup:
       argocd.argoproj.io/hook: PostSync
       argocd.argoproj.io/hook-delete-policy: BeforeHookCreation
-      argocd.argoproj.io/sync-options: Replace=true
+      argocd.argoproj.io/sync-options: Force=true,Replace=true
     nova_bootstrap:
       argocd.argoproj.io/hook: Sync
       argocd.argoproj.io/hook-delete-policy: BeforeHookCreation