diff --git a/charts/vault-secrets-webhook/templates/webhook-pdb.yaml b/charts/vault-secrets-webhook/templates/webhook-pdb.yaml
index 98728e0e3b..d4aaebeda1 100644
--- a/charts/vault-secrets-webhook/templates/webhook-pdb.yaml
+++ b/charts/vault-secrets-webhook/templates/webhook-pdb.yaml
@@ -11,7 +11,12 @@ metadata:
     app.kubernetes.io/managed-by: {{ .Release.Service }}
     app.kubernetes.io/component: mutating-webhook
 spec:
-  minAvailable: {{ .Values.podDisruptionBudget.minAvailable }}
+  {{- with .Values.podDisruptionBudget.minAvailable }}
+  minAvailable: {{ . }}
+  {{- end }}
+  {{- with .Values.podDisruptionBudget.maxUnavailable }}
+  maxUnavailable: {{ . }}
+  {{- end }}
   selector:
     matchLabels:
       app.kubernetes.io/name: {{ template "vault-secrets-webhook.name" . }}
diff --git a/charts/vault-secrets-webhook/values.yaml b/charts/vault-secrets-webhook/values.yaml
index 1d651102b2..5ca280c906 100644
--- a/charts/vault-secrets-webhook/values.yaml
+++ b/charts/vault-secrets-webhook/values.yaml
@@ -158,6 +158,7 @@ objectSelector: {}
 podDisruptionBudget:
   enabled: true
   minAvailable: 1
+  #maxUnavailable: 1
 
 timeoutSeconds: false
 
diff --git a/charts/vault/templates/pdb.yaml b/charts/vault/templates/pdb.yaml
new file mode 100644
index 0000000000..0f23cfb92f
--- /dev/null
+++ b/charts/vault/templates/pdb.yaml
@@ -0,0 +1,23 @@
+{{- if .Values.podDisruptionBudget.enabled }}
+apiVersion: policy/v1beta1
+kind: PodDisruptionBudget
+metadata:
+  name: {{ template "vault.fullname" . }}
+  namespace: {{ .Release.Namespace }}
+  labels:
+    helm.sh/chart: {{ template "vault.chart" . }}
+    app.kubernetes.io/name: {{ template "vault.name" . }}
+    app.kubernetes.io/instance: {{ .Release.Name }}
+    app.kubernetes.io/managed-by: {{ .Release.Service }}
+spec:
+  {{- with .Values.podDisruptionBudget.minAvailable }}
+  minAvailable: {{ . }}
+  {{- end }}
+  {{- with .Values.podDisruptionBudget.maxUnavailable }}
+  maxUnavailable: {{ . }}
+  {{- end }}
+  selector:
+    matchLabels:
+      app.kubernetes.io/name: {{ template "vault.name" . }}
+      app.kubernetes.io/instance: {{ .Release.Name }}
+{{- end }}
diff --git a/charts/vault/values.yaml b/charts/vault/values.yaml
index fcdefe8131..304d562d5e 100644
--- a/charts/vault/values.yaml
+++ b/charts/vault/values.yaml
@@ -295,3 +295,8 @@ certManager:
     # issuerRef:
     # additionalDomains:
     #   - vault.mydomain.com
+
+podDisruptionBudget:
+  enabled: true
+  #minAvailable: 1
+  maxUnavailable: 1