diff --git a/catalog-info.yaml b/catalog-info.yaml
index c91dff9..8d8266a 100644
--- a/catalog-info.yaml
+++ b/catalog-info.yaml
@@ -20,7 +20,7 @@ metadata:
     helm.cnoe.io/available-values-files: '["values.yaml", "values-dev.yaml", "values-local.yaml"]'
     helm.cnoe.io/dependencies: '{}'
     # Dependency URL mapping for environment provisioning
-    helm.cnoe.io/dependency-urls: '{"hades-service": {"helmParam": "hades.baseUrl", "port": 8080, "serviceDns": "hades"}}'
+    helm.cnoe.io/dependency-urls: '{"hades-service": {"helmParam": "hades.baseUrl", "port": 8080, "serviceDns": "hades-service"}}'
   tags:
     - configuration
     - settings
diff --git a/property-settings-svc-v2-chart/templates/deployment.yaml b/property-settings-svc-v2-chart/templates/deployment.yaml
index 7509c9a..eff93db 100644
--- a/property-settings-svc-v2-chart/templates/deployment.yaml
+++ b/property-settings-svc-v2-chart/templates/deployment.yaml
@@ -4,6 +4,9 @@ metadata:
   name: {{ include "property-settings-svc-v2-chart.fullname" . }}
   labels:
     {{- include "property-settings-svc-v2-chart.labels" . | nindent 4 }}
+  annotations:
+    # ArgoCD sync wave - run after dbinit job (wave -1)
+    argocd.argoproj.io/sync-wave: "0"
 spec:
   {{- if not .Values.autoscaling.enabled }}
   replicas: {{ .Values.replicaCount }}
diff --git a/property-settings-svc-v2-chart/templates/job-dbinit.yaml b/property-settings-svc-v2-chart/templates/job-dbinit.yaml
index d4249f0..7dda9bc 100644
--- a/property-settings-svc-v2-chart/templates/job-dbinit.yaml
+++ b/property-settings-svc-v2-chart/templates/job-dbinit.yaml
@@ -7,6 +7,11 @@ metadata:
     {{- include "property-settings-svc-v2-chart.labels" . | nindent 4 }}
     app.kubernetes.io/component: dbinit
   annotations:
+    # ArgoCD sync wave - run before deployment (wave 0)
+    argocd.argoproj.io/sync-wave: "-1"
+    argocd.argoproj.io/hook: Sync
+    argocd.argoproj.io/hook-delete-policy: BeforeHookCreation
+    # Helm hooks (for non-ArgoCD deployments)
     "helm.sh/hook": post-install,post-upgrade
     "helm.sh/hook-weight": "-5"
     "helm.sh/hook-delete-policy": before-hook-creation