diff --git a/templates/kibana/kibana.yaml b/templates/kibana/kibana.yaml
index 4d5e4eb..95e7942 100644
--- a/templates/kibana/kibana.yaml
+++ b/templates/kibana/kibana.yaml
@@ -3,7 +3,7 @@ kind: Kibana
 metadata:
   name: sma-es-kibana
 spec:
-  version: 8.3.2
+  version: {{ .Values.kibana.version }}
   count: 1
   elasticsearchRef:
     name: sma-es
diff --git a/values_cusprod.yaml b/values_cusprod.yaml
index 4933baf..2548a84 100644
--- a/values_cusprod.yaml
+++ b/values_cusprod.yaml
@@ -60,6 +60,7 @@ tenant:
 
 kibana:
   name: kibana-cusprod-prodwork01.smardigo.digital
+  version: 8.3.2
 
 smardigo-connect:
   connect:
diff --git a/values_cusqa.yaml b/values_cusqa.yaml
index e1b76a4..7d94db4 100644
--- a/values_cusqa.yaml
+++ b/values_cusqa.yaml
@@ -60,6 +60,7 @@ tenant:
 
 kibana:
   name: kibana-cusqa-prodwork01.smardigo.digital
+  version: 8.3.2
 
 smardigo-connect:
   connect:
diff --git a/values_nsodev.yaml b/values_nsodev.yaml
index 8dc10ca..8b9a7f8 100644
--- a/values_nsodev.yaml
+++ b/values_nsodev.yaml
@@ -62,6 +62,7 @@ tenant:
 
 kibana:
   name: kibana-nsodev-prodwork01.smardigo.digital
+  version: 7.16.1
 
 smardigo-connect:
   postgres:
@@ -85,6 +86,9 @@ smardigo-connect:
       protocol: http
       hostname: iam.mobene-keycloak
       port: 8080
+  sma-es:
+    spec:
+      version: 7.16.1
 
 smardigo-worker:
   uba: