diff --git a/Makefile b/Makefile
index 6dc0a621c2..5823ba349b 100644
--- a/Makefile
+++ b/Makefile
@@ -33,7 +33,7 @@ ifdef PACKAGE_DIR
 	PKG_ARGS += --destination $(PACKAGE_DIR)
 endif
 
-BASE_VERSION ?= 2024.2.0
+BASE_VERSION ?= 2025.1.0
 
 CHART_DIRS := $(subst /,,$(dir $(wildcard */Chart.yaml)))
 CHARTS := $(sort helm-toolkit $(CHART_DIRS))
diff --git a/aodh/Chart.yaml b/aodh/Chart.yaml
index 59a230a419..a17e1b120f 100644
--- a/aodh/Chart.yaml
+++ b/aodh/Chart.yaml
@@ -17,7 +17,7 @@ apiVersion: v2
 appVersion: v1.0.0
 description: Openstack-Helm Aodh
 name: aodh
-version: 2024.2.0
+version: 2025.1.0
 home: https://docs.openstack.org/aodh/latest/
 sources:
   - https://opendev.org/openstack/aodh
diff --git a/barbican/Chart.yaml b/barbican/Chart.yaml
index 6554c86587..32fce39e98 100644
--- a/barbican/Chart.yaml
+++ b/barbican/Chart.yaml
@@ -15,7 +15,7 @@ apiVersion: v2
 appVersion: v1.0.0
 description: OpenStack-Helm Barbican
 name: barbican
-version: 2024.2.0
+version: 2025.1.0
 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/ca-clusterissuer/Chart.yaml b/ca-clusterissuer/Chart.yaml
index 79a4fe1f3d..43596320e9 100644
--- a/ca-clusterissuer/Chart.yaml
+++ b/ca-clusterissuer/Chart.yaml
@@ -16,7 +16,7 @@ appVersion: "1.0"
 description: Certificate Issuer chart for OSH
 home: https://cert-manager.io/
 name: ca-clusterissuer
-version: 2024.2.0
+version: 2025.1.0
 dependencies:
   - name: helm-toolkit
     repository: file://../helm-toolkit
diff --git a/ca-issuer/Chart.yaml b/ca-issuer/Chart.yaml
index 8834a10f7e..2af2c1af2c 100644
--- a/ca-issuer/Chart.yaml
+++ b/ca-issuer/Chart.yaml
@@ -16,7 +16,7 @@ appVersion: "1.0"
 description: Certificate Issuer chart for OSH
 home: https://cert-manager.io/
 name: ca-issuer
-version: 2024.2.0
+version: 2025.1.0
 dependencies:
   - name: helm-toolkit
     repository: file://../helm-toolkit
diff --git a/ceilometer/Chart.yaml b/ceilometer/Chart.yaml
index 678da4adb4..1fa2238bce 100644
--- a/ceilometer/Chart.yaml
+++ b/ceilometer/Chart.yaml
@@ -15,7 +15,7 @@ apiVersion: v2
 appVersion: v1.0.0
 description: OpenStack-Helm Ceilometer
 name: ceilometer
-version: 2024.2.0
+version: 2025.1.0
 home: https://docs.openstack.org/ceilometer/latest/
 sources:
   - https://opendev.org/openstack/ceilometer
diff --git a/ceph-adapter-rook/Chart.yaml b/ceph-adapter-rook/Chart.yaml
index 7c3191fd5a..78071686f9 100644
--- a/ceph-adapter-rook/Chart.yaml
+++ b/ceph-adapter-rook/Chart.yaml
@@ -15,7 +15,7 @@ apiVersion: v2
 appVersion: v1.0.0
 description: OpenStack-Helm Ceph Adapter Rook
 name: ceph-adapter-rook
-version: 2024.2.0
+version: 2025.1.0
 home: https://github.com/ceph/ceph
 dependencies:
   - name: helm-toolkit
diff --git a/ceph-client/Chart.yaml b/ceph-client/Chart.yaml
index c30d8d01a2..3744d5abd0 100644
--- a/ceph-client/Chart.yaml
+++ b/ceph-client/Chart.yaml
@@ -15,7 +15,7 @@ apiVersion: v2
 appVersion: v1.0.0
 description: OpenStack-Helm Ceph Client
 name: ceph-client
-version: 2024.2.0
+version: 2025.1.0
 home: https://github.com/ceph/ceph-client
 dependencies:
   - name: helm-toolkit
diff --git a/ceph-mon/Chart.yaml b/ceph-mon/Chart.yaml
index 038d835da6..4cd5f887d0 100644
--- a/ceph-mon/Chart.yaml
+++ b/ceph-mon/Chart.yaml
@@ -15,7 +15,7 @@ apiVersion: v2
 appVersion: v1.0.0
 description: OpenStack-Helm Ceph Mon
 name: ceph-mon
-version: 2024.2.0
+version: 2025.1.0
 home: https://github.com/ceph/ceph
 dependencies:
   - name: helm-toolkit
diff --git a/ceph-osd/Chart.yaml b/ceph-osd/Chart.yaml
index 6bb0b54b43..defe5bf6b7 100644
--- a/ceph-osd/Chart.yaml
+++ b/ceph-osd/Chart.yaml
@@ -15,7 +15,7 @@ apiVersion: v2
 appVersion: v1.0.0
 description: OpenStack-Helm Ceph OSD
 name: ceph-osd
-version: 2024.2.0
+version: 2025.1.0
 home: https://github.com/ceph/ceph
 dependencies:
   - name: helm-toolkit
diff --git a/ceph-provisioners/Chart.yaml b/ceph-provisioners/Chart.yaml
index f9207ef3c1..e0456f6ff7 100644
--- a/ceph-provisioners/Chart.yaml
+++ b/ceph-provisioners/Chart.yaml
@@ -15,7 +15,7 @@ apiVersion: v2
 appVersion: v1.0.0
 description: OpenStack-Helm Ceph Provisioner
 name: ceph-provisioners
