diff --git a/charts/commento/Chart.yaml b/charts/commento/Chart.yaml
index 3a0d09feed296b00ea08ee906f509ebdfab684db..2992ba883dd16ee6214ecbda28396342134dc3ae 100644
--- a/charts/commento/Chart.yaml
+++ b/charts/commento/Chart.yaml
@@ -7,12 +7,12 @@ type: application
 maintainers:
   - name: groundhog2k
 
-version: 0.1.32
+version: "0.1.33"
 
 appVersion: "v1.8.0"
 
 dependencies:
   - name: postgres
-    version: 0.2.23
+    version: "0.2.23"
     repository: "https://groundhog2k.github.io/helm-charts"
     condition: postgres.enabled
diff --git a/charts/commento/README.md b/charts/commento/README.md
index 4e7def323cb2a117c404ca8c776b8d0d23817e0b..dcfffaecfbacbf966a35dbf611e519b37b1e506d 100644
--- a/charts/commento/README.md
+++ b/charts/commento/README.md
@@ -1,6 +1,6 @@
 # Commento
 
-![Version: 0.1.32](https://img.shields.io/badge/Version-0.1.32-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: v1.8.0](https://img.shields.io/badge/AppVersion-v1.8.0-informational?style=flat-square)
+![Version: 0.1.33](https://img.shields.io/badge/Version-0.1.33-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: v1.8.0](https://img.shields.io/badge/AppVersion-v1.8.0-informational?style=flat-square)
 
 ## Changelog
 
diff --git a/charts/commento/RELEASENOTES.md b/charts/commento/RELEASENOTES.md
index baed25673fe07d7334c2ccfcab578dbfd801380f..beb1ff3a03f525705bebdfd631b7dd2678813f58 100644
--- a/charts/commento/RELEASENOTES.md
+++ b/charts/commento/RELEASENOTES.md
@@ -14,4 +14,5 @@
 | 0.1.30 | v1.8.0 | Updated chart dependencies (postgres 0.2.22) |
 | 0.1.31 | v1.8.0 | Updated chart dependencies (postgres 0.2.23) |
 | 0.1.32 | v1.8.0 | Fixed values documentation - thx @generalovmaksim |
+| 0.1.33 | v1.8.0 | Updated version detection for pod disruption budget |
 | | | |
diff --git a/charts/commento/templates/pdp.yaml b/charts/commento/templates/pdp.yaml
index ebbbb25586359ea54ed7cb48185c4bcd6b574d47..591da2f1d281a29aec34702af6f5fd8f30854b90 100644
--- a/charts/commento/templates/pdp.yaml
+++ b/charts/commento/templates/pdp.yaml
@@ -1,5 +1,5 @@
 {{- if and (.Values.podDisruptionBudget) (or .Values.podDisruptionBudget.minAvailable .Values.podDisruptionBudget.maxUnavailable) }}
-{{- if semverCompare ">=1.21" .Capabilities.KubeVersion.Version }}
+{{- if .Capabilities.APIVersions.Has "policy/v1" }}
 apiVersion: policy/v1
 {{- else }}
 apiVersion: policy/v1beta1
diff --git a/charts/graylog/Chart.yaml b/charts/graylog/Chart.yaml
index 75be3739fb4334ada611aecb1508c7b4f766c1ae..487e0adae5368f9b14a3db2163037ab27b8bba1f 100644
--- a/charts/graylog/Chart.yaml
+++ b/charts/graylog/Chart.yaml
@@ -7,16 +7,16 @@ type: application
 maintainers:
   - name: groundhog2k
 
-version: "0.5.4"
+version: "0.5.5"
 
 appVersion: "5.0.3"
 
 dependencies:
   - name: mongodb
-    version: 0.4.16
+    version: "0.4.16"
     repository: "https://groundhog2k.github.io/helm-charts"
     condition: mongodb.enabled
   - name: elasticsearch
-    version: 0.1.106
+    version: "0.1.106"
     repository: "https://groundhog2k.github.io/helm-charts"
     condition: elasticsearch.enabled
diff --git a/charts/graylog/README.md b/charts/graylog/README.md
index f1664c76b59079ea356ce97b8c5502bf6da07d47..c64c8f690a0b8cecb1eaf1273571e961359b813b 100644
--- a/charts/graylog/README.md
+++ b/charts/graylog/README.md
@@ -1,6 +1,6 @@
 # Graylog
 
-![Version: 0.5.4](https://img.shields.io/badge/Version-0.5.4-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 5.0.3](https://img.shields.io/badge/AppVersion-5.0.3-informational?style=flat-square)
+![Version: 0.5.5](https://img.shields.io/badge/Version-0.5.5-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 5.0.3](https://img.shields.io/badge/AppVersion-5.0.3-informational?style=flat-square)
 
 ## Changelog
 
diff --git a/charts/graylog/RELEASENOTES.md b/charts/graylog/RELEASENOTES.md
index 41eb1e3410db59492dbb26f50574012ee099316b..ddfe06d6f23f00b2a9391e938c5155df48f11d99 100644
--- a/charts/graylog/RELEASENOTES.md
+++ b/charts/graylog/RELEASENOTES.md
@@ -38,4 +38,5 @@
 | 0.5.2 | 5.0.2 | Updated chart for Graylog 5.0.2 and chart dependencies (mongodb 0.4.16) |
 | 0.5.3 | 5.0.2 | Fixed values documentation - thx @generalovmaksim |
 | 0.5.4 | 5.0.3 | Updated chart for Graylog 5.0.3 | 
+| 0.5.5 | 5.0.3 | Updated version detection for pod disruption budget |
 | | | |
diff --git a/charts/graylog/templates/pdp.yaml b/charts/graylog/templates/pdp.yaml
index cfc40797c066c5ba0eef09d98f70c04b4729db5e..1ba2aadee3ab29c16ce41b33d070439b925166c6 100644
--- a/charts/graylog/templates/pdp.yaml
+++ b/charts/graylog/templates/pdp.yaml
@@ -1,5 +1,5 @@
 {{- if and (.Values.podDisruptionBudget) (or .Values.podDisruptionBudget.minAvailable .Values.podDisruptionBudget.maxUnavailable) }}
-{{- if semverCompare ">=1.21" .Capabilities.KubeVersion.Version }}
+{{- if .Capabilities.APIVersions.Has "policy/v1" }}
 apiVersion: policy/v1
 {{- else }}
 apiVersion: policy/v1beta1
diff --git a/charts/nextcloud/Chart.yaml b/charts/nextcloud/Chart.yaml
index 09ed28331132073c3f5da69cc96e5807fbce4653..121d1157e9faf06602307fe5bc1bc4fcfeff0ee0 100644
--- a/charts/nextcloud/Chart.yaml
+++ b/charts/nextcloud/Chart.yaml
@@ -8,21 +8,21 @@ maintainers:
   - name: groundhog2k
 
 # This is the chart version.
-version: 0.12.7
+version: "0.12.8"
 
 # This is the version number of the application being deployed.
 appVersion: "25.0.3-apache"
 
 dependencies:
   - name: mariadb
-    version: 0.2.24
+    version: "0.2.24"
     repository: "https://groundhog2k.github.io/helm-charts"
     condition: mariadb.enabled
   - name: postgres
-    version: 0.2.23
+    version: "0.2.23"
     repository: "https://groundhog2k.github.io/helm-charts"
     condition: postgres.enabled
   - name: redis
-    version: 0.6.1
+    version: "0.6.1"
     repository: "https://groundhog2k.github.io/helm-charts"
     condition: redis.enabled
diff --git a/charts/nextcloud/README.md b/charts/nextcloud/README.md
index c9cf4feea6d171b45d0e226662321fdecacb6327..9721096a39ca3992a824099c6e42cf55ce01dcb5 100644
--- a/charts/nextcloud/README.md
+++ b/charts/nextcloud/README.md
@@ -1,6 +1,6 @@
 # Nextcloud
 
-![Version: 0.12.7](https://img.shields.io/badge/Version-0.12.7-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 25.0.3-apache](https://img.shields.io/badge/AppVersion-25.0.3-informational?style=flat-square)
+![Version: 0.12.8](https://img.shields.io/badge/Version-0.12.8-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 25.0.3-apache](https://img.shields.io/badge/AppVersion-25.0.3-informational?style=flat-square)
 
 ## Changelog
 
diff --git a/charts/nextcloud/RELEASENOTES.md b/charts/nextcloud/RELEASENOTES.md
index 530fef2fedd133aa8ada20e2ec9011b96ec0684f..70f1b2d813ae73082aaa585123b9f99c2c6f3170 100644
--- a/charts/nextcloud/RELEASENOTES.md
+++ b/charts/nextcloud/RELEASENOTES.md
@@ -34,4 +34,5 @@
 | 0.12.5 | 25.0.2-apache | Updated chart dependencies (redis 0.6.0) |
 | 0.12.6 | 25.0.2-apache | Fixed valued documentation - thx @generalovmaksim |
 | 0.12.7 | 25.0.3-apache | Upgraded to Nextcloud 25.0.3 and dependencies (redis 0.6.1) |
+| 0.12.8 | 25.0.3-apache | Updated version detection for pod disruption budget |
 | | | |
diff --git a/charts/nextcloud/templates/pdp.yaml b/charts/nextcloud/templates/pdp.yaml
index b8f305c4bd96c52b9375cfdae23a7b5a4d947d1e..845738a058421dae1e3342d9329fc661a9f44801 100644
--- a/charts/nextcloud/templates/pdp.yaml
+++ b/charts/nextcloud/templates/pdp.yaml
@@ -1,5 +1,5 @@
 {{- if and (.Values.podDisruptionBudget) (or .Values.podDisruptionBudget.minAvailable .Values.podDisruptionBudget.maxUnavailable) }}
-{{- if semverCompare ">=1.21" .Capabilities.KubeVersion.Version }}
+{{- if .Capabilities.APIVersions.Has "policy/v1" }}
 apiVersion: policy/v1
 {{- else }}
 apiVersion: policy/v1beta1
diff --git a/charts/rabbitmq/Chart.yaml b/charts/rabbitmq/Chart.yaml
index a36973753f6b5c6e7955c684eb996e482db7195f..39e77f8a21e39674663656d6f8575a41f984bbdc 100644
--- a/charts/rabbitmq/Chart.yaml
+++ b/charts/rabbitmq/Chart.yaml
@@ -7,6 +7,6 @@ type: application
 maintainers:
   - name: groundhog2k
 
-version: "0.6.8"
+version: "0.6.9"
 
 appVersion: "3.11.8"
diff --git a/charts/rabbitmq/README.md b/charts/rabbitmq/README.md
index 019a14286c214180496f0b45df0397043b63a811..93b406606fd67bf7d8827d64cc387247b594637f 100644
--- a/charts/rabbitmq/README.md
+++ b/charts/rabbitmq/README.md
@@ -1,6 +1,6 @@
 # RabbitMQ
 
-![Version: 0.6.8](https://img.shields.io/badge/Version-0.6.8-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 3.11.8](https://img.shields.io/badge/AppVersion-3.11.8-informational?style=flat-square)
+![Version: 0.6.9](https://img.shields.io/badge/Version-0.6.9-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 3.11.8](https://img.shields.io/badge/AppVersion-3.11.8-informational?style=flat-square)
 
 ## Changelog
 
diff --git a/charts/rabbitmq/RELEASENOTES.md b/charts/rabbitmq/RELEASENOTES.md
index 896735b38a73dbfbcd86f34705bd6a103f599115..1490a7002854f5fdb9a44f7473fcc1f8686e97eb 100644
--- a/charts/rabbitmq/RELEASENOTES.md
+++ b/charts/rabbitmq/RELEASENOTES.md
@@ -60,4 +60,5 @@
 | 0.6.6 | 3.11.6 | Upgraded to RabbitMQ 3.11.6 |
 | 0.6.7 | 3.11.7 | Upgraded to RabbitMQ 3.11.7 |
 | 0.6.8 | 3.11.8 | Upgraded to RabbitMQ 3.11.8 |
+| 0.6.8 | 3.11.8 | Updated version detection for pod disruption budget |
 | | | |
diff --git a/charts/rabbitmq/templates/pdb.yaml b/charts/rabbitmq/templates/pdb.yaml
index c5c2f0adca300471de2047934c18373a17a82b21..55ebcd4f52f307b5e344b133a4032687e930d28a 100644
--- a/charts/rabbitmq/templates/pdb.yaml
+++ b/charts/rabbitmq/templates/pdb.yaml
@@ -1,5 +1,5 @@
 {{- if and (.Values.podDisruptionBudget) (or .Values.podDisruptionBudget.minAvailable .Values.podDisruptionBudget.maxUnavailable) }}
-{{- if semverCompare ">=1.21" .Capabilities.KubeVersion.Version }}
+{{- if .Capabilities.APIVersions.Has "policy/v1" }}
 apiVersion: policy/v1
 {{- else }}
 apiVersion: policy/v1beta1
diff --git a/charts/redis/Chart.yaml b/charts/redis/Chart.yaml
index 7ca71462d9ad2730b5ba8f641eac07f89b2734e8..4fce0ac65c9be85a4d1ab3ed1c3cf4513ef45cc6 100644
--- a/charts/redis/Chart.yaml
+++ b/charts/redis/Chart.yaml
@@ -8,7 +8,7 @@ maintainers:
   - name: groundhog2k
 
 # This is the chart version
-version: 0.4.13
+version: "0.6.2"
 
 # This is the version number of the application being deployed.
-appVersion: "6.2.10"
+appVersion: "7.0.8"
diff --git a/charts/redis/README.md b/charts/redis/README.md
index 1bcc66533823424abd8b6f084232ea45c873d80d..607c5984a3364edad5618486f9d9ced6c3ebdc54 100644
--- a/charts/redis/README.md
+++ b/charts/redis/README.md
@@ -1,6 +1,6 @@
 # Redis
 
-![Version: 0.6.1](https://img.shields.io/badge/Version-0.6.1-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 7.0.8](https://img.shields.io/badge/AppVersion-7.0.8-informational?style=flat-square)
+![Version: 0.6.2](https://img.shields.io/badge/Version-0.6.2-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 7.0.8](https://img.shields.io/badge/AppVersion-7.0.8-informational?style=flat-square)
 
 ## Changelog
 
diff --git a/charts/redis/RELEASENOTES.md b/charts/redis/RELEASENOTES.md
index 0dc62b148787af9722e2fcc299a1bfbdb7e70e27..898305b336ac2d3c5a82196f94b9118faca3ae88 100644
--- a/charts/redis/RELEASENOTES.md
+++ b/charts/redis/RELEASENOTES.md
@@ -19,4 +19,5 @@
 | 0.5.10 | 7.0.7 | Upgraded to Redis 7.0.7 |
 | 0.6.0 | 7.0.7 | Implemented alternative DNS option for cluster building |
 | 0.6.1 | 7.0.8 | Upgraded to Redis 7.0.8 |
+| 0.6.2 | 7.0.8 | Updated version detection for pod disruption budget |
 | | | |
diff --git a/charts/redis/templates/pdp.yaml b/charts/redis/templates/pdp.yaml
index bec0d88c4f5cbed8f92c5709f7539e0e4009156d..2bd2b97f8b6ad3f585d37f7b2afe231facef0f3f 100644
--- a/charts/redis/templates/pdp.yaml
+++ b/charts/redis/templates/pdp.yaml
@@ -1,5 +1,5 @@
 {{- if and (.Values.podDisruptionBudget) (or .Values.podDisruptionBudget.minAvailable .Values.podDisruptionBudget.maxUnavailable) }}
-{{- if semverCompare ">=1.21" .Capabilities.KubeVersion.Version }}
+{{- if .Capabilities.APIVersions.Has "policy/v1" }}
 apiVersion: policy/v1
 {{- else }}
 apiVersion: policy/v1beta1
diff --git a/charts/wordpress/Chart.yaml b/charts/wordpress/Chart.yaml
index c6025d7bfd623ec8b29587ea582e10243ff9056f..17e9a128ce22ea358ac7bef74e3cba8aac51a40b 100644
--- a/charts/wordpress/Chart.yaml
+++ b/charts/wordpress/Chart.yaml
@@ -8,13 +8,13 @@ maintainers:
 type: application
 
 # This is the chart version.
-version: 0.7.3
+version: "0.7.4"
 
 # This is the version number of the application being deployed.
 appVersion: "6.1.1-apache"
 
 dependencies:
   - name: mariadb
-    version: 0.2.24
+    version: "0.2.24"
     repository: "https://groundhog2k.github.io/helm-charts"
     condition: mariadb.enabled
diff --git a/charts/wordpress/README.md b/charts/wordpress/README.md
index b81c13e6694023d9a6e78d9025d6e3e23d0bfcfe..230d6a767ac29fad584a6f7abeace82173ce3a17 100644
--- a/charts/wordpress/README.md
+++ b/charts/wordpress/README.md
@@ -1,6 +1,6 @@
 # Wordpress
 
-![Version: 0.7.3](https://img.shields.io/badge/Version-0.7.3-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 6.1.1-apache](https://img.shields.io/badge/AppVersion-6.1.1--apache-informational?style=flat-square)
+![Version: 0.7.4](https://img.shields.io/badge/Version-0.7.4-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 6.1.1-apache](https://img.shields.io/badge/AppVersion-6.1.1--apache-informational?style=flat-square)
 
 ## Changelog
 
diff --git a/charts/wordpress/RELEASENOTES.md b/charts/wordpress/RELEASENOTES.md
index efc2dd96de850f6e73c09f5fdfcd1c4f1bb24759..2ecc1d451a370278b17f4c8912eaa4d7207e3b99 100644
--- a/charts/wordpress/RELEASENOTES.md
+++ b/charts/wordpress/RELEASENOTES.md
@@ -21,4 +21,5 @@
 | 0.7.1 | 6.1.1-apache | Upgraded to Wordpress 6.1.1 |
 | 0.7.2 | 6.1.1-apache | Updated chart dependencies (mariadb 0.2.24) |
 | 0.7.3 | 6.1.1-apache | Fixed values documentation - thx @generalovmaksim |
+| 0.7.4 | 6.1.1-apache | Updated version detection for pod disruption budget |
 | | | |
diff --git a/charts/wordpress/templates/pdp.yaml b/charts/wordpress/templates/pdp.yaml
index 29316d2ca8935d9336956e53659fa53168b99522..e09e6daebda15002eb6c1c620455b7f5ebdd91c2 100644
--- a/charts/wordpress/templates/pdp.yaml
+++ b/charts/wordpress/templates/pdp.yaml
@@ -1,5 +1,5 @@
 {{- if and (.Values.podDisruptionBudget) (or .Values.podDisruptionBudget.minAvailable .Values.podDisruptionBudget.maxUnavailable) }}
-{{- if semverCompare ">=1.21" .Capabilities.KubeVersion.Version }}
+{{- if .Capabilities.APIVersions.Has "policy/v1" }}
 apiVersion: policy/v1
 {{- else }}
 apiVersion: policy/v1beta1