diff --git a/voltha-infra/Chart.yaml b/voltha-infra/Chart.yaml
index c976bf0..e1d19be 100644
--- a/voltha-infra/Chart.yaml
+++ b/voltha-infra/Chart.yaml
@@ -23,62 +23,63 @@
 home: "https://www.opennetworking.org/voltha"
 icon: "https://guide.opencord.org/logos/voltha.svg"
 maintainers:
-  - name: "Open Networking Foundation"
-    email: "info@opennetworking.org"
-    url: "https://www.opennetworking.org"
-name: voltha-infra
+  - name  : "Open Networking Foundation"
+    email : "info@opennetworking.org"
+    url   : "https://www.opennetworking.org"
+
+name       : "voltha-infra"
 
 # 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.12"
 
 ## Chart version for package: voltha-infra
-##   Increment when Chart.yaml changes
-version: "2.12.3"
+##   aIncrement when Chart.yaml changes
+version    : "2.12.6"
 
 dependencies:
   - name       : "onos-classic"
     repository : "https://charts.onosproject.org"
     version    : "0.1.31"
     condition  : "onos-classic.enabled"
-  - name: redis
-    repository: https://charts.bitnami.com/bitnami
-    version: 17.0.10
-    condition: redis.enabled
+  - name       : "redis"
+    repository : "https://charts.bitnami.com/bitnami"
+    version    : "17.0.10"
+    condition  : "redis.enabled"
   - name       : "bbsim-sadis-server"
     repository : "file://../bbsim-sadis-server"
     version    : "0.3.4"
     condition  : "bbsim-sadis-server.enabled"
-  - name: etcd
-    repository: https://charts.bitnami.com/bitnami
-    version: 8.5.11
-    condition: etcd.enabled
-  - name: kafka
-    repository: https://charts.bitnami.com/bitnami
-    version: 20.0.2
-    condition: kafka.enabled
-  - name: freeradius
-    repository: https://charts.opencord.org
-    version: 1.0.2
-    condition: radius.enabled
-  - name       : voltha-tracing
-    repository : file://../voltha-tracing
+  - name       : "etcd"
+    repository : "https://charts.bitnami.com/bitnami"
+    version    : "8.5.11"
+    condition  : "etcd.enabled"
+  - name       : "kafka"
+    repository : "https://charts.bitnami.com/bitnami"
+    version    : "20.0.2"
+    condition  : "kafka.enabled"
+  - name       : "freeradius"
+    repository : "https://charts.opencord.org"
+    version    : "1.0.2"
+    condition  : "radius.enabled"
+  - name       : "voltha-tracing"
+    repository : "file://../voltha-tracing"
     version    : "2.12.2"
-    condition: voltha-tracing.enabled
-  - name: elasticsearch
-    repository: https://helm.elastic.co
-    version: 7.10.1
-    condition: efk.enabled
-  - name: kibana
-    repository: https://helm.elastic.co
-    version: 7.10.1
-    condition: efk.enabled
-  - name: fluentd-elasticsearch
-    repository: https://kiwigrid.github.io
-    version: 9.6.2
+    condition  : "voltha-tracing.enabled"
+  - name       : "elasticsearch"
+    repository : "https://helm.elastic.co"
+    version    : "7.10.1"
+    condition  : "efk.enabled"
+  - name       : "kibana"
+    repository : "https://helm.elastic.co"
+    version    : "7.10.1"
+    condition  : "efk.enabled"
+  - name       : "fluentd-elasticsearch"
+    repository : "https://kiwigrid.github.io"
+    version    : "9.6.2"
     # TODO kiwigrid is deprecated, use: https://github.com/kokuwaio/helm-charts/tree/main/charts/fluentd-elasticsearch
     # repository: https://kokuwaio.github.io/helm-charts
     # version: 11.7.1
-    condition: efk.enabled
+    condition  : "efk.enabled"
 
 # [EOF]
diff --git a/voltha-infra/templates/_helpers.tpl b/voltha-infra/templates/_helpers.tpl
index 55fd185..7824ab6 100644
--- a/voltha-infra/templates/_helpers.tpl
+++ b/voltha-infra/templates/_helpers.tpl
@@ -1,4 +1,4 @@
-# Copyright 2020-2023 Open Networking Foundation (ONF) and the ONF Contributors
+# Copyright 2020-2024 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.
diff --git a/voltha-infra/templates/etcd-periodic-defrag-cluster-role-binding.yaml b/voltha-infra/templates/etcd-periodic-defrag-cluster-role-binding.yaml
index eda2090..c2d59f7 100644
--- a/voltha-infra/templates/etcd-periodic-defrag-cluster-role-binding.yaml
+++ b/voltha-infra/templates/etcd-periodic-defrag-cluster-role-binding.yaml
@@ -1,4 +1,4 @@
-# Copyright 2020-2023 Open Networking Foundation (ONF) and the ONF Contributors
+# Copyright 2020-2024 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.
diff --git a/voltha-infra/templates/etcd-periodic-defrag-cluster-role.yaml b/voltha-infra/templates/etcd-periodic-defrag-cluster-role.yaml
index 1e83162..53b5219 100644
--- a/voltha-infra/templates/etcd-periodic-defrag-cluster-role.yaml
+++ b/voltha-infra/templates/etcd-periodic-defrag-cluster-role.yaml
@@ -1,4 +1,4 @@
-# Copyright 2020-2023 Open Networking Foundation (ONF) and the ONF Contributors
+# Copyright 2020-2024 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.
diff --git a/voltha-infra/templates/etcd-periodic-defrag.yaml b/voltha-infra/templates/etcd-periodic-defrag.yaml
index 34ec4ce..c1fcbc0 100644
--- a/voltha-infra/templates/etcd-periodic-defrag.yaml
+++ b/voltha-infra/templates/etcd-periodic-defrag.yaml
@@ -1,6 +1,6 @@
 ---
 
-# Copyright 2021-2023 Open Networking Foundation (ONF) and the ONF Contributors
+# Copyright 2021-2024 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.
diff --git a/voltha-infra/templates/ingress_etcd.yaml b/voltha-infra/templates/ingress_etcd.yaml
index 4f40d5e..811ce86 100644
--- a/voltha-infra/templates/ingress_etcd.yaml
+++ b/voltha-infra/templates/ingress_etcd.yaml
@@ -1,4 +1,4 @@
-# Copyright 2021-2023 Open Networking Foundation (ONF) and the ONF Contributors
+# Copyright 2021-2024 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.
diff --git a/voltha-infra/values.yaml b/voltha-infra/values.yaml
index f64dd40..8659797 100644
--- a/voltha-infra/values.yaml
+++ b/voltha-infra/values.yaml
@@ -1,4 +1,4 @@
-# Copyright 2020-2023 Open Networking Foundation (ONF) and the ONF Contributors
+# Copyright 2020-2024 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.
@@ -28,7 +28,7 @@
   image:
     pullPolicy: Always
     repository: voltha/voltha-onos
-    tag: 5.1.1
+    tag: 5.1.8
   apps:
     - org.onosproject.lldpprovider
     - org.onosproject.openflow-base