-version: 2024.2.0
+version: 2025.1.0
 home: https://github.com/ceph/ceph
 dependencies:
   - name: helm-toolkit
diff --git a/ceph-rgw/Chart.yaml b/ceph-rgw/Chart.yaml
index 4350949be3..872fcdd07c 100644
--- a/ceph-rgw/Chart.yaml
+++ b/ceph-rgw/Chart.yaml
@@ -15,7 +15,7 @@ apiVersion: v2
 appVersion: v1.0.0
 description: OpenStack-Helm Ceph RadosGW
 name: ceph-rgw
-version: 2024.2.0
+version: 2025.1.0
 home: https://github.com/ceph/ceph
 dependencies:
   - name: helm-toolkit
diff --git a/cert-rotation/Chart.yaml b/cert-rotation/Chart.yaml
index c97226c42e..e3a97c5f66 100644
--- a/cert-rotation/Chart.yaml
+++ b/cert-rotation/Chart.yaml
@@ -16,7 +16,7 @@ appVersion: "1.0"
 description: Rotate the certificates generated by cert-manager
 home: https://cert-manager.io/
 name: cert-rotation
-version: 2024.2.0
+version: 2025.1.0
 dependencies:
   - name: helm-toolkit
     repository: file://../helm-toolkit
diff --git a/cinder/Chart.yaml b/cinder/Chart.yaml
index ba22f4bc00..e446fed6ae 100644
--- a/cinder/Chart.yaml
+++ b/cinder/Chart.yaml
@@ -15,7 +15,7 @@ apiVersion: v2
 appVersion: v1.0.0
 description: OpenStack-Helm Cinder
 name: cinder
-version: 2024.2.0
+version: 2025.1.0
 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/cyborg/Chart.yaml b/cyborg/Chart.yaml
index 803fcee63d..074cd7c431 100644
--- a/cyborg/Chart.yaml
+++ b/cyborg/Chart.yaml
@@ -15,7 +15,7 @@ apiVersion: v2
 appVersion: v1.0.0
 description: OpenStack-Helm Cyborg
 name: cyborg
-version: 2024.2.0
+version: 2025.1.0
 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/daemonjob-controller/Chart.yaml b/daemonjob-controller/Chart.yaml
index 46a952a0ae..6b47a9a59c 100644
--- a/daemonjob-controller/Chart.yaml
+++ b/daemonjob-controller/Chart.yaml
@@ -15,7 +15,7 @@ apiVersion: v2
 appVersion: v1.0.0
 description: A Helm chart for DaemonjobController
 name: daemonjob-controller
-version: 2024.2.0
+version: 2025.1.0
 home: https://opendev.org/openstack
 dependencies:
   - name: helm-toolkit
diff --git a/designate/Chart.yaml b/designate/Chart.yaml
index 402567d902..04bd50fc76 100644
--- a/designate/Chart.yaml
+++ b/designate/Chart.yaml
@@ -15,7 +15,7 @@ apiVersion: v2
 appVersion: v1.0.0
 description: OpenStack-Helm Designate
 name: designate
-version: 2024.2.0
+version: 2025.1.0
 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/elastic-apm-server/Chart.yaml b/elastic-apm-server/Chart.yaml
index c5c7a66c64..764fc9420f 100644
--- a/elastic-apm-server/Chart.yaml
+++ b/elastic-apm-server/Chart.yaml
@@ -15,7 +15,7 @@ apiVersion: v2
 appVersion: v6.2.3
 description: OpenStack-Helm Elastic APM Server
 name: elastic-apm-server
-version: 2024.2.0
+version: 2025.1.0
 home: https://www.elastic.co/guide/en/apm/get-started/current/index.html
 sources:
   - https://github.com/elastic/apm-server
diff --git a/elastic-filebeat/Chart.yaml b/elastic-filebeat/Chart.yaml
index 864d584100..45357abfbb 100644
--- a/elastic-filebeat/Chart.yaml
+++ b/elastic-filebeat/Chart.yaml
@@ -15,7 +15,7 @@ apiVersion: v2
 appVersion: v7.1.0
 description: OpenStack-Helm Elastic Filebeat
 name: elastic-filebeat
-version: 2024.2.0
+version: 2025.1.0
 home: https://www.elastic.co/products/beats/filebeat
 sources:
   - https://github.com/elastic/beats/tree/master/filebeat
diff --git a/elastic-metricbeat/Chart.yaml b/elastic-metricbeat/Chart.yaml
index a7562bbac6..2b7843ad0e 100644
--- a/elastic-metricbeat/Chart.yaml
+++ b/elastic-metricbeat/Chart.yaml
@@ -15,7 +15,7 @@ apiVersion: v2
 appVersion: v7.1.0
 description: OpenStack-Helm Elastic Metricbeat
 name: elastic-metricbeat
-version: 2024.2.0
+version: 2025.1.0
 home: https://www.elastic.co/products/beats/metricbeat
 sources:
   - https://github.com/elastic/beats/tree/master/metricbeat
diff --git a/elastic-packetbeat/Chart.yaml b/elastic-packetbeat/Chart.yaml
index 909032785a..e83dc0e963 100644
--- a/elastic-packetbeat/Chart.yaml
+++ b/elastic-packetbeat/Chart.yaml
@@ -15,7 +15,7 @@ apiVersion: v2
 appVersion: v7.1.0
 description: OpenStack-Helm Elastic Packetbeat
 name: elastic-packetbeat
-version: 2024.2.0
+version: 2025.1.0
 home: https://www.elastic.co/products/beats/packetbeat
 sources:
   - https://github.com/elastic/beats/tree/master/packetbeat
diff --git a/elasticsearch/Chart.yaml b/elasticsearch/Chart.yaml
index ab9bcf7712..8f69536e3b 100644
--- a/elasticsearch/Chart.yaml
+++ b/elasticsearch/Chart.yaml
@@ -15,7 +15,7 @@ apiVersion: v2
 appVersion: v8.9.0
 description: OpenStack-Helm ElasticSearch
 name: elasticsearch
