diff --git a/bitnami/kiam/CHANGELOG.md b/bitnami/kiam/CHANGELOG.md
index b949b5f24d3c7f..bdd6e8d13df778 100644
--- a/bitnami/kiam/CHANGELOG.md
+++ b/bitnami/kiam/CHANGELOG.md
@@ -1,8 +1,12 @@
 # Changelog
 
-## 2.1.1 (2024-05-23)
+## 2.2.0 (2024-05-28)
 
-* [bitnami/kiam] Use different liveness/readiness probes ([#26370](https://github.com/bitnami/charts/pull/26370))
+* [bitnami/kiam] Enable PodDisruptionBudgets ([#26500](https://github.com/bitnami/charts/pull/26500))
+
+## <small>2.1.1 (2024-05-23)</small>
+
+* [bitnami/kiam] Use different liveness/readiness probes (#26370) ([ef14a50](https://github.com/bitnami/charts/commit/ef14a506d8116ece0a140790725dcaa5abc4696b)), closes [#26370](https://github.com/bitnami/charts/issues/26370)
 
 ## 2.1.0 (2024-05-21)
 
diff --git a/bitnami/kiam/Chart.yaml b/bitnami/kiam/Chart.yaml
index 2c08fce905f21e..9d4c641d8c93f5 100644
--- a/bitnami/kiam/Chart.yaml
+++ b/bitnami/kiam/Chart.yaml
@@ -28,4 +28,4 @@ maintainers:
 name: kiam
 sources:
 - https://github.com/bitnami/charts/tree/main/bitnami/kiam
-version: 2.1.1
+version: 2.2.0
diff --git a/bitnami/kiam/README.md b/bitnami/kiam/README.md
index 4763b2034caed3..36c6716552421b 100644
--- a/bitnami/kiam/README.md
+++ b/bitnami/kiam/README.md
@@ -279,6 +279,9 @@ If managing TLS secrets outside of Helm, it is possible to create a TLS secret (
 | `server.extraVolumes`                                      | Optionally specify extra list of additional volumes for kiam pods                                                                                                                                                               | `[]`             |
 | `server.extraVolumeMounts`                                 | Optionally specify extra list of additional volumeMounts for kiam container(s)                                                                                                                                                  | `[]`             |
 | `server.initContainers`                                    | Add additional init containers to the kiam pods                                                                                                                                                                                 | `[]`             |
+| `server.pdb.create`                                        | Enable/disable a Pod Disruption Budget creation                                                                                                                                                                                 | `true`           |
+| `server.pdb.minAvailable`                                  | Minimum number/percentage of pods that should remain scheduled                                                                                                                                                                  | `""`             |
+| `server.pdb.maxUnavailable`                                | Maximum number/percentage of pods that may be made unavailable. Defaults to `1` if both `server.pdb.minAvailable` and `server.pdb.maxUnavailable` are empty.                                                                    | `""`             |
 | `server.sidecars`                                          | Add additional sidecar containers to the kiam pods                                                                                                                                                                              | `[]`             |
 
 ### kiam server exposure parameters
diff --git a/bitnami/kiam/templates/server/server-pdb.yaml b/bitnami/kiam/templates/server/server-pdb.yaml
new file mode 100644
index 00000000000000..2631768e8a9950
--- /dev/null
+++ b/bitnami/kiam/templates/server/server-pdb.yaml
@@ -0,0 +1,28 @@
+{{- /*
+Copyright Broadcom, Inc. All Rights Reserved.
+SPDX-License-Identifier: APACHE-2.0
+*/}}
+
+{{- if and .Values.server.enabled (eq .Values.server.resourceType "deployment") .Values.server.pdb.create }}
+apiVersion: {{ include "common.capabilities.policy.apiVersion" . }}
+kind: PodDisruptionBudget
+metadata:
+  name: {{ template "common.names.fullname" . }}-server
+  namespace: {{ include "common.names.namespace" . | quote }}
+  labels: {{- include "common.labels.standard" ( dict "customLabels" .Values.commonLabels "context" $ ) | nindent 4 }}
+    app.kubernetes.io/component: server
+  {{- if .Values.commonAnnotations }}
+  annotations: {{- include "common.tplvalues.render" ( dict "value" .Values.commonAnnotations "context" $ ) | nindent 4 }}
+  {{- end }}
+spec:
+  {{- if .Values.server.pdb.minAvailable }}
+  minAvailable: {{ .Values.server.pdb.minAvailable }}
+  {{- end  }}
+  {{- if or .Values.server.pdb.maxUnavailable ( not .Values.server.pdb.minAvailable ) }}
+  maxUnavailable: {{ .Values.server.pdb.maxUnavailable | default 1 }}
+  {{- end  }}
+  {{- $podLabels := include "common.tplvalues.merge" ( dict "values" ( list .Values.server.podLabels .Values.commonLabels ) "context" . ) }}
+  selector:
+    matchLabels: {{- include "common.labels.matchLabels" ( dict "customLabels" $podLabels "context" $ ) | nindent 6 }}
+      app.kubernetes.io/component: server
+{{- end }}
diff --git a/bitnami/kiam/values.yaml b/bitnami/kiam/values.yaml
index 284a2607ad1fa6..6b82db34192ecc 100644
--- a/bitnami/kiam/values.yaml
+++ b/bitnami/kiam/values.yaml
@@ -388,6 +388,16 @@ server:
   ##         containerPort: 1234
   ##
   initContainers: []
+  ## Pod Disruption Budget configuration
+  ## ref: https://kubernetes.io/docs/tasks/run-application/configure-pdb
+  ## @param server.pdb.create Enable/disable a Pod Disruption Budget creation
+  ## @param server.pdb.minAvailable Minimum number/percentage of pods that should remain scheduled
+  ## @param server.pdb.maxUnavailable Maximum number/percentage of pods that may be made unavailable. Defaults to `1` if both `server.pdb.minAvailable` and `server.pdb.maxUnavailable` are empty.
+  ##
+  pdb:
+    create: true
+    minAvailable: ""
+    maxUnavailable: ""
   ## @param server.sidecars Add additional sidecar containers to the kiam pods
   ## Example:
   ## sidecars: