diff --git a/charts/enactor-pdp/Chart.yaml b/charts/enactor-pdp/Chart.yaml
index 2977be5..05de71c 100644
--- a/charts/enactor-pdp/Chart.yaml
+++ b/charts/enactor-pdp/Chart.yaml
@@ -4,7 +4,7 @@ description: Enactor PDP-server
 
 type: application
 
-version: 0.2.16
+version: 0.2.17
 appVersion: "1.0"
 
 maintainers: 
diff --git a/charts/enactor-pdp/templates/statefulset-pdc.yaml b/charts/enactor-pdp/templates/statefulset-pdc.yaml
index e5c5865..0b2c9da 100644
--- a/charts/enactor-pdp/templates/statefulset-pdc.yaml
+++ b/charts/enactor-pdp/templates/statefulset-pdc.yaml
@@ -21,6 +21,9 @@ spec:
         {{- include "common.selectorLabels" $root | nindent 8 }}
       annotations:
         checksum/config: {{ include (print $basepath "/configmap-pdc.yaml") $root | sha256sum }}
+        {{- if $root.Values.features.argocdSyncwaves.enabled }}
+        argocd.argoproj.io/sync-wave: {{ $root.Values.features.argocdSyncwaves.waves.pdc | default 20 | quote }}
+        {{- end }}
     spec:
       terminationGracePeriodSeconds: 15
       serviceAccountName: {{ include "pdc.serviceAccountName" $root }}
diff --git a/charts/enactor-pdp/templates/statefulset-pdp.yaml b/charts/enactor-pdp/templates/statefulset-pdp.yaml
index 922806c..4e457f1 100644
--- a/charts/enactor-pdp/templates/statefulset-pdp.yaml
+++ b/charts/enactor-pdp/templates/statefulset-pdp.yaml
@@ -21,7 +21,9 @@ spec:
         {{- include "common.selectorLabels" $root | nindent 8 }}
       annotations:
         checksum/config: {{ include (print $.Template.BasePath "/configmap-pdp.yaml") $root | sha256sum }}
-        argocd.argoproj.io/sync-wave: "1"
+        {{- if $root.Values.features.argocdSyncwaves.enabled }}
+        argocd.argoproj.io/sync-wave: {{ $root.Values.features.argocdSyncwaves.waves.pdp | default 10 | quote }}
+        {{- end }}
     spec:
       terminationGracePeriodSeconds: 15
       serviceAccountName: {{ include "pdp.serviceAccountName" $root }}
diff --git a/charts/enactor-pdp/values.yaml b/charts/enactor-pdp/values.yaml
index 5669509..4a342cd 100644
--- a/charts/enactor-pdp/values.yaml
+++ b/charts/enactor-pdp/values.yaml
@@ -2,6 +2,13 @@
 # This is a YAML-formatted file.
 # Declare variables to be passed into your templates.
 
+features:
+  argocdSyncwaves:
+    enabled: false
+    waves:
+      pdp: 10
+      pdc: 20
+
 dns:
   domain: my.fqdn.address
   ems: ems