-version: 2024.2.0
+version: 2025.1.0
 home: https://www.elastic.co/
 sources:
   - https://github.com/elastic/elasticsearch
diff --git a/etcd/Chart.yaml b/etcd/Chart.yaml
index 40f709dc1d..678ea54aad 100644
--- a/etcd/Chart.yaml
+++ b/etcd/Chart.yaml
@@ -15,7 +15,7 @@ apiVersion: v2
 appVersion: v3.4.3
 description: OpenStack-Helm etcd
 name: etcd
-version: 2024.2.0
+version: 2025.1.0
 home: https://coreos.com/etcd/
 icon: https://raw.githubusercontent.com/CloudCoreo/etcd-cluster/master/images/icon.png
 sources:
diff --git a/falco/Chart.yaml b/falco/Chart.yaml
index 48b37fb15a..d1091a7aec 100644
--- a/falco/Chart.yaml
+++ b/falco/Chart.yaml
@@ -13,7 +13,7 @@
 ---
 apiVersion: v2
 name: falco
-version: 2024.2.0
+version: 2025.1.0
 appVersion: 0.11.1
 description: Sysdig Falco
 keywords:
diff --git a/flannel/Chart.yaml b/flannel/Chart.yaml
index 7ec5a5f815..4028bd6f7e 100644
--- a/flannel/Chart.yaml
+++ b/flannel/Chart.yaml
@@ -15,7 +15,7 @@ apiVersion: v2
 appVersion: v0.8.0
 description: OpenStack-Helm BootStrap Flannel
 name: flannel
-version: 2024.2.0
+version: 2025.1.0
 home: https://github.com/coreos/flannel
 icon: https://raw.githubusercontent.com/coreos/flannel/master/logos/flannel-horizontal-color.png
 sources:
diff --git a/fluentbit/Chart.yaml b/fluentbit/Chart.yaml
index 1d79e68c83..361ca26341 100644
--- a/fluentbit/Chart.yaml
+++ b/fluentbit/Chart.yaml
@@ -15,7 +15,7 @@ apiVersion: v2
 appVersion: v0.14.2
 description: OpenStack-Helm Fluentbit
 name: fluentbit
-version: 2024.2.0
+version: 2025.1.0
 home: https://www.fluentbit.io/
 sources:
   - https://github.com/fluent/fluentbit
diff --git a/fluentd/Chart.yaml b/fluentd/Chart.yaml
index 55b52e5bab..486b2ef94d 100644
--- a/fluentd/Chart.yaml
+++ b/fluentd/Chart.yaml
@@ -15,7 +15,7 @@ apiVersion: v2
 appVersion: v1.10.1
 description: OpenStack-Helm Fluentd
 name: fluentd
-version: 2024.2.0
+version: 2025.1.0
 home: https://www.fluentd.org/
 sources:
   - https://github.com/fluent/fluentd
diff --git a/glance/Chart.yaml b/glance/Chart.yaml
index 618a0acb9a..afbb8bbb26 100644
--- a/glance/Chart.yaml
+++ b/glance/Chart.yaml
@@ -15,7 +15,7 @@ apiVersion: v2
 appVersion: v1.0.0
 description: OpenStack-Helm Glance
 name: glance
-version: 2024.2.0
+version: 2025.1.0
 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/gnocchi/Chart.yaml b/gnocchi/Chart.yaml
index 7a765ff550..b9c8cfbf37 100644
--- a/gnocchi/Chart.yaml
+++ b/gnocchi/Chart.yaml
@@ -15,7 +15,7 @@ apiVersion: v2
 appVersion: v3.0.3
 description: OpenStack-Helm Gnocchi
 name: gnocchi
-version: 2024.2.0
+version: 2025.1.0
 home: https://gnocchi.xyz/
 icon: https://gnocchi.xyz/_static/gnocchi-logo.png
 sources:
diff --git a/grafana/Chart.yaml b/grafana/Chart.yaml
index 10946084db..ca77e4ac18 100644
--- a/grafana/Chart.yaml
+++ b/grafana/Chart.yaml
@@ -15,7 +15,7 @@ apiVersion: v2
 appVersion: v9.2.10
 description: OpenStack-Helm Grafana
 name: grafana
-version: 2024.2.0
+version: 2025.1.0
 home: https://grafana.com/
 sources:
   - https://github.com/grafana/grafana
diff --git a/heat/Chart.yaml b/heat/Chart.yaml
index 9be3ca612e..dc5f2627f6 100644
--- a/heat/Chart.yaml
+++ b/heat/Chart.yaml
@@ -15,7 +15,7 @@ apiVersion: v2
 appVersion: v1.0.0
 description: OpenStack-Helm Heat
 name: heat
-version: 2024.2.0
+version: 2025.1.0
 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/helm-toolkit/Chart.yaml b/helm-toolkit/Chart.yaml
index b84ba12b48..933be508c2 100644
--- a/helm-toolkit/Chart.yaml
+++ b/helm-toolkit/Chart.yaml
@@ -15,7 +15,7 @@ apiVersion: v2
 appVersion: v1.0.0
 description: OpenStack-Helm Helm-Toolkit
 name: helm-toolkit
-version: 2024.2.0
+version: 2025.1.0
 home: https://docs.openstack.org/openstack-helm
 icon: https://www.openstack.org/themes/openstack/images/project-mascots/OpenStack-Helm/OpenStack_Project_OpenStackHelm_vertical.png
 sources:
diff --git a/horizon/Chart.yaml b/horizon/Chart.yaml
index d6f8582843..9e8b96780e 100644
--- a/horizon/Chart.yaml
+++ b/horizon/Chart.yaml
@@ -15,7 +15,7 @@ apiVersion: v2
 appVersion: v1.0.0
 description: OpenStack-Helm Horizon
 name: horizon
-version: 2024.2.0
+version: 2025.1.0
 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/ironic/Chart.yaml b/ironic/Chart.yaml
index b7de5f54cc..77eab90d36 100644
--- a/ironic/Chart.yaml
+++ b/ironic/Chart.yaml
@@ -15,7 +15,7 @@ apiVersion: v2
 appVersion: v1.0.0
 description: OpenStack-Helm Ironic
 name: ironic
-version: 2024.2.0
+version: 2025.1.0
 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/keystone/Chart.yaml b/keystone/Chart.yaml
index ba09f39a9a..66ccd42bb1 100644
--- a/keystone/Chart.yaml
+++ b/keystone/Chart.yaml
@@ -15,7 +15,7 @@ apiVersion: v2
 appVersion: v1.0.0
 description: OpenStack-Helm Keystone
 name: keystone
-version: 2024.2.0
+version: 2025.1.0
 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/kibana/Chart.yaml b/kibana/Chart.yaml
index 5639855866..af508615fb 100644
--- a/kibana/Chart.yaml
+++ b/kibana/Chart.yaml
@@ -15,7 +15,7 @@ apiVersion: v2
 appVersion: v8.9.0
 description: OpenStack-Helm Kibana
 name: kibana
-version: 2024.2.0
+version: 2025.1.0
 home: https://www.elastic.co/products/kibana
 sources:
   - https://github.com/elastic/kibana
diff --git a/kube-dns/Chart.yaml b/kube-dns/Chart.yaml
index 5b49d1d9c1..033ed6d232 100644
--- a/kube-dns/Chart.yaml
+++ b/kube-dns/Chart.yaml
@@ -15,7 +15,7 @@ apiVersion: v2
 appVersion: v1.14.5
 description: OpenStack-Helm Kube-DNS
 name: kube-dns
-version: 2024.2.0
+version: 2025.1.0
 home: https://github.com/coreos/flannel
 icon: https://raw.githubusercontent.com/coreos/flannel/master/logos/flannel-horizontal-color.png
 sources:
diff --git a/kubernetes-keystone-webhook/Chart.yaml b/kubernetes-keystone-webhook/Chart.yaml
index e5a77b3031..b0b9e3486f 100644
--- a/kubernetes-keystone-webhook/Chart.yaml
+++ b/kubernetes-keystone-webhook/Chart.yaml
@@ -15,7 +15,7 @@ apiVersion: v2
 appVersion: v0.2.0
 description: OpenStack-Helm Kubernetes keystone webhook
 name: kubernetes-keystone-webhook
-version: 2024.2.0
+version: 2025.1.0
 home: https://github.com/kubernetes/cloud-provider-openstack
 sources:
   - https://opendev.org/openstack/openstack-helm-infra
diff --git a/kubernetes-node-problem-detector/Chart.yaml b/kubernetes-node-problem-detector/Chart.yaml
index 53b942f0bf..7200d81d78 100644
--- a/kubernetes-node-problem-detector/Chart.yaml
+++ b/kubernetes-node-problem-detector/Chart.yaml
@@ -15,7 +15,7 @@ apiVersion: v2
 appVersion: v1.0.0
 description: OpenStack-Helm Kubernetes Node Problem Detector
 name: kubernetes-node-problem-detector
-version: 2024.2.0
+version: 2025.1.0
 home: https://github.com/kubernetes/node-problem-detector
 sources:
   - https://github.com/kubernetes/node-problem-detector
diff --git a/ldap/Chart.yaml b/ldap/Chart.yaml
index 4c8e5f3f6b..47de2c3c5c 100644
--- a/ldap/Chart.yaml
+++ b/ldap/Chart.yaml
@@ -15,7 +15,7 @@ apiVersion: v2
 appVersion: v1.2.0
 description: OpenStack-Helm LDAP
 name: ldap
-version: 2024.2.0
+version: 2025.1.0
 home: https://www.openldap.org/
 maintainers:
   - name: OpenStack-Helm Authors
diff --git a/libvirt/Chart.yaml b/libvirt/Chart.yaml
index 604072232c..3342520936 100644
--- a/libvirt/Chart.yaml
+++ b/libvirt/Chart.yaml
@@ -15,7 +15,7 @@ apiVersion: v2
 appVersion: v1.0.0
 description: OpenStack-Helm libvirt
 name: libvirt
-version: 2024.2.0
+version: 2025.1.0
 home: https://libvirt.org
 sources:
   - https://libvirt.org/git/?p=libvirt.git;a=summary
diff --git a/local-storage/Chart.yaml b/local-storage/Chart.yaml
index feb3927b46..8a641b295c 100644
--- a/local-storage/Chart.yaml
+++ b/local-storage/Chart.yaml
@@ -15,7 +15,7 @@ apiVersion: v2
 appVersion: v1.0.0
 description: OpenStack-Helm Local Storage
 name: local-storage
-version: 2024.2.0
+version: 2025.1.0
 home: https://kubernetes.io/docs/concepts/storage/volumes/#local
 maintainers:
   - name: OpenStack-Helm Authors
diff --git a/local-volume-provisioner/Chart.yaml b/local-volume-provisioner/Chart.yaml
index fc763b6cbd..538b375891 100644
--- a/local-volume-provisioner/Chart.yaml
+++ b/local-volume-provisioner/Chart.yaml
@@ -15,7 +15,7 @@ apiVersion: v2
 appVersion: v1.0.0
 description: OpenStack-Helm local-volume-provisioner
 name: local-volume-provisioner
-version: 2024.2.0
+version: 2025.1.0
 home: https://github.com/kubernetes-sigs/sig-storage-local-static-provisioner
 sources:
   - https://opendev.org/openstack/openstack-helm
diff --git a/lockdown/Chart.yaml b/lockdown/Chart.yaml
index e7797e525b..7b06e4be9d 100644
--- a/lockdown/Chart.yaml
+++ b/lockdown/Chart.yaml
@@ -16,6 +16,6 @@ appVersion: "1.0"
 description: |
   A helm chart used to lockdown all ingress and egress for a namespace
 name: lockdown
-version: 2024.2.0
+version: 2025.1.0
 home: https://kubernetes.io/docs/concepts/services-networking/network-policies/
 ...
diff --git a/magnum/Chart.yaml b/magnum/Chart.yaml
index 15dbcbab61..a9937f29f0 100644
--- a/magnum/Chart.yaml
+++ b/magnum/Chart.yaml
@@ -15,7 +15,7 @@ apiVersion: v2
 appVersion: v1.0.0
 description: OpenStack-Helm Magnum
 name: magnum
-version: 2024.2.0
+version: 2025.1.0
 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/manila/Chart.yaml b/manila/Chart.yaml
index 8e87e597d5..915f37ef28 100644
--- a/manila/Chart.yaml
+++ b/manila/Chart.yaml
@@ -15,7 +15,7 @@ apiVersion: v2
 appVersion: v1.0.0
 description: OpenStack-Helm Manila
 name: manila
-version: 2024.2.0
+version: 2025.1.0
 home: https://docs.openstack.org/manila/latest/
 icon: https://www.openstack.org/themes/openstack/images/project-mascots/Manila/OpenStack_Project_Manila_vertical.png
 sources:
diff --git a/mariadb-backup/Chart.yaml b/mariadb-backup/Chart.yaml
index 53de9ff750..d4161b72d2 100644
--- a/mariadb-backup/Chart.yaml
+++ b/mariadb-backup/Chart.yaml
@@ -15,7 +15,7 @@ apiVersion: v2
 appVersion: v10.6.14
 description: OpenStack-Helm MariaDB backups
 name: mariadb-backup
-version: 2024.2.0
+version: 2025.1.0
 home: https://mariadb.com/kb/en/
 icon: http://badges.mariadb.org/mariadb-badge-180x60.png
 sources:
diff --git a/mariadb-cluster/Chart.yaml b/mariadb-cluster/Chart.yaml
index 731dd1f8fa..3a54f30171 100644
--- a/mariadb-cluster/Chart.yaml
+++ b/mariadb-cluster/Chart.yaml
@@ -15,7 +15,7 @@ apiVersion: v2
 appVersion: v10.6.14
 description: OpenStack-Helm MariaDB controlled by mariadb-operator
 name: mariadb-cluster
-version: 2024.2.0
+version: 2025.1.0
 home: https://mariadb.com/kb/en/
 icon: http://badges.mariadb.org/mariadb-badge-180x60.png
 sources:
diff --git a/mariadb/Chart.yaml b/mariadb/Chart.yaml
index d8898d9460..587509e240 100644
--- a/mariadb/Chart.yaml
+++ b/mariadb/Chart.yaml
@@ -15,7 +15,7 @@ apiVersion: v2
 appVersion: v10.6.7
 description: OpenStack-Helm MariaDB
 name: mariadb
-version: 2024.2.0
+version: 2025.1.0
 home: https://mariadb.com/kb/en/
 icon: http://badges.mariadb.org/mariadb-badge-180x60.png
 sources:
diff --git a/masakari/Chart.yaml b/masakari/Chart.yaml
index bc011b2da8..05534e0af7 100644
--- a/masakari/Chart.yaml
+++ b/masakari/Chart.yaml
@@ -15,7 +15,7 @@ apiVersion: v2
 appVersion: v1.0.0
 description: OpenStack-Helm Masakari
 name: masakari
-version: 2024.2.0
+version: 2025.1.0
 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/memcached/Chart.yaml b/memcached/Chart.yaml
index 16f16464bc..b2cba47c39 100644
--- a/memcached/Chart.yaml
+++ b/memcached/Chart.yaml
@@ -15,7 +15,7 @@ apiVersion: v2
 appVersion: v1.5.5
 description: OpenStack-Helm Memcached
 name: memcached
-version: 2024.2.0
+version: 2025.1.0
 home: https://github.com/memcached/memcached
 dependencies:
   - name: helm-toolkit
diff --git a/metacontroller/Chart.yaml b/metacontroller/Chart.yaml
index e57f5f8c95..89b7f26d9c 100644
--- a/metacontroller/Chart.yaml
+++ b/metacontroller/Chart.yaml
@@ -15,7 +15,7 @@ apiVersion: v2
 appVersion: v0.4.2
 description: A Helm chart for Metacontroller
 name: metacontroller
-version: 2024.2.0
+version: 2025.1.0
 home: https://metacontroller.app/
 keywords:
   - CRDs
diff --git a/mistral/Chart.yaml b/mistral/Chart.yaml
index 834f16ff0c..523dc5a938 100644
--- a/mistral/Chart.yaml
+++ b/mistral/Chart.yaml
@@ -15,7 +15,7 @@ apiVersion: v2
 appVersion: v1.0.0
 description: OpenStack-Helm Mistral
 name: mistral
-version: 2024.2.0
+version: 2025.1.0
 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/monasca/Chart.yaml b/monasca/Chart.yaml
index 5863147c85..f4bca5a18f 100644
--- a/monasca/Chart.yaml
+++ b/monasca/Chart.yaml
@@ -15,7 +15,7 @@ apiVersion: v2
 appVersion: v1.0.0
 description: OpenStack-Helm Monasca API
 name: monasca
-version: 2024.2.0
+version: 2025.1.0
 home: https://docs.openstack.org/monasca/latest/
 icon: https://www.openstack.org/themes/openstack/images/project-mascots/Monasca/OpenStack_Project_Monasca_vertical.png
 sources:
diff --git a/mongodb/Chart.yaml b/mongodb/Chart.yaml
index caac77f1b4..0add1cddea 100644
--- a/mongodb/Chart.yaml
+++ b/mongodb/Chart.yaml
@@ -15,7 +15,7 @@ apiVersion: v2
 appVersion: v3.4.9
 description: OpenStack-Helm MongoDB
 name: mongodb
