diff --git a/.gitreview b/.gitreview
index b6f18ed..5f1402c 100644
--- a/.gitreview
+++ b/.gitreview
@@ -3,4 +3,4 @@
 port=29418
 project=voltha-helm-charts.git
 defaultremote=origin
-defaultbranch=master
+defaultbranch=voltha-2.13
diff --git a/VERSION b/VERSION
index 7bcbb38..1545d96 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-3.4.9
+3.5.0
diff --git a/bbsim-sadis-server/Chart.yaml b/bbsim-sadis-server/Chart.yaml
index 267ad71..f4c421f 100644
--- a/bbsim-sadis-server/Chart.yaml
+++ b/bbsim-sadis-server/Chart.yaml
@@ -1,4 +1,4 @@
-# Copyright 2020-2023 Open Networking Foundation (ONF) and the ONF Contributors
+# Copyright 2020-2025 Open Networking Foundation (ONF) and the ONF Contributors
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -15,9 +15,9 @@
 apiVersion: "v1"
 name: "bbsim-sadis-server"
 
-## Chart version for package: 'bbsim-sadis-server'
+## Chart version for package 'bbsim-sadis-server'
 ##   Increment when Chart.yaml changes
-version: "0.3.4"
+version: "0.3.5"
 
 description: "A Helm chart for Voltha BBSIM sadis server"
 keywords:
@@ -35,6 +35,6 @@
     url: "https://www.opennetworking.org"
 
 # appVersion refers to the release version of bbsim-sadis-server
-appVersion: "0.3.5"
+appVersion: "0.4.0"
 
 # [EOF]
diff --git a/bbsim/Chart.yaml b/bbsim/Chart.yaml
index b919cca..87ff6bb 100644
--- a/bbsim/Chart.yaml
+++ b/bbsim/Chart.yaml
@@ -1,4 +1,4 @@
-# Copyright 2018-2023 Open Networking Foundation (ONF) and the ONF Contributors
+# Copyright 2018-2025 Open Networking Foundation (ONF) and the ONF Contributors
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -16,5 +16,10 @@
 description: Broadband Simulator
 icon: https://guide.opencord.org/logos/cord.svg
 apiVersion: v1
-version: 4.8.10
-appVersion: 1.15.2
+
+## Chart version for package 'bbsim'
+##   Increment when Chart.yaml changes
+version: 4.8.11
+
+# appVersion refers to release version of bbsim
+appVersion: 1.16.7
diff --git a/voltha-adapter-openolt/Chart.yaml b/voltha-adapter-openolt/Chart.yaml
index c7607d5..8ddc835 100644
--- a/voltha-adapter-openolt/Chart.yaml
+++ b/voltha-adapter-openolt/Chart.yaml
@@ -1,4 +1,4 @@
-# Copyright 2019-2024 Open Networking Foundation (ONF) and the ONF Contributors
+# Copyright 2019-2025 Open Networking Foundation (ONF) and the ONF Contributors
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -15,9 +15,9 @@
 apiVersion: "v1"
 name: "voltha-adapter-openolt"
 
-## Chart version for package:
+## Chart version for package 'voltha-adapter-openolt'
 ##   Increment when Chart.yaml changes
-version: "2.12.7"
+version: "2.13.0"
 description: "A Helm chart for Voltha OpenOLT Adapter"
 keywords:
   - "onf"
@@ -35,6 +35,6 @@
     url: "https://www.opennetworking.org"
 
 # appVersion refers to release version of voltha-openolt-adapter
-appVersion: "4.5.3"
+appVersion: "4.5.6"
 
 # [EOF]
diff --git a/voltha-adapter-openonu/Chart.yaml b/voltha-adapter-openonu/Chart.yaml
index 3162364..8c429b3 100644
--- a/voltha-adapter-openonu/Chart.yaml
+++ b/voltha-adapter-openonu/Chart.yaml
@@ -14,7 +14,7 @@
 ---
 apiVersion: "v1"
 name: "voltha-adapter-openonu"
-version: "2.12.5"
+version: "2.13.0"
 description: "A Helm chart for Voltha OpenONU Adapter"
 keywords:
   - "onf"
@@ -25,13 +25,13 @@
 home: "https://www.opennetworking.org/voltha"
 icon: "https://guide.opencord.org/logos/voltha.svg"
 sources:
-  - "https://github.com/opencord/voltha-openonu-adapter"
+  - "https://github.com/opencord/voltha-openonu-adapter-go"
 maintainers:
   - name: "Open Networking Foundation"
     email: "info@opennetworking.org"
     url: "https://www.opennetworking.org"
 
 # appVersion refers to release version of voltha-openonu-adapter-go
-appVersion: "2.12.7"
+appVersion: "2.12.14"
 
 # [EOF]
diff --git a/voltha-go-controller/Chart.yaml b/voltha-go-controller/Chart.yaml
index 0b9c7b9..d240bda 100644
--- a/voltha-go-controller/Chart.yaml
+++ b/voltha-go-controller/Chart.yaml
@@ -1,4 +1,4 @@
-# Copyright 2022-2024 Open Networking Foundation (ONF) and the ONF Contributors
+# Copyright 2022-2025 Open Networking Foundation (ONF) and the ONF Contributors
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -13,20 +13,13 @@
 # limitations under the License.
 
 apiVersion: v1
-
-# -----------------------------------------------------------------------
-# https://gerrit.opencord.org/plugins/gitiles/voltha-go-controller/+/refs/heads/master/VERSION
-# Huh(?) VERSION is 0.0.1-dev not 1.0
-# -----------------------------------------------------------------------
-
-# appVersion refers to release version of voltha-go-controller
-appVersion: "0.0.2"
-
-description: A Helm chart for Kubernetes
 name: voltha-go-controller
+description: A Helm chart for Kubernetes
+# appVersion refers to release version of voltha-go-controller
+appVersion: "0.1.5"
 
 ## Chart version for package voltha-stack
 ##   Increment when Chart.yaml changes
-version: "0.1.9"
+version: "0.1.10"
 
 # [EOF]
diff --git a/voltha-infra/Chart.yaml b/voltha-infra/Chart.yaml
index 2afd63e..d6452a0 100644
--- a/voltha-infra/Chart.yaml
+++ b/voltha-infra/Chart.yaml
@@ -1,4 +1,4 @@
-# Copyright 2020-2023 Open Networking Foundation (ONF) and the ONF Contributors
+# Copyright 2020-2025 Open Networking Foundation (ONF) and the ONF Contributors
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -31,11 +31,11 @@
 
 # app version is NOT used in this chart for application versions or image tags
 # but represents the voltha release version itself
-appVersion : "2.12"
+appVersion: "2.13"
 
-## Chart version for package: voltha-infra
+## Chart version for package voltha-infra
 ##   Increment when Chart.yaml changes
-version: "2.12.7"
+version: "2.13.0"
 
 dependencies:
   - name       : "onos-classic"
@@ -48,7 +48,7 @@
     condition  : "redis.enabled"
   - name       : "bbsim-sadis-server"
     repository : "file://../bbsim-sadis-server"
-    version    : "0.3.4"
+    version    : "0.3.5"
     condition  : "bbsim-sadis-server.enabled"
   - name       : "etcd"
     repository : "https://charts.bitnami.com/bitnami"
@@ -60,7 +60,7 @@
     condition  : "kafka.enabled"
   - name       : "freeradius"
     repository : "https://charts.opencord.org"
-    version    : "1.0.2"
+    version    : "1.0.4"
     condition  : "radius.enabled"
   - name       : "voltha-tracing"
     repository : "file://../voltha-tracing"
diff --git a/voltha-stack/Chart.yaml b/voltha-stack/Chart.yaml
index 7e586f1..c554248 100644
--- a/voltha-stack/Chart.yaml
+++ b/voltha-stack/Chart.yaml
@@ -1,4 +1,4 @@
-# Copyright 2020-2024 Open Networking Foundation (ONF) and the ONF Contributors
+# Copyright 2020-2025 Open Networking Foundation (ONF) and the ONF Contributors
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -30,11 +30,11 @@
 
 # app version is NOT used in this chart for application versions or image tags
 # but represents the voltha release version itself
-appVersion : "2.12"
+appVersion: "2.13"
 
 ## Chart version for package voltha-stack
 ##   Increment when Chart.yaml changes
-version    : "2.12.16"
+version: "2.13.0"
 
 # -----------------------------------------------------------------------
 # NOTE: Dependencies are chart versions not component/repository version
@@ -43,19 +43,19 @@
 dependencies:
   - name       : voltha
     repository : file://../voltha
-    version    : "2.12.20"
+    version    : "2.13.0"
     condition  : voltha.enabled
   - name       : "voltha-adapter-openonu"
     repository : "file://../voltha-adapter-openonu"
-    version    : "2.12.5"
+    version    : "2.13.0"
     condition  : "voltha-adapter-openonu.enabled"
   - name       : voltha-adapter-openolt
     repository : file://../voltha-adapter-openolt
-    version    : "2.12.7"
+    version    : "2.13.0"
     condition  : voltha-adapter-openolt.enabled
   - name       : voltha-go-controller
     repository : file://../voltha-go-controller
-    version    : "0.1.9"
+    version    : "0.1.10"
     condition  : voltha-go-controller.enabled
 
 # [EOF]
diff --git a/voltha-tracing/Chart.yaml b/voltha-tracing/Chart.yaml
index 3a33132..e6fde24 100644
--- a/voltha-tracing/Chart.yaml
+++ b/voltha-tracing/Chart.yaml
@@ -1,4 +1,4 @@
-# Copyright 2020-2024 Open Networking Foundation (ONF) and the ONF Contributors
+# Copyright 2020-2025 Open Networking Foundation (ONF) and the ONF Contributors
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -15,9 +15,9 @@
 apiVersion: v1
 name: "voltha-tracing"
 
-## Chart version for package:
+## Chart version for package voltha-tracing
 ##   Increment when Chart.yaml changes
-version: "2.12.2"
+version: "2.12.3"
 
 description: "A Helm chart for deploying Jaeger all-in-one container for Trace data collection and analysis"
 keywords:
diff --git a/voltha/Chart.yaml b/voltha/Chart.yaml
index ca848eb..9305ec4 100644
--- a/voltha/Chart.yaml
+++ b/voltha/Chart.yaml
@@ -1,4 +1,4 @@
-# Copyright 2019-2024 Open Networking Foundation (ONF) and the ONF Contributors
+# Copyright 2019-2025 Open Networking Foundation (ONF) and the ONF Contributors
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -15,9 +15,9 @@
 apiVersion: "v1"
 name: "voltha"
 
-## Chart version for package: 'voltha'
+## Chart version for package 'voltha'
 ##   Increment when Chart.yaml changes
-version: "2.12.20"
+version: "2.13.0"
 
 description: "A Helm chart for Voltha based on K8S resources in Voltha project"
 keywords:
@@ -35,8 +35,7 @@
     email: "info@opennetworking.org"
     url: "https://www.opennetworking.org"
 
-# app version is NOT used in this chart for application versions or image tags
-# but represents the voltha release version itself
-appVersion: "3.6.1"
+# appVersion refers to release version of voltha-go
+appVersion: "3.6.6"
 
 # [EOF]