diff --git a/deploy/kubernetes/console/templates/analyzers.yaml b/deploy/kubernetes/console/templates/analyzers.yaml
index ca4d5a0d6d..75208610ff 100644
--- a/deploy/kubernetes/console/templates/analyzers.yaml
+++ b/deploy/kubernetes/console/templates/analyzers.yaml
@@ -1,4 +1,5 @@
 ---
+{{- if .Values.console.techPreview }}
 {{- if semverCompare ">=1.16" (printf "%s.%s" .Capabilities.KubeVersion.Major (trimSuffix "+" .Capabilities.KubeVersion.Minor) )}}
 apiVersion: apps/v1
 {{- else }}
@@ -20,6 +21,10 @@ spec:
       app.kubernetes.io/component: "stratos-analyzers"
   template:
     metadata:
+{{- if .Values.console.podAnnotations }}
+      annotations:
+{{ toYaml .Values.console.podAnnotations | indent 8 }}
+{{- end }}
       labels:
         app.kubernetes.io/name: "stratos"
         app.kubernetes.io/instance: "{{ .Release.Name }}"
@@ -27,6 +32,9 @@ spec:
         app.kubernetes.io/component: "stratos-analyzers"
         helm.sh/chart: "{{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }}"
         app: "{{ .Release.Name }}"
+        {{- if .Values.console.podExtraLabels}}
+        {{ toYaml .Values.console.podExtraLabels | nindent 8 }}
+        {{- end}}        
     spec:
       containers:
       - name: analyzers
@@ -36,10 +44,25 @@ spec:
         - name: api
           containerPort: 8090
         env:
+        - name: STRATOS_IMAGE_REF
+          value: "{{.Values.consoleVersion}}:{{ .Release.Revision }}"
         - name: ANALYSIS_SCRIPTS_DIR
           value: "/scripts"
         - name: ANALYSIS_REPORTS_DIR
           value: "/reports"
+        volumeMounts:
+        - name: data
+          mountPath: /reports
+      {{- if and .Values.kube.registry.username .Values.kube.registry.password }}
+      imagePullSecrets:
+      - name: {{.Values.dockerRegistrySecret}}
+      {{- end }}
+      {{- if not .Values.console.reportsVolumeDisabled }}
+      volumes:
+      - name: data
+        persistentVolumeClaim:
+          claimName: "{{ .Release.Name }}-reports"
+      {{- end }}
 ---
 apiVersion: v1
 kind: Service
@@ -60,3 +83,27 @@ spec:
   selector:
     app: "{{ .Release.Name }}"
     app.kubernetes.io/component: "stratos-analyzers"
+---
+kind: PersistentVolumeClaim
+apiVersion: v1
+metadata:
+  name: "{{ .Release.Name }}-reports"
+  labels:
+    app.kubernetes.io/name: "stratos"
+    app.kubernetes.io/instance: "{{ .Release.Name }}"
+    app.kubernetes.io/version: "{{ .Chart.AppVersion }}"
+    app.kubernetes.io/component: "stratos-reports-volume"
+    helm.sh/chart: "{{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }}"
+  annotations:
+  {{- if .Values.storageClass }}
+    volume.beta.kubernetes.io/storage-class: {{ .Values.storageClass | quote }}
+  {{- else }}
+    volume.alpha.kubernetes.io/storage-class: default
+  {{- end }}
+spec:
+  accessModes:
+    - "ReadWriteOnce"
+  resources:
+    requests:
+      storage: {{ default "1Gi" .Values.console.reportsVolumeSize | quote }}
+{{- end }}
diff --git a/deploy/kubernetes/console/values.yaml b/deploy/kubernetes/console/values.yaml
index 5dbf69f47d..d2ee436aca 100644
--- a/deploy/kubernetes/console/values.yaml
+++ b/deploy/kubernetes/console/values.yaml
@@ -112,6 +112,12 @@ console:
 
   # Download link when installing the Kubernetes Dashboard in a targetted Kube Endpoint
   kubeDashboardImage:
+
+  # Size for analysis reports volume
+  reportsVolumeSize: 1Gi
+
+  # Do not use a persistent volume for analysis reports
+  reportsVolumeDisabled: false
   
 images:
   console: stratos-console
diff --git a/src/frontend/packages/suse-extensions/src/custom/kubernetes/workloads/release/tabs/helm-release-resource-graph/helm-release-resource-graph.component.ts b/src/frontend/packages/suse-extensions/src/custom/kubernetes/workloads/release/tabs/helm-release-resource-graph/helm-release-resource-graph.component.ts
index 9e73f79e75..99235522c1 100644
--- a/src/frontend/packages/suse-extensions/src/custom/kubernetes/workloads/release/tabs/helm-release-resource-graph/helm-release-resource-graph.component.ts
+++ b/src/frontend/packages/suse-extensions/src/custom/kubernetes/workloads/release/tabs/helm-release-resource-graph/helm-release-resource-graph.component.ts
@@ -245,16 +245,9 @@ export class HelmReleaseResourceGraphComponent implements OnInit, OnDestroy {
   private getResource(node: CustomHelmReleaseGraphNode): Observable<HelmReleaseResource> {
     return this.helper.fetchReleaseResources().pipe(
       filter(r => !!r),
-      // tap(r => {
-      //   console.log(node);
-      //   console.log(r);
-      // }),
-      map((r: HelmReleaseResources) => Object.values(r.data).find((res) => {
-        // if (!res.metadata) {
-        //   console.log(node, res);
-        // }
-        return res.metadata.name === node.label && res.kind === node.data.kind;
-      })),
+      map((r: HelmReleaseResources) => Object.values(r.data).find((res) =>
+        res.metadata.name === node.label && res.kind === node.data.kind
+      )),
       first(),
     );
   }
diff --git a/src/frontend/packages/suse-extensions/src/custom/suse-login/suse-login.component.scss b/src/frontend/packages/suse-extensions/src/custom/suse-login/suse-login.component.scss
index 62ccddf629..c84aae5cfa 100644
--- a/src/frontend/packages/suse-extensions/src/custom/suse-login/suse-login.component.scss
+++ b/src/frontend/packages/suse-extensions/src/custom/suse-login/suse-login.component.scss
@@ -128,6 +128,7 @@
     }
   }
   &__message {
+    color: $suse-gray-fg;
     font-size: 18px;
     font-weight: 300;
     height: 20px;