-version: 2024.2.0
+version: 2025.1.0
 home: https://www.mongodb.com
 sources:
   - https://github.com/mongodb/mongo
diff --git a/nagios/Chart.yaml b/nagios/Chart.yaml
index 97a155f9f8..0cd6a46d15 100644
--- a/nagios/Chart.yaml
+++ b/nagios/Chart.yaml
@@ -15,7 +15,7 @@ apiVersion: v2
 appVersion: v1.0.0
 description: OpenStack-Helm Nagios
 name: nagios
-version: 2024.2.0
+version: 2025.1.0
 home: https://www.nagios.org
 sources:
   - https://opendev.org/openstack/openstack-helm-addons
diff --git a/namespace-config/Chart.yaml b/namespace-config/Chart.yaml
index cde620369d..41adf8cbea 100644
--- a/namespace-config/Chart.yaml
+++ b/namespace-config/Chart.yaml
@@ -15,6 +15,6 @@ apiVersion: v2
 appVersion: v1.0.0
 description: OpenStack-Helm Namespace Config
 name: namespace-config
-version: 2024.2.0
+version: 2025.1.0
 home: https://kubernetes.io/docs/concepts/policy/limit-range/
 ...
diff --git a/neutron/Chart.yaml b/neutron/Chart.yaml
index 834cebcefa..01d4ceb4fc 100644
--- a/neutron/Chart.yaml
+++ b/neutron/Chart.yaml
@@ -15,7 +15,7 @@ apiVersion: v2
 appVersion: v1.0.0
 description: OpenStack-Helm Neutron
 name: neutron
-version: 2024.2.0
+version: 2025.1.0
 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/nfs-provisioner/Chart.yaml b/nfs-provisioner/Chart.yaml
index 356f03bfe7..4597a0406d 100644
--- a/nfs-provisioner/Chart.yaml
+++ b/nfs-provisioner/Chart.yaml
@@ -15,7 +15,7 @@ apiVersion: v2
 appVersion: v2.2.1
 description: OpenStack-Helm NFS
 name: nfs-provisioner
-version: 2024.2.0
+version: 2025.1.0
 home: https://github.com/kubernetes-incubator/external-storage
 sources:
   - https://github.com/kubernetes-incubator/external-storage
diff --git a/nova/Chart.yaml b/nova/Chart.yaml
index 7d986efff7..b421379a39 100644
--- a/nova/Chart.yaml
+++ b/nova/Chart.yaml
@@ -15,7 +15,7 @@ apiVersion: v2
 appVersion: v1.0.0
 description: OpenStack-Helm Nova
 name: nova
-version: 2024.2.0
+version: 2025.1.0
 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/octavia/Chart.yaml b/octavia/Chart.yaml
index 08ac966480..5a3a35cefa 100644
--- a/octavia/Chart.yaml
+++ b/octavia/Chart.yaml
@@ -17,7 +17,7 @@ apiVersion: v2
 appVersion: v1.0.0
 description: OpenStack-Helm Octavia
 name: octavia
-version: 2024.2.0
+version: 2025.1.0
 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/openstack/Chart.yaml b/openstack/Chart.yaml
index b029e90490..290580456b 100644
--- a/openstack/Chart.yaml
+++ b/openstack/Chart.yaml
@@ -58,7 +58,7 @@ dependencies:
 description: A chart for openstack helm commmon deployment items
 name: openstack
 type: application
-version: 2024.2.0
+version: 2025.1.0
 maintainers:
   - name: OpenStack-Helm Authors
 ...
diff --git a/openvswitch/Chart.yaml b/openvswitch/Chart.yaml
index 1c9fb94d0a..17614e87f3 100644
--- a/openvswitch/Chart.yaml
+++ b/openvswitch/Chart.yaml
@@ -15,7 +15,7 @@ apiVersion: v2
 appVersion: v1.0.0
 description: OpenStack-Helm OpenVSwitch
 name: openvswitch
-version: 2024.2.0
+version: 2025.1.0
 home: http://openvswitch.org
 icon: https://www.openstack.org/themes/openstack/images/project-mascots/Neutron/OpenStack_Project_Neutron_vertical.png
 sources:
diff --git a/ovn/Chart.yaml b/ovn/Chart.yaml
index a9e426d500..2b16d4afdb 100644
--- a/ovn/Chart.yaml
+++ b/ovn/Chart.yaml
@@ -15,7 +15,7 @@ apiVersion: v2
 appVersion: v23.3.0
 description: OpenStack-Helm OVN
 name: ovn
-version: 2024.2.0
+version: 2025.1.0
 home: https://www.ovn.org
 icon: https://www.ovn.org/images/ovn-logo.png
 sources:
diff --git a/placement/Chart.yaml b/placement/Chart.yaml
index 5d2f61e3fa..f0f2662a7b 100644
--- a/placement/Chart.yaml
+++ b/placement/Chart.yaml
@@ -17,7 +17,7 @@ apiVersion: v2
 appVersion: v1.0.0
 description: OpenStack-Helm Placement
 name: placement
-version: 2024.2.0
+version: 2025.1.0
 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/postgresql/Chart.yaml b/postgresql/Chart.yaml
index ffe66ec0be..42f52eae02 100644
--- a/postgresql/Chart.yaml
+++ b/postgresql/Chart.yaml
@@ -15,7 +15,7 @@ apiVersion: v2
 appVersion: v14.5
 description: OpenStack-Helm PostgreSQL
 name: postgresql
-version: 2024.2.0
+version: 2025.1.0
 home: https://www.postgresql.org
 sources:
   - https://github.com/postgres/postgres
diff --git a/powerdns/Chart.yaml b/powerdns/Chart.yaml
index 0b2f5e9ec7..f222745e2d 100644
--- a/powerdns/Chart.yaml
+++ b/powerdns/Chart.yaml
@@ -15,7 +15,7 @@ apiVersion: v2
 appVersion: v4.1.10
 description: OpenStack-Helm PowerDNS
 name: powerdns
