diff --git a/Dockerfile b/Dockerfile
index b763d7c..4dff64c 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,4 +1,4 @@
-FROM ubuntu:23.04
+FROM ubuntu:22.04
 
 ARG RUNTIME_USER="koa"
 ARG RUNTIME_USER_UID=4583
diff --git a/js/frontend.js b/js/frontend.js
index 6011f69..69f9c76 100755
--- a/js/frontend.js
+++ b/js/frontend.js
@@ -318,7 +318,8 @@ define(['jquery', 'bootstrap', 'bootswatch', 'd3Selection', 'stackedAreaChart',
             for (let nname in data) {
                 if (data.hasOwnProperty(nname)) {
                     let node = data[nname];
-                    nodeHtmlList += '<li><a href="#" data-toggle="modal" data-target="#' + node.id + '">' + node.name + '</a></li>';
+                    let nname4Css = nname.replace('.', '_');
+                    nodeHtmlList += '<li><a href="#" data-toggle="modal" data-target="#' + node.id + '">' + nname4Css + '</a></li>';
                     popupContent += createPopupContent(node);
                 }
             }
@@ -463,19 +464,21 @@ define(['jquery', 'bootstrap', 'bootswatch', 'd3Selection', 'stackedAreaChart',
                     let dynHtml = '';
                     let donuts = new Map();
                     for (let [nname, _] of dataset.data) {
+                        let nname4Css = nname.replace('.', '_');
                         donuts[nname] = donut();
                         dynHtml += '<div class="col-md-4">';
                         dynHtml += '  <h4>' + nname + '</h4>';
-                        dynHtml += '  <div class="js-' + nname + '"></div>';
-                        dynHtml += '  <div class="js-' + nname + '-legend" britechart-legend"></div>';
+                        dynHtml += '  <div class="js-' + nname4Css + '"></div>';
+                        dynHtml += '  <div class="js-' + nname4Css + '-legend" britechart-legend"></div>';
                         dynHtml += '</div>';
                     }
                     $("#js-nodes-load-container").html(dynHtml);
                     for (let [nname, ndata] of dataset.data) {
+                        let nname4Css = nname.replace('.', '_');
                         updateDonutChart(ndata['chartData'],
                             donuts[nname],
-                            'js-' + nname,
-                            'js-' + nname + '-legend');
+                            'js-' + nname4Css,
+                            'js-' + nname4Css + '-legend');
                     }
                 },
                 error: function (xhr, ajaxOptions, thrownError) {
@@ -503,7 +506,6 @@ define(['jquery', 'bootstrap', 'bootswatch', 'd3Selection', 'stackedAreaChart',
 
         function showCumulativeUsageByType() {
             cumulativeUsageType = $("#selected-cumulative-usage-type option:selected").val();
-            console.log(cumulativeUsageType);
             if (cumulativeUsageType === 'monthly-usage') {
                 $("#chart-block-daily").hide();
                 $("#chart-block-monthly").show();
diff --git a/manifests/helm/templates/serviceaccount.yaml b/manifests/helm/templates/serviceaccount.yaml
index 596e783..706105b 100644
--- a/manifests/helm/templates/serviceaccount.yaml
+++ b/manifests/helm/templates/serviceaccount.yaml
@@ -6,6 +6,15 @@ metadata:
   labels:
     {{- include "kube-opex-analytics.labels" . | nindent 4 }}
 ---
+apiVersion: v1
+kind: Secret
+metadata:
+  name: {{ include "kube-opex-analytics.fullname" . }}
+  namespace: {{ .Release.Namespace }}
+	annotations:
+		kubernetes.io/service-account.name: {{ include "kube-opex-analytics.fullname" . }}
+type: kubernetes.io/service-account-token
+---
 apiVersion: rbac.authorization.k8s.io/v1
 kind: ClusterRole
 metadata:
diff --git a/manifests/kustomize/resources/kube-opex-analytics-rbac.yaml b/manifests/kustomize/resources/kube-opex-analytics-rbac.yaml
index 2865dbb..404f303 100644
--- a/manifests/kustomize/resources/kube-opex-analytics-rbac.yaml
+++ b/manifests/kustomize/resources/kube-opex-analytics-rbac.yaml
@@ -8,6 +8,15 @@ metadata:
     app.kubernetes.io/instance: kube-opex-analytics
     app: kube-opex-analytics
 ---
+apiVersion: v1
+kind: Secret
+metadata:
+	name: kube-opex-analytics
+	namespace: kube-opex-analytics
+	annotations:
+		kubernetes.io/service-account.name: "kube-opex-analytics"
+type: kubernetes.io/service-account-token
+---
 apiVersion: rbac.authorization.k8s.io/v1
 kind: ClusterRole
 metadata: