diff --git a/charts/wave/Chart.yaml b/charts/wave/Chart.yaml
index cabca2d0..31a2aca0 100644
--- a/charts/wave/Chart.yaml
+++ b/charts/wave/Chart.yaml
@@ -1,4 +1,4 @@
-apiVersion: v1
+apiVersion: v2
 name: wave
 description: wave chart that runs on kubernetes
 version: 3.0.0
diff --git a/charts/wave/templates/deployment.yaml b/charts/wave/templates/deployment.yaml
index 7a1f3b1c..b4296ca7 100644
--- a/charts/wave/templates/deployment.yaml
+++ b/charts/wave/templates/deployment.yaml
@@ -39,4 +39,5 @@ spec:
       nodeSelector: {{ toYaml .Values.nodeSelector | nindent 8 }}
       affinity: {{ toYaml .Values.affinity | nindent 8 }}
       tolerations: {{ toYaml .Values.tolerations | nindent 8 }}
+      topologySpreadConstraints: {{ toYaml .Values.topologySpreadConstraints | nindent 8 }}
       volumes: {{ toYaml .Values.extraVolumes | nindent 8 }}
diff --git a/charts/wave/templates/poddisruptionbudget.yaml b/charts/wave/templates/poddisruptionbudget.yaml
new file mode 100644
index 00000000..204bcc10
--- /dev/null
+++ b/charts/wave/templates/poddisruptionbudget.yaml
@@ -0,0 +1,12 @@
+{{- if .Values.pdb.enabled }}
+apiVersion: policy/v1
+kind: PodDisruptionBudget
+metadata:
+  name: {{ include "wave-fullname" . }}
+  namespace: {{ .Release.Namespace }}
+spec:
+  selector:
+    matchLabels:
+      {{ include "wave.selectorLabels" . | nindent 6}}
+  maxUnavailable: 1
+{{- end }}
\ No newline at end of file
diff --git a/charts/wave/values.yaml b/charts/wave/values.yaml
index e9ee1951..add081da 100644
--- a/charts/wave/values.yaml
+++ b/charts/wave/values.yaml
@@ -20,6 +20,10 @@ nodeSelector: {}
 # Replicas > 1 will enable leader election
 replicas: 1
 
+# Add PodDisruptionBudget which should be enabled for replicas > 1
+pdb:
+  enabled: false
+
 # Additional volumes to use in the pod.
 extraVolumes: []
 # - name: tmp
@@ -58,8 +62,14 @@ resources: {}
   #   cpu: 100m
   #   memory: 128Mi
 
+# node tolerations for wave pod
 tolerations: []
 
+# (anti-)affinity for wave pods
 affinity: {}
 
+# topologySpreadConstraints for the wave pods
+topologySpreadConstraints: []
+
+# extra annotations for wave pods
 podAnnotations: {}