-version: 2024.2.0
+version: 2025.1.0
 home: https://www.powerdns.com/
 maintainers:
   - name: OpenStack-Helm Authors
diff --git a/prometheus-alertmanager/Chart.yaml b/prometheus-alertmanager/Chart.yaml
index 467af7e2b3..2845faf08f 100644
--- a/prometheus-alertmanager/Chart.yaml
+++ b/prometheus-alertmanager/Chart.yaml
@@ -15,7 +15,7 @@ apiVersion: v2
 appVersion: v0.20.0
 description: OpenStack-Helm Alertmanager for Prometheus
 name: prometheus-alertmanager
-version: 2024.2.0
+version: 2025.1.0
 home: https://prometheus.io/docs/alerting/alertmanager/
 sources:
   - https://github.com/prometheus/alertmanager
diff --git a/prometheus-blackbox-exporter/Chart.yaml b/prometheus-blackbox-exporter/Chart.yaml
index 5560cff9f5..7ba5b4db82 100644
--- a/prometheus-blackbox-exporter/Chart.yaml
+++ b/prometheus-blackbox-exporter/Chart.yaml
@@ -14,7 +14,7 @@ apiVersion: v2
 appVersion: v0.16.0
 description: OpenStack-Helm blackbox exporter for Prometheus
 name: prometheus-blackbox-exporter
-version: 2024.2.0
+version: 2025.1.0
 home: https://github.com/prometheus/blackbox_exporter
 sources:
   - https://opendev.org/openstack/openstack-helm-infra
diff --git a/prometheus-kube-state-metrics/Chart.yaml b/prometheus-kube-state-metrics/Chart.yaml
index 24ec9df9a3..16d734130d 100644
--- a/prometheus-kube-state-metrics/Chart.yaml
+++ b/prometheus-kube-state-metrics/Chart.yaml
@@ -15,7 +15,7 @@ apiVersion: v2
 appVersion: v1.3.1
 description: OpenStack-Helm Kube-State-Metrics for Prometheus
 name: prometheus-kube-state-metrics
-version: 2024.2.0
+version: 2025.1.0
 home: https://github.com/kubernetes/kube-state-metrics
 sources:
   - https://github.com/kubernetes/kube-state-metrics
diff --git a/prometheus-mysql-exporter/Chart.yaml b/prometheus-mysql-exporter/Chart.yaml
index 6a055f1840..01879b0293 100644
--- a/prometheus-mysql-exporter/Chart.yaml
+++ b/prometheus-mysql-exporter/Chart.yaml
@@ -15,7 +15,7 @@ apiVersion: v2
 appVersion: v0.12.1
 description: OpenStack-Helm Prometheus mysql-exporter
 name: prometheus-mysql-exporter
-version: 2024.2.0
+version: 2025.1.0
 home: https://mariadb.com/kb/en/
 icon: http://badges.mariadb.org/mariadb-badge-180x60.png
 sources:
diff --git a/prometheus-node-exporter/Chart.yaml b/prometheus-node-exporter/Chart.yaml
index 3030497cc2..65385ea51e 100644
--- a/prometheus-node-exporter/Chart.yaml
+++ b/prometheus-node-exporter/Chart.yaml
@@ -15,7 +15,7 @@ apiVersion: v2
 appVersion: v0.18.1
 description: OpenStack-Helm Node Exporter for Prometheus
 name: prometheus-node-exporter
-version: 2024.2.0
+version: 2025.1.0
 home: https://github.com/prometheus/node_exporter
 sources:
   - https://github.com/prometheus/node_exporter
diff --git a/prometheus-openstack-exporter/Chart.yaml b/prometheus-openstack-exporter/Chart.yaml
index 93a1825f42..e72bdaeded 100644
--- a/prometheus-openstack-exporter/Chart.yaml
+++ b/prometheus-openstack-exporter/Chart.yaml
@@ -15,7 +15,7 @@ apiVersion: v2
 appVersion: v1.0.0
 description: OpenStack Metrics Exporter for Prometheus
 name: prometheus-openstack-exporter
-version: 2024.2.0
+version: 2025.1.0
 home: https://github.com/openstack/openstack-helm-infra
 sources:
   - https://opendev.org/openstack/openstack-helm-infra
diff --git a/prometheus-process-exporter/Chart.yaml b/prometheus-process-exporter/Chart.yaml
index 9dfe4226f0..6f8fa76cce 100644
--- a/prometheus-process-exporter/Chart.yaml
+++ b/prometheus-process-exporter/Chart.yaml
@@ -15,7 +15,7 @@ apiVersion: v2
 appVersion: v0.2.11
 description: OpenStack-Helm Process Exporter for Prometheus
 name: prometheus-process-exporter
-version: 2024.2.0
+version: 2025.1.0
 home: https://github.com/openstack/openstack-helm-infra
 sources:
   - https://github.com/ncabatoff/process-exporter
diff --git a/prometheus/Chart.yaml b/prometheus/Chart.yaml
index d763da8517..2181170a88 100644
--- a/prometheus/Chart.yaml
+++ b/prometheus/Chart.yaml
@@ -15,7 +15,7 @@ apiVersion: v2
 appVersion: v2.25.0
 description: OpenStack-Helm Prometheus
 name: prometheus
-version: 2024.2.0
+version: 2025.1.0
 home: https://prometheus.io/
 sources:
   - https://github.com/prometheus/prometheus
diff --git a/rabbitmq/Chart.yaml b/rabbitmq/Chart.yaml
index b99813e8b7..6308bbeb9f 100644
--- a/rabbitmq/Chart.yaml
+++ b/rabbitmq/Chart.yaml
@@ -15,7 +15,7 @@ apiVersion: v2
 appVersion: v3.12.0
 description: OpenStack-Helm RabbitMQ
 name: rabbitmq
