diff --git a/.gitignore b/.gitignore
index 38075bbfd7..fc5c6db5f5 100644
--- a/.gitignore
+++ b/.gitignore
@@ -58,6 +58,7 @@ releasenotes/build
 
 # Dev tools
 .idea/
+.vscode/
 **/.vagrant
 **/*.log
 
diff --git a/aodh/Chart.yaml b/aodh/Chart.yaml
index e6c72454f9..eea7192c69 100644
--- a/aodh/Chart.yaml
+++ b/aodh/Chart.yaml
@@ -16,7 +16,7 @@ apiVersion: v1
 appVersion: v1.0.0
 description: Openstack-Helm Aodh
 name: aodh
-version: 0.2.3
+version: 0.2.4
 home: https://docs.openstack.org/aodh/latest/
 sources:
   - https://opendev.org/openstack/aodh
diff --git a/aodh/templates/cron-job-alarms-cleaner.yaml b/aodh/templates/cron-job-alarms-cleaner.yaml
index 35f78e4356..ec0b58f7ad 100644
--- a/aodh/templates/cron-job-alarms-cleaner.yaml
+++ b/aodh/templates/cron-job-alarms-cleaner.yaml
@@ -23,7 +23,7 @@ limitations under the License.
 {{- $serviceAccountName := "aodh-alarms-cleaner" }}
 {{ tuple $envAll "alarms_cleaner" $serviceAccountName | include "helm-toolkit.snippets.kubernetes_pod_rbac_serviceaccount" }}
 ---
-apiVersion: batch/v1beta1
+apiVersion: batch/v1
 kind: CronJob
 metadata:
   name: aodh-alarms-cleaner
diff --git a/aodh/templates/pdb-api.yaml b/aodh/templates/pdb-api.yaml
index 800b8e9844..acdc6a6e56 100644
--- a/aodh/templates/pdb-api.yaml
+++ b/aodh/templates/pdb-api.yaml
@@ -17,7 +17,7 @@ limitations under the License.
 {{- if .Values.manifests.pdb_api }}
 {{- $envAll := . }}
 ---
-apiVersion: policy/v1beta1
+apiVersion: policy/v1
 kind: PodDisruptionBudget
 metadata:
   name: aodh-api
diff --git a/barbican/Chart.yaml b/barbican/Chart.yaml
index 4caead28c4..8eb2e340c8 100644
--- a/barbican/Chart.yaml
+++ b/barbican/Chart.yaml
@@ -14,7 +14,7 @@ apiVersion: v1
 appVersion: v1.0.0
 description: OpenStack-Helm Barbican
 name: barbican
-version: 0.2.12
+version: 0.2.13
 home: https://docs.openstack.org/barbican/latest/
 icon: https://www.openstack.org/themes/openstack/images/project-mascots/Barbican/OpenStack_Project_Barbican_vertical.png
 sources:
diff --git a/barbican/templates/pdb-api.yaml b/barbican/templates/pdb-api.yaml
index e155d76a3f..77e7752ace 100644
--- a/barbican/templates/pdb-api.yaml
+++ b/barbican/templates/pdb-api.yaml
@@ -15,7 +15,7 @@ limitations under the License.
 {{- if .Values.manifests.pdb_api }}
 {{- $envAll := . }}
 ---
-apiVersion: policy/v1beta1
+apiVersion: policy/v1
 kind: PodDisruptionBudget
 metadata:
   name: barbican-api
diff --git a/ceilometer/Chart.yaml b/ceilometer/Chart.yaml
index f786dbcdb5..18e5c5a463 100644
--- a/ceilometer/Chart.yaml
+++ b/ceilometer/Chart.yaml
@@ -14,7 +14,7 @@ apiVersion: v1
 appVersion: v1.0.0
 description: OpenStack-Helm Ceilometer
 name: ceilometer
-version: 0.2.4
+version: 0.2.5
 home: https://docs.openstack.org/ceilometer/latest/
 sources:
   - https://opendev.org/openstack/ceilometer
diff --git a/ceilometer/templates/pdb-api.yaml b/ceilometer/templates/pdb-api.yaml
index 36de5180c9..7e46f90b4e 100644
--- a/ceilometer/templates/pdb-api.yaml
+++ b/ceilometer/templates/pdb-api.yaml
@@ -15,7 +15,7 @@ limitations under the License.
 {{- if .Values.manifests.pdb_api }}
 {{- $envAll := . }}
 ---
-apiVersion: policy/v1beta1
+apiVersion: policy/v1
 kind: PodDisruptionBudget
 metadata:
   name: ceilometer-api
diff --git a/cinder/Chart.yaml b/cinder/Chart.yaml
index b3e17da8b0..2823407335 100644
--- a/cinder/Chart.yaml
+++ b/cinder/Chart.yaml
@@ -14,7 +14,7 @@ apiVersion: v1
 appVersion: v1.0.0
 description: OpenStack-Helm Cinder
 name: cinder
-version: 0.2.20
+version: 0.2.21
 home: https://docs.openstack.org/cinder/latest/
 icon: https://www.openstack.org/themes/openstack/images/project-mascots/Cinder/OpenStack_Project_Cinder_vertical.png
 sources:
diff --git a/cinder/templates/cron-job-cinder-volume-usage-audit.yaml b/cinder/templates/cron-job-cinder-volume-usage-audit.yaml
index 4b1520819f..c1c317c3a0 100644
--- a/cinder/templates/cron-job-cinder-volume-usage-audit.yaml
+++ b/cinder/templates/cron-job-cinder-volume-usage-audit.yaml
@@ -21,7 +21,7 @@ limitations under the License.
 {{- $serviceAccountName := "cinder-volume-usage-audit" }}
 {{ tuple $envAll "volume_usage_audit" $serviceAccountName | include "helm-toolkit.snippets.kubernetes_pod_rbac_serviceaccount" }}
 ---
-apiVersion: batch/v1beta1
+apiVersion: batch/v1
 kind: CronJob
 metadata:
   name: cinder-volume-usage-audit
diff --git a/cinder/templates/pdb-api.yaml b/cinder/templates/pdb-api.yaml
index d90869bcb3..a6e8d16e50 100644
--- a/cinder/templates/pdb-api.yaml
+++ b/cinder/templates/pdb-api.yaml
@@ -15,7 +15,7 @@ limitations under the License.
 {{- if .Values.manifests.pdb_api }}
 {{- $envAll := . }}
 ---
-apiVersion: policy/v1beta1
+apiVersion: policy/v1
 kind: PodDisruptionBudget
 metadata:
   name: cinder-api
diff --git a/cyborg/Chart.yaml b/cyborg/Chart.yaml
index e97eb0a180..da379cdd0d 100644
--- a/cyborg/Chart.yaml
+++ b/cyborg/Chart.yaml
@@ -14,7 +14,7 @@ apiVersion: v1
 appVersion: v1.0.0
 description: OpenStack-Helm Cyborg
 name: cyborg
-version: 0.1.0
+version: 0.1.1
 home: https://docs.openstack.org/cyborg
 icon: https://www.openstack.org/themes/openstack/images/project-mascots/Cyborg/OpenStack_Project_Cyborg_vertical.png
 sources:
diff --git a/cyborg/templates/pdb-api.yaml b/cyborg/templates/pdb-api.yaml
index 68092901ef..09253fbc74 100644
--- a/cyborg/templates/pdb-api.yaml
+++ b/cyborg/templates/pdb-api.yaml
@@ -15,7 +15,7 @@ limitations under the License.
 {{- if .Values.manifests.pdb_api }}
 {{- $envAll := . }}
 ---
-apiVersion: policy/v1beta1
+apiVersion: policy/v1
 kind: PodDisruptionBudget
 metadata:
   name: cyborg-api
diff --git a/designate/Chart.yaml b/designate/Chart.yaml
index 6d49b06dd2..a4eb6ba0ec 100644
--- a/designate/Chart.yaml
+++ b/designate/Chart.yaml
@@ -14,7 +14,7 @@ apiVersion: v1
 appVersion: v1.0.0
 description: OpenStack-Helm Designate
 name: designate
-version: 0.2.4
+version: 0.2.5
 home: https://docs.openstack.org/designate/latest/
 icon: https://www.openstack.org/themes/openstack/images/project-mascots/Designate/OpenStack_Project_Designate_vertical.jpg
 sources:
diff --git a/designate/templates/pdb-api.yaml b/designate/templates/pdb-api.yaml
index 498f763b3b..31c153256a 100644
--- a/designate/templates/pdb-api.yaml
+++ b/designate/templates/pdb-api.yaml
@@ -13,7 +13,7 @@
 
 {{- $envAll := . }}
 ---
-apiVersion: policy/v1beta1
+apiVersion: policy/v1
 kind: PodDisruptionBudget
 metadata:
   name: designate-api
diff --git a/designate/templates/pdb-central.yaml b/designate/templates/pdb-central.yaml
index 3be7c1c2c8..54b8139981 100644
--- a/designate/templates/pdb-central.yaml
+++ b/designate/templates/pdb-central.yaml
@@ -13,7 +13,7 @@
 
 {{- $envAll := . }}
 ---
-apiVersion: policy/v1beta1
+apiVersion: policy/v1
 kind: PodDisruptionBudget
 metadata:
   name: designate-central
diff --git a/designate/templates/pdb-mdns.yaml b/designate/templates/pdb-mdns.yaml
index 138b5f1700..b14861c400 100644
--- a/designate/templates/pdb-mdns.yaml
+++ b/designate/templates/pdb-mdns.yaml
@@ -13,7 +13,7 @@
 
 {{- $envAll := . }}
 ---
-apiVersion: policy/v1beta1
+apiVersion: policy/v1
 kind: PodDisruptionBudget
 metadata:
   name: designate-mdns
diff --git a/designate/templates/pdb-producer.yaml b/designate/templates/pdb-producer.yaml
index 71d9d4d397..6fa245019b 100644
--- a/designate/templates/pdb-producer.yaml
+++ b/designate/templates/pdb-producer.yaml
@@ -13,7 +13,7 @@
 
 {{- $envAll := . }}
 ---
-apiVersion: policy/v1beta1
+apiVersion: policy/v1
 kind: PodDisruptionBudget
 metadata:
   name: designate-producer
diff --git a/designate/templates/pdb-sink.yaml b/designate/templates/pdb-sink.yaml
index fc8f7a1bba..27acd0a613 100644
--- a/designate/templates/pdb-sink.yaml
+++ b/designate/templates/pdb-sink.yaml
@@ -13,7 +13,7 @@
 
 {{- $envAll := . }}
 ---
-apiVersion: policy/v1beta1
+apiVersion: policy/v1
 kind: PodDisruptionBudget
 metadata:
   name: designate-sink
diff --git a/designate/templates/pdb-worker.yaml b/designate/templates/pdb-worker.yaml
index 33498a8d20..8af1ca4a05 100644
--- a/designate/templates/pdb-worker.yaml
+++ b/designate/templates/pdb-worker.yaml
@@ -13,7 +13,7 @@
 
 {{- $envAll := . }}
 ---
-apiVersion: policy/v1beta1
+apiVersion: policy/v1
 kind: PodDisruptionBudget
 metadata:
   name: designate-worker
diff --git a/glance/Chart.yaml b/glance/Chart.yaml
index 00f9677e6d..a308385c8b 100644
--- a/glance/Chart.yaml
+++ b/glance/Chart.yaml
@@ -14,7 +14,7 @@ apiVersion: v1
 appVersion: v1.0.0
 description: OpenStack-Helm Glance
 name: glance
-version: 0.3.4
+version: 0.3.5
 home: https://docs.openstack.org/glance/latest/
 icon: https://www.openstack.org/themes/openstack/images/project-mascots/Glance/OpenStack_Project_Glance_vertical.png
 sources:
diff --git a/glance/templates/pdb-api.yaml b/glance/templates/pdb-api.yaml
index a14ce0490f..0b27650bdd 100644
--- a/glance/templates/pdb-api.yaml
+++ b/glance/templates/pdb-api.yaml
@@ -15,7 +15,7 @@ limitations under the License.
 {{- if .Values.manifests.pdb_api }}
 {{- $envAll := . }}
 ---
-apiVersion: policy/v1beta1
+apiVersion: policy/v1
 kind: PodDisruptionBudget
 metadata:
   name: glance-api
diff --git a/heat/Chart.yaml b/heat/Chart.yaml
index ebb0c7a400..51b912d1ef 100644
--- a/heat/Chart.yaml
+++ b/heat/Chart.yaml
@@ -14,7 +14,7 @@ apiVersion: v1
 appVersion: v1.0.0
 description: OpenStack-Helm Heat
 name: heat
-version: 0.2.11
+version: 0.2.12
 home: https://docs.openstack.org/heat/latest/
 icon: https://www.openstack.org/themes/openstack/images/project-mascots/Heat/OpenStack_Project_Heat_vertical.png
 sources:
diff --git a/heat/templates/cron-job-engine-cleaner.yaml b/heat/templates/cron-job-engine-cleaner.yaml
index 329193cb0b..eac56d3006 100644
--- a/heat/templates/cron-job-engine-cleaner.yaml
+++ b/heat/templates/cron-job-engine-cleaner.yaml
@@ -21,7 +21,7 @@ limitations under the License.
 {{- $serviceAccountName := "heat-engine-cleaner" }}
 {{ tuple $envAll "engine_cleaner" $serviceAccountName | include "helm-toolkit.snippets.kubernetes_pod_rbac_serviceaccount" }}
 ---
-apiVersion: batch/v1beta1
+apiVersion: batch/v1
 kind: CronJob
 metadata:
   name: heat-engine-cleaner
diff --git a/heat/templates/cron-job-purge-deleted.yaml b/heat/templates/cron-job-purge-deleted.yaml
index 987b572cd9..936d52b6be 100644
--- a/heat/templates/cron-job-purge-deleted.yaml
+++ b/heat/templates/cron-job-purge-deleted.yaml
@@ -21,7 +21,7 @@ limitations under the License.
 {{- $serviceAccountName := "heat-purge-deleted" }}
 {{ tuple $envAll "purge_deleted" $serviceAccountName | include "helm-toolkit.snippets.kubernetes_pod_rbac_serviceaccount" }}
 ---
-apiVersion: batch/v1beta1
+apiVersion: batch/v1
 kind: CronJob
 metadata:
   name: heat-purge-deleted
diff --git a/heat/templates/pdb-api.yaml b/heat/templates/pdb-api.yaml
index 284e079f94..847873c946 100644
--- a/heat/templates/pdb-api.yaml
+++ b/heat/templates/pdb-api.yaml
@@ -15,7 +15,7 @@ limitations under the License.
 {{- if .Values.manifests.pdb_api }}
 {{- $envAll := . }}
 ---
-apiVersion: policy/v1beta1
+apiVersion: policy/v1
 kind: PodDisruptionBudget
 metadata:
   name: heat-api
diff --git a/heat/templates/pdb-cfn.yaml b/heat/templates/pdb-cfn.yaml
index 52a72fbdf3..e78c4f2e03 100644
--- a/heat/templates/pdb-cfn.yaml
+++ b/heat/templates/pdb-cfn.yaml
@@ -15,7 +15,7 @@ limitations under the License.
 {{- if .Values.manifests.pdb_cfn }}
 {{- $envAll := . }}
 ---
-apiVersion: policy/v1beta1
+apiVersion: policy/v1
 kind: PodDisruptionBudget
 metadata:
   name: heat-cfn
diff --git a/heat/templates/pdb-cloudwatch.yaml b/heat/templates/pdb-cloudwatch.yaml
index a0b057b19f..5687967d44 100644
--- a/heat/templates/pdb-cloudwatch.yaml
+++ b/heat/templates/pdb-cloudwatch.yaml
@@ -15,7 +15,7 @@ limitations under the License.
 {{- if .Values.manifests.pdb_cloudwatch }}
 {{- $envAll := . }}
 ---
-apiVersion: policy/v1beta1
+apiVersion: policy/v1
 kind: PodDisruptionBudget
 metadata:
   name: heat-cloudwatch
diff --git a/horizon/Chart.yaml b/horizon/Chart.yaml
index f801c996c9..d17413a0c2 100644
--- a/horizon/Chart.yaml
+++ b/horizon/Chart.yaml
@@ -14,7 +14,7 @@ apiVersion: v1
 appVersion: v1.0.0
 description: OpenStack-Helm Horizon
 name: horizon
-version: 0.2.21
+version: 0.2.22
 home: https://docs.openstack.org/horizon/latest/
 icon: https://www.openstack.org/themes/openstack/images/project-mascots/Horizon/OpenStack_Project_Horizon_vertical.png
 sources:
diff --git a/horizon/templates/pdb.yaml b/horizon/templates/pdb.yaml
index 3dd12ad28d..79679857c2 100644
--- a/horizon/templates/pdb.yaml
+++ b/horizon/templates/pdb.yaml
@@ -15,7 +15,7 @@ limitations under the License.
 {{- if .Values.manifests.pdb }}
 {{- $envAll := . }}
 ---
-apiVersion: policy/v1beta1
+apiVersion: policy/v1
 kind: PodDisruptionBudget
 metadata:
   name: horizon
diff --git a/ironic/Chart.yaml b/ironic/Chart.yaml
index e64c294993..9c1d361c23 100644
--- a/ironic/Chart.yaml
+++ b/ironic/Chart.yaml
@@ -14,7 +14,7 @@ apiVersion: v1
 appVersion: v1.0.0
 description: OpenStack-Helm Ironic
 name: ironic
-version: 0.2.4
+version: 0.2.5
 home: https://docs.openstack.org/ironic/latest/
 icon: https://www.openstack.org/themes/openstack/images/project-mascots/Ironic/OpenStack_Project_Ironic_vertical.png
 sources:
diff --git a/ironic/templates/pdb-api.yaml b/ironic/templates/pdb-api.yaml
index d848d4b4b0..c5a8c9a00a 100644
--- a/ironic/templates/pdb-api.yaml
+++ b/ironic/templates/pdb-api.yaml
@@ -15,7 +15,7 @@ limitations under the License.
 {{- if .Values.manifests.pdb_api }}
 {{- $envAll := . }}
 ---
-apiVersion: policy/v1beta1
+apiVersion: policy/v1
 kind: PodDisruptionBudget
 metadata:
   name: ironic-api
diff --git a/keystone/Chart.yaml b/keystone/Chart.yaml
index 3e8a1fccac..2c4de9fc5e 100644
--- a/keystone/Chart.yaml
+++ b/keystone/Chart.yaml
@@ -14,7 +14,7 @@ apiVersion: v1
 appVersion: v1.0.0
 description: OpenStack-Helm Keystone
 name: keystone
-version: 0.2.24
+version: 0.2.25
 home: https://docs.openstack.org/keystone/latest/
 icon: https://www.openstack.org/themes/openstack/images/project-mascots/Keystone/OpenStack_Project_Keystone_vertical.png
 sources:
diff --git a/keystone/templates/cron-job-credential-rotate.yaml b/keystone/templates/cron-job-credential-rotate.yaml
index 8e9f82fc85..5906079622 100644
--- a/keystone/templates/cron-job-credential-rotate.yaml
+++ b/keystone/templates/cron-job-credential-rotate.yaml
@@ -49,7 +49,7 @@ subjects:
     name: {{ $serviceAccountName }}
     namespace: {{ $envAll.Release.Namespace }}
 ---
-apiVersion: batch/v1beta1
+apiVersion: batch/v1
 kind: CronJob
 metadata:
   name: keystone-credential-rotate
diff --git a/keystone/templates/cron-job-fernet-rotate.yaml b/keystone/templates/cron-job-fernet-rotate.yaml
index 96dcc74d01..a059f929a1 100644
--- a/keystone/templates/cron-job-fernet-rotate.yaml
+++ b/keystone/templates/cron-job-fernet-rotate.yaml
@@ -50,7 +50,7 @@ subjects:
     name: {{ $serviceAccountName }}
     namespace: {{ $envAll.Release.Namespace }}
 ---
-apiVersion: batch/v1beta1
+apiVersion: batch/v1
 kind: CronJob
 metadata:
   name: keystone-fernet-rotate
diff --git a/keystone/templates/pdb.yaml b/keystone/templates/pdb.yaml
index 975a098ba4..65f171b738 100644
--- a/keystone/templates/pdb.yaml
+++ b/keystone/templates/pdb.yaml
@@ -15,7 +15,7 @@ limitations under the License.
 {{- if .Values.manifests.pdb_api }}
 {{- $envAll := . }}
 ---
-apiVersion: policy/v1beta1
+apiVersion: policy/v1
 kind: PodDisruptionBudget
 metadata:
   name: keystone-api
diff --git a/magnum/Chart.yaml b/magnum/Chart.yaml
index 457a1b8a6c..6e24567ba5 100644
--- a/magnum/Chart.yaml
+++ b/magnum/Chart.yaml
@@ -14,7 +14,7 @@ apiVersion: v1
 appVersion: v1.0.0
 description: OpenStack-Helm Magnum
 name: magnum
-version: 0.2.5
+version: 0.2.6
 home: https://docs.openstack.org/magnum/latest/
 icon: https://www.openstack.org/themes/openstack/images/project-mascots/Magnum/OpenStack_Project_Magnum_vertical.png
 sources:
diff --git a/magnum/templates/pdb-api.yaml b/magnum/templates/pdb-api.yaml
index 9c249848a0..db5cf717c4 100644
--- a/magnum/templates/pdb-api.yaml
+++ b/magnum/templates/pdb-api.yaml
@@ -15,7 +15,7 @@ limitations under the License.
 {{- if .Values.manifests.pdb_api }}
 {{- $envAll := . }}
 ---
-apiVersion: policy/v1beta1
+apiVersion: policy/v1
 kind: PodDisruptionBudget
 metadata:
   name: magnum-api
diff --git a/masakari/Chart.yaml b/masakari/Chart.yaml
index 2c86004bb4..9b8942e881 100644
--- a/masakari/Chart.yaml
+++ b/masakari/Chart.yaml
@@ -14,7 +14,7 @@ apiVersion: v1
 appVersion: v1.0.0
 description: OpenStack-Helm Masakari
 name: masakari
-version: 0.1.3
+version: 0.1.4
 home: https://docs.openstack.org/developer/masakari
 icon: https://www.openstack.org/themes/openstack/images/project-mascots/Masakari/OpenStack_Project_masakari_vertical.png
 sources:
diff --git a/masakari/templates/pbd-api.yaml b/masakari/templates/pbd-api.yaml
index 4f3acacb9e..04ff1b76b6 100644
--- a/masakari/templates/pbd-api.yaml
+++ b/masakari/templates/pbd-api.yaml
@@ -15,7 +15,7 @@ limitations under the License.
 {{- if .Values.manifests.pdb_api }}
 {{- $envAll := . }}
 ---
-apiVersion: policy/v1beta1
+apiVersion: policy/v1
 kind: PodDisruptionBudget
 metadata:
   name: masakari-api
diff --git a/mistral/Chart.yaml b/mistral/Chart.yaml
index 9e6d7b6eae..65c35823cb 100644
--- a/mistral/Chart.yaml
+++ b/mistral/Chart.yaml
@@ -14,7 +14,7 @@ apiVersion: v1
 appVersion: v1.0.0
 description: OpenStack-Helm Mistral
 name: mistral
-version: 0.2.3
+version: 0.2.4
 home: https://docs.openstack.org/mistral/latest/
 icon: https://www.openstack.org/themes/openstack/images/project-mascots/Mistral/OpenStack_Project_Mistral_vertical.png
 sources:
diff --git a/mistral/templates/pdb-api.yaml b/mistral/templates/pdb-api.yaml
index 1a9b06e15b..69d576e312 100644
--- a/mistral/templates/pdb-api.yaml
+++ b/mistral/templates/pdb-api.yaml
@@ -15,7 +15,7 @@ limitations under the License.
 {{- if .Values.manifests.pdb_api }}
 {{- $envAll := . }}
 ---
-apiVersion: policy/v1beta1
+apiVersion: policy/v1
 kind: PodDisruptionBudget
 metadata:
   name: mistral-api
diff --git a/neutron/Chart.yaml b/neutron/Chart.yaml
index 67c669e855..2c5f16e63f 100644
--- a/neutron/Chart.yaml
+++ b/neutron/Chart.yaml
@@ -14,7 +14,7 @@ apiVersion: v1
 appVersion: v1.0.0
 description: OpenStack-Helm Neutron
 name: neutron
-version: 0.2.16
+version: 0.2.17
 home: https://docs.openstack.org/neutron/latest/
 icon: https://www.openstack.org/themes/openstack/images/project-mascots/Neutron/OpenStack_Project_Neutron_vertical.png
 sources:
diff --git a/neutron/templates/pdb-server.yaml b/neutron/templates/pdb-server.yaml
index 49ab5fff3e..80f4c4de9b 100644
--- a/neutron/templates/pdb-server.yaml
+++ b/neutron/templates/pdb-server.yaml
@@ -15,7 +15,7 @@ limitations under the License.
 {{- if .Values.manifests.pdb_server }}
 {{- $envAll := . }}
 ---
-apiVersion: policy/v1beta1
+apiVersion: policy/v1
 kind: PodDisruptionBudget
 metadata:
   name: neutron-server
diff --git a/nova/Chart.yaml b/nova/Chart.yaml
index 323e558244..c5b9b58d1f 100644
--- a/nova/Chart.yaml
+++ b/nova/Chart.yaml
@@ -14,7 +14,7 @@ apiVersion: v1
 appVersion: v1.0.0
 description: OpenStack-Helm Nova
 name: nova
-version: 0.2.38
+version: 0.2.39
 home: https://docs.openstack.org/nova/latest/
 icon: https://www.openstack.org/themes/openstack/images/project-mascots/Nova/OpenStack_Project_Nova_vertical.png
 sources:
diff --git a/nova/templates/cron-job-archive-deleted-rows.yaml b/nova/templates/cron-job-archive-deleted-rows.yaml
index a2835ddf2e..7316b3ace7 100644
--- a/nova/templates/cron-job-archive-deleted-rows.yaml
+++ b/nova/templates/cron-job-archive-deleted-rows.yaml
@@ -18,7 +18,7 @@ limitations under the License.
 {{- $serviceAccountName := "nova-archive-deleted-rows-cron" }}
 {{ tuple $envAll "archive_deleted_rows" $serviceAccountName | include "helm-toolkit.snippets.kubernetes_pod_rbac_serviceaccount" }}
 ---
-apiVersion: batch/v1beta1
+apiVersion: batch/v1
 kind: CronJob
 metadata:
   name: nova-archive-deleted-rows
diff --git a/nova/templates/cron-job-cell-setup.yaml b/nova/templates/cron-job-cell-setup.yaml
index 127c275952..b90b84e8c6 100644
--- a/nova/templates/cron-job-cell-setup.yaml
+++ b/nova/templates/cron-job-cell-setup.yaml
@@ -18,7 +18,7 @@ limitations under the License.
 {{- $serviceAccountName := "nova-cell-setup-cron" }}
 {{ tuple $envAll "cell_setup" $serviceAccountName | include "helm-toolkit.snippets.kubernetes_pod_rbac_serviceaccount" }}
 ---
-apiVersion: batch/v1beta1
+apiVersion: batch/v1
 kind: CronJob
 metadata:
   name: nova-cell-setup
diff --git a/nova/templates/cron-job-service-cleaner.yaml b/nova/templates/cron-job-service-cleaner.yaml
index 1a9f461749..dd61db79d3 100644
--- a/nova/templates/cron-job-service-cleaner.yaml
+++ b/nova/templates/cron-job-service-cleaner.yaml
@@ -18,7 +18,7 @@ limitations under the License.
 {{- $serviceAccountName := "nova-service-cleaner" }}
 {{ tuple $envAll "service_cleaner" $serviceAccountName | include "helm-toolkit.snippets.kubernetes_pod_rbac_serviceaccount" }}
 ---
-apiVersion: batch/v1beta1
+apiVersion: batch/v1
 kind: CronJob
 metadata:
   name: nova-service-cleaner
diff --git a/nova/templates/pdb-metadata.yaml b/nova/templates/pdb-metadata.yaml
index 6fba271c89..e2c9a12a44 100644
--- a/nova/templates/pdb-metadata.yaml
+++ b/nova/templates/pdb-metadata.yaml
@@ -15,7 +15,7 @@ limitations under the License.
 {{- if .Values.manifests.pdb_metadata }}
 {{- $envAll := . }}
 ---
-apiVersion: policy/v1beta1
+apiVersion: policy/v1
 kind: PodDisruptionBudget
 metadata:
   name: nova-api-metadata
diff --git a/nova/templates/pdb-osapi.yaml b/nova/templates/pdb-osapi.yaml
index 81971d1e8a..a095d5f8af 100644
--- a/nova/templates/pdb-osapi.yaml
+++ b/nova/templates/pdb-osapi.yaml
@@ -15,7 +15,7 @@ limitations under the License.
 {{- if .Values.manifests.pdb_osapi }}
 {{- $envAll := . }}
 ---
-apiVersion: policy/v1beta1
+apiVersion: policy/v1
 kind: PodDisruptionBudget
 metadata:
   name: nova-api-osapi
diff --git a/octavia/Chart.yaml b/octavia/Chart.yaml
index 88d67b7d90..3ec4f45339 100644
--- a/octavia/Chart.yaml
+++ b/octavia/Chart.yaml
@@ -16,7 +16,7 @@ apiVersion: v1
 appVersion: v1.0.0
 description: OpenStack-Helm Octavia
 name: octavia
-version: 0.2.4
+version: 0.2.5
 home: https://docs.openstack.org/octavia/latest/
 icon: https://www.openstack.org/themes/openstack/images/project-mascots/Octavia/OpenStack_Project_Octavia_vertical.png
 sources:
diff --git a/octavia/templates/pdb-api.yaml b/octavia/templates/pdb-api.yaml
index a2e03ec2ec..0eb227f40c 100644
--- a/octavia/templates/pdb-api.yaml
+++ b/octavia/templates/pdb-api.yaml
@@ -17,7 +17,7 @@ limitations under the License.
 {{- if .Values.manifests.pdb_api }}
 {{- $envAll := . }}
 ---
-apiVersion: policy/v1beta1
+apiVersion: policy/v1
 kind: PodDisruptionBudget
 metadata:
   name: octavia-api
diff --git a/placement/Chart.yaml b/placement/Chart.yaml
index 39f2889bac..71de69d123 100644
--- a/placement/Chart.yaml
+++ b/placement/Chart.yaml
@@ -16,7 +16,7 @@ apiVersion: v1
 appVersion: v1.0.0
 description: OpenStack-Helm Placement
 name: placement
-version: 0.2.7
+version: 0.2.8
 home: https://docs.openstack.org/placement/latest/
 icon: https://www.openstack.org/themes/openstack/images/project-mascots/Placement/OpenStack_Project_Placement_vertical.png
 sources:
diff --git a/placement/templates/pdb.yaml b/placement/templates/pdb.yaml
index 65c4c9a5d3..3d17a824dd 100644
--- a/placement/templates/pdb.yaml
+++ b/placement/templates/pdb.yaml
@@ -17,7 +17,7 @@ limitations under the License.
 {{- if .Values.manifests.pdb }}
 {{- $envAll := . }}
 ---
-apiVersion: policy/v1beta1
+apiVersion: policy/v1
 kind: PodDisruptionBudget
 metadata:
   name: placement-api
diff --git a/rally/Chart.yaml b/rally/Chart.yaml
index 154884d4c9..00ba2dbf0a 100644
--- a/rally/Chart.yaml
+++ b/rally/Chart.yaml
@@ -14,7 +14,7 @@ apiVersion: v1
 appVersion: v1.0.0
 description: OpenStack-Helm rally
 name: rally
-version: 0.2.3
+version: 0.2.4
 home: https://docs.openstack.org/developer/rally
 icon: https://www.openstack.org/themes/openstack/images/project-mascots/rally/OpenStack_Project_rally_vertical.png
 sources:
diff --git a/rally/templates/pdb-api.yaml b/rally/templates/pdb-api.yaml
index 873e4e34ad..967fceb2f9 100644
--- a/rally/templates/pdb-api.yaml
+++ b/rally/templates/pdb-api.yaml
@@ -15,7 +15,7 @@ limitations under the License.
 {{- if .Values.manifests.pdb_api }}
 {{- $envAll := . }}
 ---
-apiVersion: policy/v1beta1
+apiVersion: policy/v1
 kind: PodDisruptionBudget
 metadata:
   name: rally-api
diff --git a/releasenotes/notes/aodh.yaml b/releasenotes/notes/aodh.yaml
index 13ddbc1c4e..c05714b0e7 100644
--- a/releasenotes/notes/aodh.yaml
+++ b/releasenotes/notes/aodh.yaml
@@ -6,4 +6,5 @@ aodh:
   - 0.2.1 Use policies in yaml format
   - 0.2.2 Update htk requirements repo
   - 0.2.3 Enable taint toleration for Openstack services
+  - 0.2.4 Migrated CronJob resource to batch/v1 API version & PodDisruptionBudget to policy/v1
 ...
diff --git a/releasenotes/notes/barbican.yaml b/releasenotes/notes/barbican.yaml
index e71b314cbe..04dc06b491 100644
--- a/releasenotes/notes/barbican.yaml
+++ b/releasenotes/notes/barbican.yaml
@@ -16,4 +16,5 @@ barbican:
   - 0.2.10 Enable taint toleration for Openstack services
   - 0.2.11 Fix job annotations for db init job
   - 0.2.12 Remove older values overrides
+  - 0.2.13 Migrated PodDisruptionBudget resource to policy/v1 API version
 ...
diff --git a/releasenotes/notes/ceilometer.yaml b/releasenotes/notes/ceilometer.yaml
index aa211528a7..9c206edaf7 100644
--- a/releasenotes/notes/ceilometer.yaml
+++ b/releasenotes/notes/ceilometer.yaml
@@ -7,4 +7,5 @@ ceilometer:
   - 0.2.2 Update htk requirements repo
   - 0.2.3 Enable taint toleration for Openstack services
   - 0.2.4 Update default image values to Wallaby
+  - 0.2.5 Migrated PodDisruptionBudget resource to policy/v1 API version
 ...
diff --git a/releasenotes/notes/cinder.yaml b/releasenotes/notes/cinder.yaml
index e4b2a31bd6..da73ff40ef 100644
--- a/releasenotes/notes/cinder.yaml
+++ b/releasenotes/notes/cinder.yaml
@@ -37,4 +37,5 @@ cinder:
   - 0.2.18 Add helm hook in bootstrap job
   - 0.2.19 Add volume types visibility (public/private)
   - 0.2.20 Allow cinder v1/v2 endpoint creation if needed
+  - 0.2.21 Migrated CronJob resource to batch/v1 API version & PodDisruptionBudget to policy/v1
 ...
diff --git a/releasenotes/notes/cyborg.yaml b/releasenotes/notes/cyborg.yaml
index 73a5b6f49e..12b461c5eb 100644
--- a/releasenotes/notes/cyborg.yaml
+++ b/releasenotes/notes/cyborg.yaml
@@ -1,4 +1,5 @@
 ---
 cyborg:
   - 0.1.0 Initial Chart
+  - 0.1.1 Migrated PodDisruptionBudget resource to policy/v1 API version
 ...
diff --git a/releasenotes/notes/designate.yaml b/releasenotes/notes/designate.yaml
index e28f8636ff..72c6578a78 100644
--- a/releasenotes/notes/designate.yaml
+++ b/releasenotes/notes/designate.yaml
@@ -8,4 +8,5 @@ designate:
   - 0.2.2 Update htk requirements repo
   - 0.2.3 Fix extra volume mounts
   - 0.2.4 Update default image values to Wallaby
+  - 0.2.5 Migrated PodDisruptionBudget resource to policy/v1 API version
 ...
diff --git a/releasenotes/notes/glance.yaml b/releasenotes/notes/glance.yaml
index 59af7be02a..f2f43c5fce 100644
--- a/releasenotes/notes/glance.yaml
+++ b/releasenotes/notes/glance.yaml
@@ -25,4 +25,5 @@ glance:
   - 0.3.2 Decrease terminationGracePeriodSeconds on glance-api
   - 0.3.3 Update naming for subchart compatibility
   - 0.3.4 Change image default version to wallaby
+  - 0.3.5 Migrated PodDisruptionBudget resource to policy/v1 API version
 ...
diff --git a/releasenotes/notes/heat.yaml b/releasenotes/notes/heat.yaml
index af00406f35..333c209af2 100644
--- a/releasenotes/notes/heat.yaml
+++ b/releasenotes/notes/heat.yaml
@@ -18,4 +18,5 @@ heat:
   - 0.2.9 Enable taint toleration for Openstack services
   - 0.2.10 Updated naming for subchart compatibility
   - 0.2.11 Remove old releases values override in heat
+  - 0.2.12 Migrated CronJob resource to batch/v1 API version & PodDisruptionBudget to policy/v1
 ...
diff --git a/releasenotes/notes/horizon.yaml b/releasenotes/notes/horizon.yaml
index 46eb05defd..d8072f6a75 100644
--- a/releasenotes/notes/horizon.yaml
+++ b/releasenotes/notes/horizon.yaml
@@ -31,4 +31,5 @@ horizon:
   - 0.2.19 Remove unsupported value overrides
   - 0.2.20 Add SHOW_OPENRC_FILE value
   - 0.2.21 Add helm hook annotations in db-sync and db-init jobs
+  - 0.2.22 Migrated PodDisruptionBudget resource to policy/v1 API version
 ...
diff --git a/releasenotes/notes/ironic.yaml b/releasenotes/notes/ironic.yaml
index bbb32cefce..5504a60ac4 100644
--- a/releasenotes/notes/ironic.yaml
+++ b/releasenotes/notes/ironic.yaml
@@ -8,4 +8,5 @@ ironic:
   - 0.2.2 Update htk requirements repo
   - 0.2.3 Enable taint toleration for Openstack services
   - 0.2.4 Update defaults to W release
+  - 0.2.5 Migrated PodDisruptionBudget resource to policy/v1 API version
 ...
diff --git a/releasenotes/notes/keystone.yaml b/releasenotes/notes/keystone.yaml
index cc4cabc484..3cfb444776 100644
--- a/releasenotes/notes/keystone.yaml
+++ b/releasenotes/notes/keystone.yaml
@@ -40,4 +40,5 @@ keystone:
   - 0.2.22 Remove older values overrides
   - 0.2.23 Remove usage of six
   - 0.2.24 Remove unused admin port in keystone
+  - 0.2.25 Migrated CronJob resource to batch/v1 API version & PodDisruptionBudget to policy/v1
 ...
diff --git a/releasenotes/notes/magnum.yaml b/releasenotes/notes/magnum.yaml
index c5bb152aec..cc11677e7b 100644
--- a/releasenotes/notes/magnum.yaml
+++ b/releasenotes/notes/magnum.yaml
@@ -9,4 +9,5 @@ magnum:
   - 0.2.3 Update htk requirements repo
   - 0.2.4 Mount empty temp_cache_dir for performance
   - 0.2.5 Update default image values to wallaby
+  - 0.2.6 Migrated PodDisruptionBudget resource to policy/v1 API version
 ...
diff --git a/releasenotes/notes/masakari.yaml b/releasenotes/notes/masakari.yaml
index 49717d9193..0d94188bfa 100644
--- a/releasenotes/notes/masakari.yaml
+++ b/releasenotes/notes/masakari.yaml
@@ -4,4 +4,5 @@ masakari:
   - 0.1.1 Seperate node labels for monitors
   - 0.1.2 Added halm hook and fix for hostmonitors to support pacemaker remote
   - 0.1.3 Mount sudoers file for masakari hostmonitors
+  - 0.1.4 Migrated PodDisruptionBudget resource to policy/v1 API version
 ...
diff --git a/releasenotes/notes/mistral.yaml b/releasenotes/notes/mistral.yaml
index 5f69497493..d95ef50431 100644
--- a/releasenotes/notes/mistral.yaml
+++ b/releasenotes/notes/mistral.yaml
@@ -7,4 +7,5 @@ mistral:
   - 0.2.1 Use policies in yaml format
   - 0.2.2 Update htk requirements repo
   - 0.2.3 Update default imaage values to Wallaby
+  - 0.2.4 Migrated PodDisruptionBudget resource to policy/v1 API version
 ...
diff --git a/releasenotes/notes/neutron.yaml b/releasenotes/notes/neutron.yaml
index 1929ee7cf3..399f0bfb7b 100644
--- a/releasenotes/notes/neutron.yaml
+++ b/releasenotes/notes/neutron.yaml
@@ -30,4 +30,5 @@ neutron:
   - 0.2.14 Migrate IP from bridge for auto_bridge_add
   - 0.2.15 Remove unsupported values overrides
   - 0.2.16 Remove usage of six
+  - 0.2.17 Migrated PodDisruptionBudget resource to policy/v1 API version
 ...
diff --git a/releasenotes/notes/nova.yaml b/releasenotes/notes/nova.yaml
index 23c61bc225..1793ab43ac 100644
--- a/releasenotes/notes/nova.yaml
+++ b/releasenotes/notes/nova.yaml
@@ -59,4 +59,5 @@ nova:
   - 0.2.36 Support TLS endpoints
   - 0.2.37 Remove nova-placement
   - 0.2.38 Update nova image defaults
+  - 0.2.39 Migrated CronJob resource to batch/v1 API version & PodDisruptionBudget to policy/v1
 ...
diff --git a/releasenotes/notes/octavia.yaml b/releasenotes/notes/octavia.yaml
index 0cdd749a81..87d44b88e7 100644
--- a/releasenotes/notes/octavia.yaml
+++ b/releasenotes/notes/octavia.yaml
@@ -8,4 +8,5 @@ octavia:
   - 0.2.2 Update htk requirements repo
   - 0.2.3 Allow using log_config_append=null
   - 0.2.4 Fix transport_url
+  - 0.2.5 Migrated PodDisruptionBudget resource to policy/v1 API version
 ...
diff --git a/releasenotes/notes/placement.yaml b/releasenotes/notes/placement.yaml
index 2cdfff8e71..f0c0737133 100644
--- a/releasenotes/notes/placement.yaml
+++ b/releasenotes/notes/placement.yaml
@@ -16,4 +16,5 @@ placement:
   - 0.2.5 Update htk requirements repo
   - 0.2.6 Enable taint toleration for Openstack services
   - 0.2.7 Add helm hook annotations for db-sync job
+  - 0.2.8 Migrated PodDisruptionBudget resource to policy/v1 API version
 ...
diff --git a/releasenotes/notes/rally.yaml b/releasenotes/notes/rally.yaml
index 30e84a67d9..754b2fc633 100644
--- a/releasenotes/notes/rally.yaml
+++ b/releasenotes/notes/rally.yaml
@@ -6,4 +6,5 @@ rally:
   - 0.2.1 Update htk requirements repo
   - 0.2.2 Add values for backoffLimit and restartPolicy
   - 0.2.3 Update default image values to Wallaby
+  - 0.2.4 Migrated PodDisruptionBudget resource to policy/v1 API version
 ...
diff --git a/releasenotes/notes/senlin.yaml b/releasenotes/notes/senlin.yaml
index 80b706592d..b6c87649a1 100644
--- a/releasenotes/notes/senlin.yaml
+++ b/releasenotes/notes/senlin.yaml
@@ -7,4 +7,5 @@ senlin:
   - 0.2.2 Update htk requirements repo
   - 0.2.3 Add conductor & health manager
   - 0.2.4 Update default image release
+  - 0.2.5 Migrated CronJob resource to batch/v1 API version & PodDisruptionBudget to policy/v1
 ...
diff --git a/senlin/Chart.yaml b/senlin/Chart.yaml
index 47fa5432dc..7ea668689a 100644
--- a/senlin/Chart.yaml
+++ b/senlin/Chart.yaml
@@ -14,7 +14,7 @@ apiVersion: v1
 appVersion: v1.0.0
 description: OpenStack-Helm Senlin
 name: senlin
-version: 0.2.4
+version: 0.2.5
 home: https://docs.openstack.org/senlin/latest/
 icon: https://www.openstack.org/themes/openstack/images/project-mascots/Senlin/OpenStack_Project_Senlin_vertical.png
 sources:
diff --git a/senlin/templates/cron-job-engine-cleaner.yaml b/senlin/templates/cron-job-engine-cleaner.yaml
index 6b9e0cf0bd..cae292e77e 100644
--- a/senlin/templates/cron-job-engine-cleaner.yaml
+++ b/senlin/templates/cron-job-engine-cleaner.yaml
@@ -21,7 +21,7 @@ limitations under the License.
 {{- $serviceAccountName := "senlin-engine-cleaner" }}
 {{ tuple $envAll "engine_cleaner" $serviceAccountName | include "helm-toolkit.snippets.kubernetes_pod_rbac_serviceaccount" }}
 ---
-apiVersion: batch/v1beta1
+apiVersion: batch/v1
 kind: CronJob
 metadata:
   name: senlin-engine-cleaner
diff --git a/senlin/templates/pdb-api.yaml b/senlin/templates/pdb-api.yaml
index a4d246f81d..15a2a45f01 100644
--- a/senlin/templates/pdb-api.yaml
+++ b/senlin/templates/pdb-api.yaml
@@ -15,7 +15,7 @@ limitations under the License.
 {{- if .Values.manifests.pdb_api }}
 {{- $envAll := . }}
 ---
-apiVersion: policy/v1beta1
+apiVersion: policy/v1
 kind: PodDisruptionBudget
 metadata:
   name: senlin-api