diff --git a/charts/client/Chart.yaml b/charts/client/Chart.yaml
index 3d467ac8..0a00498a 100644
--- a/charts/client/Chart.yaml
+++ b/charts/client/Chart.yaml
@@ -15,7 +15,7 @@ type: application
 # This is the chart version. This version number should be incremented each time you make changes
 # to the chart and its templates, including the app version.
 # Versions are expected to follow Semantic Versioning (https://semver.org/)
-version: 1.1.5
+version: 1.1.6
 
 # This is the version number of the application being deployed. This version number should be
 # incremented each time you make changes to the application. Versions are not expected to
diff --git a/charts/client/templates/configmap-azure-dashboard.yaml b/charts/client/templates/configmap-azure-dashboard.yaml
index 8025b20a..f0bfca39 100644
--- a/charts/client/templates/configmap-azure-dashboard.yaml
+++ b/charts/client/templates/configmap-azure-dashboard.yaml
@@ -4,7 +4,7 @@ kind: ConfigMap
 metadata:
   name: {{ include "client.fullname" . }}-azure-dashboard
   annotations:
-    grafana_folder: "Kubviz"
+    grafana_folder: "Gitbridge"
   labels:
     {{ .Values.dashboards.label }}: {{ .Values.dashboards.labelValue | quote }}
 data:
diff --git a/charts/client/templates/configmap-bitbucket-dashboard.yaml b/charts/client/templates/configmap-bitbucket-dashboard.yaml
index caa52a35..04a61d88 100644
--- a/charts/client/templates/configmap-bitbucket-dashboard.yaml
+++ b/charts/client/templates/configmap-bitbucket-dashboard.yaml
@@ -4,7 +4,7 @@ kind: ConfigMap
 metadata:
   name: {{ include "client.fullname" . }}-bitbucket-dashboard
   annotations:
-    grafana_folder: "Kubviz"
+    grafana_folder: "Gitbridge"
   labels:
     {{ .Values.dashboards.label }}: {{ .Values.dashboards.labelValue | quote }}
 data:
diff --git a/charts/client/templates/configmap-clickhouse-datasource.yaml b/charts/client/templates/configmap-clickhouse-datasource.yaml
index fac0f087..b28461cd 100644
--- a/charts/client/templates/configmap-clickhouse-datasource.yaml
+++ b/charts/client/templates/configmap-clickhouse-datasource.yaml
@@ -13,6 +13,6 @@ data:
         type: grafana-clickhouse-datasource
         jsonData:
           port: 9000
-          server: kubviz-client-clickhouse
+          server: {{ include "client.fullname" . }}-clickhouse
           tlsSkipVerify: true
 {{- end }}
\ No newline at end of file
diff --git a/charts/client/templates/configmap-containerbridge-dashboard.yaml b/charts/client/templates/configmap-containerbridge-dashboard.yaml
index 48a72bd8..fa45e2e5 100644
--- a/charts/client/templates/configmap-containerbridge-dashboard.yaml
+++ b/charts/client/templates/configmap-containerbridge-dashboard.yaml
@@ -4,7 +4,7 @@ kind: ConfigMap
 metadata:
   name: {{ include "client.fullname" . }}-containerbridge-dashboard
   annotations:
-    grafana_folder: "Kubviz"
+    grafana_folder: "Containerbridge"
   labels:
     {{ .Values.dashboards.label }}: {{ .Values.dashboards.labelValue | quote }}
 data:
diff --git a/charts/client/templates/configmap-gitea-dashboard.yaml b/charts/client/templates/configmap-gitea-dashboard.yaml
index 43782f56..db0eca73 100644
--- a/charts/client/templates/configmap-gitea-dashboard.yaml
+++ b/charts/client/templates/configmap-gitea-dashboard.yaml
@@ -4,7 +4,7 @@ kind: ConfigMap
 metadata:
   name: {{ include "client.fullname" . }}-gitea-dashboard
   annotations:
-    grafana_folder: "Kubviz"
+    grafana_folder: "Gitbridge"
   labels:
     {{ .Values.dashboards.label }}: {{ .Values.dashboards.labelValue | quote }}
 data:
diff --git a/charts/client/templates/configmap-github-dashboard.yaml b/charts/client/templates/configmap-github-dashboard.yaml
index 12a5029d..9373cd00 100644
--- a/charts/client/templates/configmap-github-dashboard.yaml
+++ b/charts/client/templates/configmap-github-dashboard.yaml
@@ -4,7 +4,7 @@ kind: ConfigMap
 metadata:
   name: {{ include "client.fullname" . }}-github-dashboard
   annotations:
-    grafana_folder: "Kubviz"
+    grafana_folder: "Gitbridge"
   labels:
     {{ .Values.dashboards.label }}: {{ .Values.dashboards.labelValue | quote }}
 data:
diff --git a/charts/client/templates/configmap-gitlab-dashboard.yaml b/charts/client/templates/configmap-gitlab-dashboard.yaml
index 5761e68f..382d3e04 100644
--- a/charts/client/templates/configmap-gitlab-dashboard.yaml
+++ b/charts/client/templates/configmap-gitlab-dashboard.yaml
@@ -4,7 +4,7 @@ kind: ConfigMap
 metadata:
   name: {{ include "client.fullname" . }}-gitlab-dashboard
   annotations:
-    grafana_folder: "Kubviz"
+    grafana_folder: "Gitbridge"
   labels:
     {{ .Values.dashboards.label }}: {{ .Values.dashboards.labelValue | quote }}
 data:
diff --git a/charts/client/templates/configmap-kubviz-dashboard.yaml b/charts/client/templates/configmap-kubviz-dashboard.yaml
index 795593ea..c79ea4bb 100644
--- a/charts/client/templates/configmap-kubviz-dashboard.yaml
+++ b/charts/client/templates/configmap-kubviz-dashboard.yaml
@@ -2750,7 +2750,7 @@ data:
         "list": []
       },
       "time": {
-        "from": "now-5m",
+        "from": "now-24h",
         "to": "now"
       },
       "timepicker": {},
diff --git a/charts/client/templates/configmap-vertamedia-datasource.yaml b/charts/client/templates/configmap-vertamedia-datasource.yaml
index b2ea28fe..3b2ce491 100644
--- a/charts/client/templates/configmap-vertamedia-datasource.yaml
+++ b/charts/client/templates/configmap-vertamedia-datasource.yaml
@@ -11,6 +11,6 @@ data:
     datasources:
       - name: vertamedia-clickhouse-datasource
         type: vertamedia-clickhouse-datasource
-        url: http://kubviz-client-clickhouse:8123
+        url: {{ include "client.fullname" . }}-clickhouse:8123
         access: proxy
 {{- end }}
\ No newline at end of file