-version: 2024.2.0
+version: 2025.1.0
 home: https://github.com/rabbitmq/rabbitmq-server
 dependencies:
   - name: helm-toolkit
diff --git a/rally/Chart.yaml b/rally/Chart.yaml
index ae03dc4b9b..547ae2bc3a 100644
--- a/rally/Chart.yaml
+++ b/rally/Chart.yaml
@@ -15,7 +15,7 @@ apiVersion: v2
 appVersion: v1.0.0
 description: OpenStack-Helm rally
 name: rally
-version: 2024.2.0
+version: 2025.1.0
 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/redis/Chart.yaml b/redis/Chart.yaml
index 67889609c4..84a81d2e8c 100644
--- a/redis/Chart.yaml
+++ b/redis/Chart.yaml
@@ -15,7 +15,7 @@ apiVersion: v2
 appVersion: v4.0.1
 description: OpenStack-Helm Redis
 name: redis
-version: 2024.2.0
+version: 2025.1.0
 home: https://github.com/redis/redis
 dependencies:
   - name: helm-toolkit
diff --git a/registry/Chart.yaml b/registry/Chart.yaml
index af389cb457..b8bf43c3a9 100644
--- a/registry/Chart.yaml
+++ b/registry/Chart.yaml
@@ -15,7 +15,7 @@ apiVersion: v2
 appVersion: v2.0.0
 description: OpenStack-Helm Docker Registry
 name: registry
-version: 2024.2.0
+version: 2025.1.0
 home: https://github.com/kubernetes/ingress
 sources:
   - https://opendev.org/openstack/openstack-helm
diff --git a/releasenotes/config.yaml b/releasenotes/config.yaml
index acb002c335..f97dd1f996 100644
--- a/releasenotes/config.yaml
+++ b/releasenotes/config.yaml
@@ -1,4 +1,9 @@
 ---
+# The 2024.2.0 is the release when we introduced CHANGELOG.md
+# When we generate the CHANGELOG.md we append all earlier release notes as well.
+# So the earliest release we should take while generating the CHANGELOG.md
+# is 2024.2.0.
+earliest_version: 2024.2.0
 branch: master
 collapse_pre_releases: false
 stop_at_branch_base: true
diff --git a/shaker/Chart.yaml b/shaker/Chart.yaml
index dd01e4e2ef..320a33a513 100644
--- a/shaker/Chart.yaml
+++ b/shaker/Chart.yaml
@@ -15,7 +15,7 @@ apiVersion: v2
 appVersion: v1.0.0
 description: OpenStack-Helm Shaker
 name: shaker
-version: 2024.2.0
+version: 2025.1.0
 home: https://pyshaker.readthedocs.io/en/latest/index.html
 icon: https://encrypted-tbn0.gstatic.com/images?q=tbn:ANd9GcTlnnEExfz6H9bBFFDxsDm5mVTdKWOt6Hw2_3aJ7hVkNdDdTCrimQ
 sources:
diff --git a/tacker/Chart.yaml b/tacker/Chart.yaml
index 42ae54c1ce..8f1467afdb 100644
--- a/tacker/Chart.yaml
+++ b/tacker/Chart.yaml
@@ -15,7 +15,7 @@ apiVersion: v2
 appVersion: v1.0.0
 description: OpenStack-Helm Tacker
 name: tacker
-version: 2024.2.0
+version: 2025.1.0
 home: https://docs.openstack.org/tacker/latest/
 icon: https://www.openstack.org/themes/openstack/images/project-mascots/Tacker/OpenStack_Project_Tacker_vertical.png
 sources:
diff --git a/tempest/Chart.yaml b/tempest/Chart.yaml
index 80ad55f136..d392d34131 100644
--- a/tempest/Chart.yaml
+++ b/tempest/Chart.yaml
@@ -15,7 +15,7 @@ apiVersion: v2
 appVersion: v1.0.0
 description: OpenStack-Helm Tempest
 name: tempest
-version: 2024.2.0
+version: 2025.1.0
 home: https://docs.openstack.org/tempest/latest/
 icon: https://www.openstack.org/themes/openstack/images/project-mascots/tempest/OpenStack_Project_tempest_vertical.png
 sources:
diff --git a/tools/chart_version.sh b/tools/chart_version.sh
index 186689c8be..383447aee3 100755
--- a/tools/chart_version.sh
+++ b/tools/chart_version.sh
@@ -5,8 +5,12 @@ set -euo pipefail
 if [[ $# -lt 2 ]]; then
     echo "Usage: $0 <chart_dir> <base_version>"
     echo "  <chart_dir> - The chart directory."
-    echo "  <base_version> - The base version. For example 2024.2.0."
+    echo "  <base_version> - The base version must be <major>.<minor>.<patch>"
+    echo "                   For example 2024.2.0"
     echo "                   Will be modified to 2024.2.<patch>+<commit_sha>"
+    echo "                   where <patch> is the number of commits since the tag"
+    echo "                   equal to <base_version>. If no such tag exists,"
+    echo "                   <patch> will be taken from <base_version>."
     exit 1
 fi
 
@@ -14,13 +18,11 @@ CHART_DIR=$1
 BASE_VERSION=$2
 MAJOR=$(echo "$BASE_VERSION" | cut -d. -f1)
 MINOR=$(echo "$BASE_VERSION" | cut -d. -f2)
+PATCH=$(echo "$BASE_VERSION" | cut -d. -f3)
 
 if git show-ref --tags "$BASE_VERSION" --quiet; then
     # if there is tag $BASE_VERSION, then we count the number of commits since the tag
     PATCH=$(git log --oneline "${BASE_VERSION}.." "$CHART_DIR" | wc -l | xargs)
-else
-    # if there is no tag $BASE_VERSION, then we count the number of commits since the beginning
-    PATCH=$(git log --oneline "$CHART_DIR" | wc -l | xargs)
 fi
 
 COMMIT_SHA=$(git rev-parse --short HEAD)