diff --git a/deployment/helmchart/Chart.yaml b/deployment/helmchart/Chart.yaml
index 8fab06a..f444ef0 100644
--- a/deployment/helmchart/Chart.yaml
+++ b/deployment/helmchart/Chart.yaml
@@ -10,16 +10,16 @@ dependencies:
     version: 1.x.x
 description: A Helm chart for deploying the Stackspin Dashboard to Kubernetes
 engine: gotpl
-home: https://open.greenhost.net/openappstack/admin-frontend/
-icon: https://open.greenhost.net/openappstack/admin-frontend/-/blob/master/public/assets/logo.svg
+home: https://open.greenhost.net/openappstack/dashboard-frontend/
+icon: https://open.greenhost.net/openappstack/dashboard-frontend/-/blob/master/public/assets/logo.svg
 keywords:
   - stackspin
   - dashboard
 maintainers:
   - email: info@openappstack.net
     name: Stackspin
-name: admin-panel
+name: dashboard
 sources:
-  - https://open.greenhost.net/openappstack/admin-frontend/
-  - https://open.greenhost.net/openappstack/admin-backend/
+  - https://open.greenhost.net/openappstack/dashboard-frontend/
+  - https://open.greenhost.net/openappstack/dashboard-backend/
 version: 0.1.0
diff --git a/deployment/helmchart/templates/_helpers.tpl b/deployment/helmchart/templates/_helpers.tpl
index f1c5a3c..1731d23 100644
--- a/deployment/helmchart/templates/_helpers.tpl
+++ b/deployment/helmchart/templates/_helpers.tpl
@@ -2,7 +2,7 @@
 {{/*
 Create the name of the service account to use
 */}}
-{{- define "adminPanel.serviceAccountName" -}}
+{{- define "dashboard.serviceAccountName" -}}
 {{- if .Values.serviceAccount.create -}}
     {{ default (include "common.names.fullname" .) .Values.serviceAccount.name }}
 {{- else -}}
@@ -13,15 +13,15 @@ Create the name of the service account to use
 {{/*
 Return the proper Docker image registry secret names
 */}}
-{{- define "adminPanel.imagePullSecrets" -}}
+{{- define "dashboard.imagePullSecrets" -}}
 {{ include "common.images.pullSecrets" (dict "images" (list .Values.image) "global" .Values.global) }}
 {{- end -}}
 
 {{/*
 Return true if a secret object for Admin-frontend should be created
 */}}
-{{- define "adminBackend.createSecret" -}}
-{{- if or (not .Values.adminBackend.existingSecret) (and (not .Values.adminBackend.smtp.existingSecret) .Values.adminBackend.smtp.password .Values.adminBackend.smtp.enabled) }}
+{{- define "backend.createSecret" -}}
+{{- if or (not .Values.backend.existingSecret) (and (not .Values.backend.smtp.existingSecret) .Values.backend.smtp.password .Values.backend.smtp.enabled) }}
     {{- true -}}
 {{- end -}}
 {{- end -}}
@@ -29,30 +29,30 @@ Return true if a secret object for Admin-frontend should be created
 {{/*
 Return the Admin-backend secret name
 */}}
-{{- define "adminBackend.secretName" -}}
-{{- if .Values.adminBackend.existingSecret }}
-    {{- printf "%s" .Values.adminBackend.existingSecret -}}
+{{- define "backend.secretName" -}}
+{{- if .Values.backend.existingSecret }}
+    {{- printf "%s" .Values.backend.existingSecret -}}
 {{- else -}}
-    {{- printf "%s-admin-backend" (include "common.names.fullname" .) -}}
+    {{- printf "%s-backend" (include "common.names.fullname" .) -}}
 {{- end -}}
 {{- end -}}
 
 {{/*
 Return the Admin-backend SMTP secret name
 */}}
-{{- define "adminBackend.smtp.secretName" -}}
-{{- if .Values.adminBackend.smtp.existingSecret }}
-    {{- printf "%s" .Values.adminBackend.smtp.existingSecret -}}
+{{- define "backend.smtp.secretName" -}}
+{{- if .Values.backend.smtp.existingSecret }}
+    {{- printf "%s" .Values.backend.smtp.existingSecret -}}
 {{- else -}}
-    {{- printf "%s-admin-backend" (include "common.names.fullname" .) -}}
+    {{- printf "%s-backend" (include "common.names.fullname" .) -}}
 {{- end -}}
 {{- end -}}
 
 {{/*
 Return true if Admin-backend SMTP uses password authentication
 */}}
-{{- define "adminBackend.smtp.password.enabled" -}}
-{{- if and (or .Values.adminBackend.smtp.password .Values.adminBackend.smtp.existingSecret) .Values.adminBackend.smtp.enabled }}
+{{- define "backend.smtp.password.enabled" -}}
+{{- if and (or .Values.backend.smtp.password .Values.backend.smtp.existingSecret) .Values.backend.smtp.enabled }}
     {{- true -}}
 {{- end -}}
 {{- end -}}
@@ -61,11 +61,11 @@ Return true if Admin-backend SMTP uses password authentication
 Get the user defined LoadBalancerIP for this release
 Note, returns 127.0.0.1 if using ClusterIP.
 */}}
-{{- define "adminFrontend.serviceIP" -}}
-{{- if eq .Values.adminFrontend.service.type "ClusterIP" -}}
+{{- define "frontend.serviceIP" -}}
+{{- if eq .Values.frontend.service.type "ClusterIP" -}}
 127.0.0.1
 {{- else -}}
-{{- .Values.adminFrontend.service.loadBalancerIP | default "" -}}
+{{- .Values.frontend.service.loadBalancerIP | default "" -}}
 {{- end -}}
 {{- end -}}
 
@@ -73,22 +73,22 @@ Note, returns 127.0.0.1 if using ClusterIP.
 Gets the host to be used for this application.
 If not using ClusterIP, or if a host or LoadBalancerIP is not defined, the value will be empty
 */}}
-{{- define "adminFrontend.host" -}}
-{{- $host := .Values.adminFrontend.host | default "" -}}
-{{- default (include "adminFrontend.serviceIP" .) $host -}}
+{{- define "frontend.host" -}}
+{{- $host := .Values.frontend.host | default "" -}}
+{{- default (include "frontend.serviceIP" .) $host -}}
 {{- end -}}
 
 {{/*
 Service name for the backend service
 */}}
-{{- define "adminBackend.serviceName" -}}
+{{- define "backend.serviceName" -}}
   {{ include "common.names.fullname" . }}-backend
 {{- end -}}
 
 {{/*
 Service name for the frontend service
 */}}
-{{- define "adminFrontend.serviceName" -}}
+{{- define "frontend.serviceName" -}}
   {{ include "common.names.fullname" . }}-frontend
 {{- end -}}
 
@@ -96,11 +96,11 @@ Service name for the frontend service
 Get the user defined LoadBalancerIP for this release
 Note, returns 127.0.0.1 if using ClusterIP.
 */}}
-{{- define "adminBackend.serviceIP" -}}
-{{- if eq .Values.adminBackend.service.type "ClusterIP" -}}
+{{- define "backend.serviceIP" -}}
+{{- if eq .Values.backend.service.type "ClusterIP" -}}
 127.0.0.1
 {{- else -}}
-{{- .Values.adminBackend.service.loadBalancerIP | default "" -}}
+{{- .Values.backend.service.loadBalancerIP | default "" -}}
 {{- end -}}
 {{- end -}}
 
@@ -108,27 +108,27 @@ Note, returns 127.0.0.1 if using ClusterIP.
 Gets the host to be used for this application.
 If not using ClusterIP, or if a host or LoadBalancerIP is not defined, the value will be empty
 */}}
-{{- define "adminBackend.host" -}}
-{{- $host := .Values.adminBackend.host | default "" -}}
-{{- default (include "adminBackend.serviceIP" .) $host -}}
+{{- define "backend.host" -}}
+{{- $host := .Values.backend.host | default "" -}}
+{{- default (include "backend.serviceIP" .) $host -}}
 {{- end -}}
 
 {{/*
 Return the proper Admin-frontend image name
 */}}
-{{- define "adminFrontend.image" -}}
-{{ include "common.images.image" (dict "imageRoot" .Values.adminFrontend.image "global" .Values.global) }}
+{{- define "frontend.image" -}}
+{{ include "common.images.image" (dict "imageRoot" .Values.frontend.image "global" .Values.global) }}
 {{- end -}}
 {{/*
 Return the proper Admin-backend image name
 */}}
-{{- define "adminBackend.image" -}}
-{{ include "common.images.image" (dict "imageRoot" .Values.adminBackend.image "global" .Values.global) }}
+{{- define "backend.image" -}}
+{{ include "common.images.image" (dict "imageRoot" .Values.backend.image "global" .Values.global) }}
 {{- end -}}
 
 {{/*
 Return the proper Storage Class
 */}}
-{{- define "adminPanel.storageClass" -}}
+{{- define "dashboard.storageClass" -}}
 {{- include "common.storage.class" (dict "persistence" .Values.persistence "global" .Values.global) -}}
 {{- end -}}
diff --git a/deployment/helmchart/templates/backend-service.yaml b/deployment/helmchart/templates/backend-service.yaml
index 7577b7d..fe6b59f 100644
--- a/deployment/helmchart/templates/backend-service.yaml
+++ b/deployment/helmchart/templates/backend-service.yaml
@@ -1,42 +1,42 @@
 apiVersion: v1
 kind: Service
 metadata:
-  name: {{ include "adminBackend.serviceName" . }}
+  name: {{ include "backend.serviceName" . }}
   labels: {{- include "common.labels.standard" . | nindent 4 }}
   {{- if .Values.commonLabels }}
   {{- include "common.tplvalues.render" ( dict "value" .Values.commonLabels "context" $ ) | nindent 4 }}
   {{- end }}
-  {{- if or .Values.adminBackend.service.annotations .Values.commonAnnotations}}
+  {{- if or .Values.backend.service.annotations .Values.commonAnnotations}}
   annotations:
-  {{- if .Values.adminBackend.service.annotations }}
-  {{- include "common.tplvalues.render" (dict "value" .Values.adminBackend.service.annotations "context" $) | nindent 4 }}
+  {{- if .Values.backend.service.annotations }}
+  {{- include "common.tplvalues.render" (dict "value" .Values.backend.service.annotations "context" $) | nindent 4 }}
   {{- end }}
   {{- if .Values.commonAnnotations }}
   {{- include "common.tplvalues.render" (dict "value" .Values.commonAnnotations "context" $) | nindent 4 }}
   {{- end }}
   {{- end }}
 spec:
-  type: {{ .Values.adminBackend.service.type }}
-  {{- if (or (eq .Values.adminBackend.service.type "LoadBalancer") (eq .Values.adminBackend.service.type "NodePort")) }}
-  externalTrafficPolicy: {{ .Values.adminBackend.service.externalTrafficPolicy | quote }}
+  type: {{ .Values.backend.service.type }}
+  {{- if (or (eq .Values.backend.service.type "LoadBalancer") (eq .Values.backend.service.type "NodePort")) }}
+  externalTrafficPolicy: {{ .Values.backend.service.externalTrafficPolicy | quote }}
   {{- end }}
-  {{- if (and (eq .Values.adminBackend.service.type "LoadBalancer") (not (empty .Values.adminBackend.service.loadBalancerIP))) }}
-  loadBalancerIP: {{ .Values.adminBackend.service.loadBalancerIP }}
+  {{- if (and (eq .Values.backend.service.type "LoadBalancer") (not (empty .Values.backend.service.loadBalancerIP))) }}
+  loadBalancerIP: {{ .Values.backend.service.loadBalancerIP }}
   {{- end }}
-  {{- if (and (eq .Values.adminBackend.service.type "LoadBalancer") .Values.adminBackend.service.loadBalancerSourceRanges) }}
+  {{- if (and (eq .Values.backend.service.type "LoadBalancer") .Values.backend.service.loadBalancerSourceRanges) }}
   loadBalancerSourceRanges:
-  {{ toYaml .Values.adminBackend.service.loadBalancerSourceRanges | nindent 4 }}
+  {{ toYaml .Values.backend.service.loadBalancerSourceRanges | nindent 4 }}
   {{- end }}
   ports:
     - name: http
-      port: {{ .Values.adminBackend.service.port }}
+      port: {{ .Values.backend.service.port }}
       targetPort: backend-http
-      {{- if (and (or (eq .Values.adminBackend.service.type "NodePort") (eq .Values.adminBackend.service.type "LoadBalancer")) (not (empty .Values.adminBackend.service.nodePorts.http))) }}
-      nodePort: {{ .Values.adminBackend.service.nodePorts.http }}
-      {{- else if eq .Values.adminBackend.service.type "ClusterIP" }}
+      {{- if (and (or (eq .Values.backend.service.type "NodePort") (eq .Values.backend.service.type "LoadBalancer")) (not (empty .Values.backend.service.nodePorts.http))) }}
+      nodePort: {{ .Values.backend.service.nodePorts.http }}
+      {{- else if eq .Values.backend.service.type "ClusterIP" }}
       nodePort: null
       {{- end }}
-    {{- if .Values.adminBackend.service.extraPorts }}
-    {{- include "common.tplvalues.render" (dict "value" .Values.adminBackend.service.extraPorts "context" $) | nindent 4 }}
+    {{- if .Values.backend.service.extraPorts }}
+    {{- include "common.tplvalues.render" (dict "value" .Values.backend.service.extraPorts "context" $) | nindent 4 }}
     {{- end }}
   selector: {{- include "common.labels.matchLabels" . | nindent 4 }}
diff --git a/deployment/helmchart/templates/configmaps.yaml b/deployment/helmchart/templates/configmaps.yaml
index ff3878c..e056e32 100644
--- a/deployment/helmchart/templates/configmaps.yaml
+++ b/deployment/helmchart/templates/configmaps.yaml
@@ -10,21 +10,24 @@ metadata:
   annotations: {{- include "common.tplvalues.render" ( dict "value" .Values.commonAnnotations "context" $ ) | nindent 4 }}
   {{- end }}
 data:
-  # ADMIN_FRONTEND_HOST: "{{ include "adminFrontend.host" . }}"
-  # ADMIN_BACKEND_HOST: "{{ include "adminBackend.host" . }}"
+  SECRET_KEY: {{ .Values.backend.secretKey }}
+  FLASK_APP: app.py
+  FLASK_ENV: {{ .Values.backend.flaskEnv }}
+  # ADMIN_FRONTEND_HOST: "{{ include "frontend.host" . }}"
+  # ADMIN_BACKEND_HOST: "{{ include "backend.host" . }}"
   # Probably needed in the future:
-  # ADMIN_BACKEND_USERNAME: {{ .Values.adminBackend.username | quote }}
-  # ADMIN_BACKEND_EMAIL: {{ .Values.adminBackend.email | quote }}
-  # {{- if .Values.adminBackend.smtp.enabled }}
-  # ADMIN_BACKEND_SMTP_HOST: {{ .Values.adminBackend.smtp.host | quote }}
-  # ADMIN_BACKEND_SMTP_PORT: {{ .Values.adminBackend.smtp.port | quote }}
-  # {{- if .Values.adminBackend.smtp.user }}
-  # ADMIN_BACKEND_SMTP_USER: {{ .Values.adminBackend.smtp.user | quote }}
+  # ADMIN_BACKEND_USERNAME: {{ .Values.backend.username | quote }}
+  # ADMIN_BACKEND_EMAIL: {{ .Values.backend.email | quote }}
+  # {{- if .Values.backend.smtp.enabled }}
+  # ADMIN_BACKEND_SMTP_HOST: {{ .Values.backend.smtp.host | quote }}
+  # ADMIN_BACKEND_SMTP_PORT: {{ .Values.backend.smtp.port | quote }}
+  # {{- if .Values.backend.smtp.user }}
+  # ADMIN_BACKEND_SMTP_USER: {{ .Values.backend.smtp.user | quote }}
   # {{- end }}
-  # {{- if .Values.adminBackend.smtp.protocol }}
-  # ADMIN_BACKEND_SMTP_PROTOCOL: {{ .Values.adminBackend.smtp.protocol | quote }}
+  # {{- if .Values.backend.smtp.protocol }}
+  # ADMIN_BACKEND_SMTP_PROTOCOL: {{ .Values.backend.smtp.protocol | quote }}
   # {{- end }}
-  # {{- if .Values.adminBackend.smtp.auth }}
-  # ADMIN_BACKEND_SMTP_AUTH: {{ .Values.adminBackend.smtp.auth | quote }}
+  # {{- if .Values.backend.smtp.auth }}
+  # ADMIN_BACKEND_SMTP_AUTH: {{ .Values.backend.smtp.auth | quote }}
   # {{- end }}
   # {{- end }}
diff --git a/deployment/helmchart/templates/deployment.yaml b/deployment/helmchart/templates/deployment.yaml
index 8383ead..bb8ab94 100644
--- a/deployment/helmchart/templates/deployment.yaml
+++ b/deployment/helmchart/templates/deployment.yaml
@@ -1,10 +1,10 @@
-{{- if include "adminFrontend.host" . -}}
+{{- if include "frontend.host" . -}}
 apiVersion: {{ template "common.capabilities.deployment.apiVersion" . }}
 kind: Deployment
 metadata:
   name: {{ template "common.names.fullname" . }}
   labels: {{- include "common.labels.standard" . | nindent 4 }}
-    component: adminPanel
+    component: dashboard
     {{- if .Values.commonLabels }}
     {{- include "common.tplvalues.render" ( dict "value" .Values.commonLabels "context" $ ) | nindent 4 }}
     {{- end }}
@@ -15,14 +15,14 @@ spec:
   replicas: {{ .Values.replicaCount }}
   selector:
     matchLabels: {{- include "common.labels.matchLabels" . | nindent 6 }}
-      component: adminPanel
+      component: dashboard
   {{- if .Values.updateStrategy }}
   strategy: {{- toYaml .Values.updateStrategy | nindent 4 }}
   {{- end }}
   template:
     metadata:
       labels: {{- include "common.labels.standard" . | nindent 8 }}
-        component: adminPanel
+        component: dashboard
         {{- if .Values.podLabels }}
         {{- include "common.tplvalues.render" (dict "value" .Values.podLabels "context" $) | nindent 8 }}
         {{- end }}
@@ -30,7 +30,7 @@ spec:
       annotations: {{- include "common.tplvalues.render" (dict "value" .Values.podAnnotations "context" $) | nindent 8 }}
       {{- end }}
     spec:
-      {{- include "adminPanel.imagePullSecrets" . | nindent 6 }}
+      {{- include "dashboard.imagePullSecrets" . | nindent 6 }}
       {{- if .Values.hostAliases }}
       hostAliases: {{- include "common.tplvalues.render" (dict "value" .Values.hostAliases "context" $) | nindent 8 }}
       {{- end }}
@@ -48,148 +48,148 @@ spec:
       {{- if .Values.tolerations }}
       tolerations: {{- include "common.tplvalues.render" (dict "value" .Values.tolerations "context" $) | nindent 8 }}
       {{- end }}
-      serviceAccountName: {{ include "adminPanel.serviceAccountName" . }}
+      serviceAccountName: {{ include "dashboard.serviceAccountName" . }}
       securityContext: {{- toYaml .Values.podSecurityContext | nindent 8 }}
       initContainers:
         {{- if .Values.initContainers }}
         {{- include "common.tplvalues.render" (dict "value" .Values.initContainers "context" $) | nindent 8 }}
         {{- end }}
       containers:
-        - name: admin-frontend
-          securityContext: {{- toYaml .Values.adminFrontend.containerSecurityContext | nindent 12 }}
-          image: {{ template "adminFrontend.image" . }}
+        - name: frontend
+          securityContext: {{- toYaml .Values.frontend.containerSecurityContext | nindent 12 }}
+          image: {{ template "frontend.image" . }}
           imagePullPolicy: {{ .Values.image.pullPolicy | quote }}
-          {{- if .Values.adminFrontend.command }}
-          command: {{- include "common.tplvalues.render" (dict "value" .Values.adminFrontend.command "context" $) | nindent 12 }}
+          {{- if .Values.frontend.command }}
+          command: {{- include "common.tplvalues.render" (dict "value" .Values.frontend.command "context" $) | nindent 12 }}
           {{- end }}
-          {{- if .Values.adminFrontend.args }}
-          args: {{- include "common.tplvalues.render" (dict "value" .Values.adminFrontend.args "context" $) | nindent 12 }}
+          {{- if .Values.frontend.args }}
+          args: {{- include "common.tplvalues.render" (dict "value" .Values.frontend.args "context" $) | nindent 12 }}
           {{- end }}
           env:
-            {{- if .Values.adminFrontend.extraEnvVars }}
-            {{- include "common.tplvalues.render" (dict "value" .Values.adminFrontend.extraEnvVars "context" $) | nindent 12 }}
+            {{- if .Values.frontend.extraEnvVars }}
+            {{- include "common.tplvalues.render" (dict "value" .Values.frontend.extraEnvVars "context" $) | nindent 12 }}
             {{- end }}
           envFrom:
             - configMapRef:
                 name: {{ include "common.names.fullname" . }}
-            {{- if .Values.adminFrontend.extraEnvVarsCM }}
+            {{- if .Values.frontend.extraEnvVarsCM }}
             - configMapRef:
-                name: {{ .Values.adminFrontend.extraEnvVarsCM }}
+                name: {{ .Values.frontend.extraEnvVarsCM }}
             {{- end }}
-            {{- if .Values.adminFrontend.extraEnvVarsSecret }}
+            {{- if .Values.frontend.extraEnvVarsSecret }}
             - secretRef:
-                name: {{ .Values.adminFrontend.extraEnvVarsSecret }}
+                name: {{ .Values.frontend.extraEnvVarsSecret }}
             {{- end }}
           ports:
             - name: frontend-http
               containerPort: 80
               protocol: TCP
-          {{- if .Values.adminFrontend.livenessProbe.enabled }}
+          {{- if .Values.frontend.livenessProbe.enabled }}
           livenessProbe:
             httpGet:
               path: /
               port: frontend-http
-            initialDelaySeconds: {{ .Values.adminFrontend.livenessProbe.initialDelaySeconds }}
-            periodSeconds: {{ .Values.adminFrontend.livenessProbe.periodSeconds }}
-            timeoutSeconds: {{ .Values.adminFrontend.livenessProbe.timeoutSeconds }}
-            successThreshold: {{ .Values.adminFrontend.livenessProbe.successThreshold }}
-            failureThreshold: {{ .Values.adminFrontend.livenessProbe.failureThreshold }}
-          {{- else if .Values.adminFrontend.customLivenessProbe }}
-          livenessProbe: {{- include "common.tplvalues.render" (dict "value" .Values.adminFrontend.customLivenessProbe "context" $) | nindent 12 }}
+            initialDelaySeconds: {{ .Values.frontend.livenessProbe.initialDelaySeconds }}
+            periodSeconds: {{ .Values.frontend.livenessProbe.periodSeconds }}
+            timeoutSeconds: {{ .Values.frontend.livenessProbe.timeoutSeconds }}
+            successThreshold: {{ .Values.frontend.livenessProbe.successThreshold }}
+            failureThreshold: {{ .Values.frontend.livenessProbe.failureThreshold }}
+          {{- else if .Values.frontend.customLivenessProbe }}
+          livenessProbe: {{- include "common.tplvalues.render" (dict "value" .Values.frontend.customLivenessProbe "context" $) | nindent 12 }}
           {{- end }}
-          {{- if .Values.adminFrontend.readinessProbe.enabled }}
+          {{- if .Values.frontend.readinessProbe.enabled }}
           readinessProbe:
             httpGet:
               path: /
               port: frontend-http
-            initialDelaySeconds: {{ .Values.adminFrontend.readinessProbe.initialDelaySeconds }}
-            periodSeconds: {{ .Values.adminFrontend.readinessProbe.periodSeconds }}
-            timeoutSeconds: {{ .Values.adminFrontend.readinessProbe.timeoutSeconds }}
-            successThreshold: {{ .Values.adminFrontend.readinessProbe.successThreshold }}
-            failureThreshold: {{ .Values.adminFrontend.readinessProbe.failureThreshold }}
-          {{- else if .Values.adminFrontend.customReadinessProbe }}
-          readinessProbe: {{- include "common.tplvalues.render" (dict "value" .Values.adminFrontend.customReadinessProbe "context" $) | nindent 12 }}
+            initialDelaySeconds: {{ .Values.frontend.readinessProbe.initialDelaySeconds }}
+            periodSeconds: {{ .Values.frontend.readinessProbe.periodSeconds }}
+            timeoutSeconds: {{ .Values.frontend.readinessProbe.timeoutSeconds }}
+            successThreshold: {{ .Values.frontend.readinessProbe.successThreshold }}
+            failureThreshold: {{ .Values.frontend.readinessProbe.failureThreshold }}
+          {{- else if .Values.frontend.customReadinessProbe }}
+          readinessProbe: {{- include "common.tplvalues.render" (dict "value" .Values.frontend.customReadinessProbe "context" $) | nindent 12 }}
           {{- end }}
           volumeMounts:
-            {{- if .Values.adminFrontend.extraVolumeMounts }}
-            {{- include "common.tplvalues.render" (dict "value" .Values.adminFrontend.extraVolumeMounts "context" $) | nindent 12 }}
+            {{- if .Values.frontend.extraVolumeMounts }}
+            {{- include "common.tplvalues.render" (dict "value" .Values.frontend.extraVolumeMounts "context" $) | nindent 12 }}
             {{- end }}
-          {{- if .Values.adminFrontend.resources }}
-          resources: {{- toYaml .Values.adminFrontend.resources | nindent 12 }}
+          {{- if .Values.frontend.resources }}
+          resources: {{- toYaml .Values.frontend.resources | nindent 12 }}
           {{- end }}
-        - name: admin-backend
-          securityContext: {{- toYaml .Values.adminBackend.containerSecurityContext | nindent 12 }}
-          image: {{ template "adminBackend.image" . }}
+        - name: backend
+          securityContext: {{- toYaml .Values.backend.containerSecurityContext | nindent 12 }}
+          image: {{ template "backend.image" . }}
           imagePullPolicy: {{ .Values.image.pullPolicy | quote }}
-          {{- if .Values.adminBackend.command }}
-          command: {{- include "common.tplvalues.render" (dict "value" .Values.adminBackend.command "context" $) | nindent 12 }}
+          {{- if .Values.backend.command }}
+          command: {{- include "common.tplvalues.render" (dict "value" .Values.backend.command "context" $) | nindent 12 }}
           {{- end }}
-          {{- if .Values.adminBackend.args }}
-          args: {{- include "common.tplvalues.render" (dict "value" .Values.adminBackend.args "context" $) | nindent 12 }}
+          {{- if .Values.backend.args }}
+          args: {{- include "common.tplvalues.render" (dict "value" .Values.backend.args "context" $) | nindent 12 }}
           {{- end }}
           env:
             - name: ADMIN_PANEL_PASSWORD
               valueFrom:
                 secretKeyRef:
-                  name: {{ include "adminBackend.secretName" . }}
-                  key: adminBackend-password
-            {{- if (include "adminBackend.smtp.password.enabled" .) }}
+                  name: {{ include "backend.secretName" . }}
+                  key: backend-password
+            {{- if (include "backend.smtp.password.enabled" .) }}
             - name: ADMIN_PANEL_SMTP_PASSWORD
               valueFrom:
                 secretKeyRef:
-                  name: {{ include "adminBackend.smtp.secretName" . }}
+                  name: {{ include "backend.smtp.secretName" . }}
                   key: smtp-password
             {{- end }}
-            {{- if .Values.adminBackend.extraEnvVars }}
-            {{- include "common.tplvalues.render" (dict "value" .Values.adminBackend.extraEnvVars "context" $) | nindent 12 }}
+            {{- if .Values.backend.extraEnvVars }}
+            {{- include "common.tplvalues.render" (dict "value" .Values.backend.extraEnvVars "context" $) | nindent 12 }}
             {{- end }}
           envFrom:
             - configMapRef:
                 name: {{ include "common.names.fullname" . }}
-            {{- if .Values.adminBackend.extraEnvVarsCM }}
+            {{- if .Values.backend.extraEnvVarsCM }}
             - configMapRef:
-                name: {{ .Values.adminBackend.extraEnvVarsCM }}
+                name: {{ .Values.backend.extraEnvVarsCM }}
             {{- end }}
-            {{- if .Values.adminBackend.extraEnvVarsSecret }}
+            {{- if .Values.backend.extraEnvVarsSecret }}
             - secretRef:
-                name: {{ .Values.adminBackend.extraEnvVarsSecret }}
+                name: {{ .Values.backend.extraEnvVarsSecret }}
             {{- end }}
           ports:
             - name: backend-http
               containerPort: 5000
               protocol: TCP
-          {{- if .Values.adminBackend.livenessProbe.enabled }}
+          {{- if .Values.backend.livenessProbe.enabled }}
           livenessProbe:
             httpGet:
               path: /
               port: backend-http
-            initialDelaySeconds: {{ .Values.adminBackend.livenessProbe.initialDelaySeconds }}
-            periodSeconds: {{ .Values.adminBackend.livenessProbe.periodSeconds }}
-            timeoutSeconds: {{ .Values.adminBackend.livenessProbe.timeoutSeconds }}
-            successThreshold: {{ .Values.adminBackend.livenessProbe.successThreshold }}
-            failureThreshold: {{ .Values.adminBackend.livenessProbe.failureThreshold }}
-          {{- else if .Values.adminBackend.customLivenessProbe }}
-          livenessProbe: {{- include "common.tplvalues.render" (dict "value" .Values.adminBackend.customLivenessProbe "context" $) | nindent 12 }}
+            initialDelaySeconds: {{ .Values.backend.livenessProbe.initialDelaySeconds }}
+            periodSeconds: {{ .Values.backend.livenessProbe.periodSeconds }}
+            timeoutSeconds: {{ .Values.backend.livenessProbe.timeoutSeconds }}
+            successThreshold: {{ .Values.backend.livenessProbe.successThreshold }}
+            failureThreshold: {{ .Values.backend.livenessProbe.failureThreshold }}
+          {{- else if .Values.backend.customLivenessProbe }}
+          livenessProbe: {{- include "common.tplvalues.render" (dict "value" .Values.backend.customLivenessProbe "context" $) | nindent 12 }}
           {{- end }}
-          {{- if .Values.adminBackend.readinessProbe.enabled }}
+          {{- if .Values.backend.readinessProbe.enabled }}
           readinessProbe:
             httpGet:
               path: /
               port: backend-http
-            initialDelaySeconds: {{ .Values.adminBackend.readinessProbe.initialDelaySeconds }}
-            periodSeconds: {{ .Values.adminBackend.readinessProbe.periodSeconds }}
-            timeoutSeconds: {{ .Values.adminBackend.readinessProbe.timeoutSeconds }}
-            successThreshold: {{ .Values.adminBackend.readinessProbe.successThreshold }}
-            failureThreshold: {{ .Values.adminBackend.readinessProbe.failureThreshold }}
-          {{- else if .Values.adminBackend.customReadinessProbe }}
-          readinessProbe: {{- include "common.tplvalues.render" (dict "value" .Values.adminBackend.customReadinessProbe "context" $) | nindent 12 }}
+            initialDelaySeconds: {{ .Values.backend.readinessProbe.initialDelaySeconds }}
+            periodSeconds: {{ .Values.backend.readinessProbe.periodSeconds }}
+            timeoutSeconds: {{ .Values.backend.readinessProbe.timeoutSeconds }}
+            successThreshold: {{ .Values.backend.readinessProbe.successThreshold }}
+            failureThreshold: {{ .Values.backend.readinessProbe.failureThreshold }}
+          {{- else if .Values.backend.customReadinessProbe }}
+          readinessProbe: {{- include "common.tplvalues.render" (dict "value" .Values.backend.customReadinessProbe "context" $) | nindent 12 }}
           {{- end }}
           volumeMounts:
-            {{- if .Values.adminBackend.extraVolumeMounts }}
-            {{- include "common.tplvalues.render" (dict "value" .Values.adminBackend.extraVolumeMounts "context" $) | nindent 12 }}
+            {{- if .Values.backend.extraVolumeMounts }}
+            {{- include "common.tplvalues.render" (dict "value" .Values.backend.extraVolumeMounts "context" $) | nindent 12 }}
             {{- end }}
-          {{- if .Values.adminBackend.resources }}
-          resources: {{- toYaml .Values.adminBackend.resources | nindent 12 }}
+          {{- if .Values.backend.resources }}
+          resources: {{- toYaml .Values.backend.resources | nindent 12 }}
           {{- end }}
         {{- if .Values.sidecars }}
         {{- include "common.tplvalues.render" (dict "value" .Values.sidecars "context" $) | nindent 8 }}
diff --git a/deployment/helmchart/templates/frontend-service.yaml b/deployment/helmchart/templates/frontend-service.yaml
index cbf69c5..35d5860 100644
--- a/deployment/helmchart/templates/frontend-service.yaml
+++ b/deployment/helmchart/templates/frontend-service.yaml
@@ -1,42 +1,42 @@
 apiVersion: v1
 kind: Service
 metadata:
-  name: {{ include "adminFrontend.serviceName" . }}
+  name: {{ include "frontend.serviceName" . }}
   labels: {{- include "common.labels.standard" . | nindent 4 }}
   {{- if .Values.commonLabels }}
   {{- include "common.tplvalues.render" ( dict "value" .Values.commonLabels "context" $ ) | nindent 4 }}
   {{- end }}
-  {{- if or .Values.adminFrontend.service.annotations .Values.commonAnnotations}}
+  {{- if or .Values.frontend.service.annotations .Values.commonAnnotations}}
   annotations:
-  {{- if .Values.adminFrontend.service.annotations }}
-  {{- include "common.tplvalues.render" (dict "value" .Values.adminFrontend.service.annotations "context" $) | nindent 4 }}
+  {{- if .Values.frontend.service.annotations }}
+  {{- include "common.tplvalues.render" (dict "value" .Values.frontend.service.annotations "context" $) | nindent 4 }}
   {{- end }}
   {{- if .Values.commonAnnotations }}
   {{- include "common.tplvalues.render" (dict "value" .Values.commonAnnotations "context" $) | nindent 4 }}
   {{- end }}
   {{- end }}
 spec:
-  type: {{ .Values.adminFrontend.service.type }}
-  {{- if (or (eq .Values.adminFrontend.service.type "LoadBalancer") (eq .Values.adminFrontend.service.type "NodePort")) }}
-  externalTrafficPolicy: {{ .Values.adminFrontend.service.externalTrafficPolicy | quote }}
+  type: {{ .Values.frontend.service.type }}
+  {{- if (or (eq .Values.frontend.service.type "LoadBalancer") (eq .Values.frontend.service.type "NodePort")) }}
+  externalTrafficPolicy: {{ .Values.frontend.service.externalTrafficPolicy | quote }}
   {{- end }}
-  {{- if (and (eq .Values.adminFrontend.service.type "LoadBalancer") (not (empty .Values.adminFrontend.service.loadBalancerIP))) }}
-  loadBalancerIP: {{ .Values.adminFrontend.service.loadBalancerIP }}
+  {{- if (and (eq .Values.frontend.service.type "LoadBalancer") (not (empty .Values.frontend.service.loadBalancerIP))) }}
+  loadBalancerIP: {{ .Values.frontend.service.loadBalancerIP }}
   {{- end }}
-  {{- if (and (eq .Values.adminFrontend.service.type "LoadBalancer") .Values.adminFrontend.service.loadBalancerSourceRanges) }}
+  {{- if (and (eq .Values.frontend.service.type "LoadBalancer") .Values.frontend.service.loadBalancerSourceRanges) }}
   loadBalancerSourceRanges:
-  {{ toYaml .Values.adminFrontend.service.loadBalancerSourceRanges | nindent 4 }}
+  {{ toYaml .Values.frontend.service.loadBalancerSourceRanges | nindent 4 }}
   {{- end }}
   ports:
     - name: http
-      port: {{ .Values.adminFrontend.service.port }}
+      port: {{ .Values.frontend.service.port }}
       targetPort: frontend-http
-      {{- if (and (or (eq .Values.adminFrontend.service.type "NodePort") (eq .Values.adminFrontend.service.type "LoadBalancer")) (not (empty .Values.adminFrontend.service.nodePorts.http))) }}
-      nodePort: {{ .Values.adminFrontend.service.nodePorts.http }}
-      {{- else if eq .Values.adminFrontend.service.type "ClusterIP" }}
+      {{- if (and (or (eq .Values.frontend.service.type "NodePort") (eq .Values.frontend.service.type "LoadBalancer")) (not (empty .Values.frontend.service.nodePorts.http))) }}
+      nodePort: {{ .Values.frontend.service.nodePorts.http }}
+      {{- else if eq .Values.frontend.service.type "ClusterIP" }}
       nodePort: null
       {{- end }}
-    {{- if .Values.adminFrontend.service.extraPorts }}
-    {{- include "common.tplvalues.render" (dict "value" .Values.adminFrontend.service.extraPorts "context" $) | nindent 4 }}
+    {{- if .Values.frontend.service.extraPorts }}
+    {{- include "common.tplvalues.render" (dict "value" .Values.frontend.service.extraPorts "context" $) | nindent 4 }}
     {{- end }}
   selector: {{- include "common.labels.matchLabels" . | nindent 4 }}
diff --git a/deployment/helmchart/templates/ingress.yaml b/deployment/helmchart/templates/ingress.yaml
index e200ea1..d5e957c 100644
--- a/deployment/helmchart/templates/ingress.yaml
+++ b/deployment/helmchart/templates/ingress.yaml
@@ -40,13 +40,13 @@ spec:
             {{- if eq "true" (include "common.ingress.supportsPathType" .) }}
             pathType: {{ .Values.ingress.pathType }}
             {{- end }}
-            backend: {{- include "common.ingress.backend" (dict "serviceName" (include "adminFrontend.serviceName" .) "servicePort" "frontend-http" "context" $)  | nindent 14 }}
+            backend: {{- include "common.ingress.backend" (dict "serviceName" (include "frontend.serviceName" .) "servicePort" "frontend-http" "context" $)  | nindent 14 }}
           # Forward API calls to the back-end container
           - path: {{ .Values.ingress.path }}api/v1
             {{- if eq "true" (include "common.ingress.supportsPathType" .) }}
             pathType: {{ .Values.ingress.pathType }}
             {{- end }}
-            backend: {{- include "common.ingress.backend" (dict "serviceName" (include "adminBackend.serviceName" .) "servicePort" "backend-http" "context" $)  | nindent 14 }}
+            backend: {{- include "common.ingress.backend" (dict "serviceName" (include "backend.serviceName" .) "servicePort" "backend-http" "context" $)  | nindent 14 }}
     {{- end }}
     {{- range .Values.ingress.extraHosts }}
     - host: {{ .name }}
@@ -56,11 +56,11 @@ spec:
             {{- if eq "true" (include "common.ingress.supportsPathType" $) }}
             pathType: {{ default "ImplementationSpecific" .pathType }}
             {{- end }}
-            backend: {{- include "common.ingress.backend" (dict "serviceName" (include "adminFrontend.serviceName" $) "servicePort" "frontend-http" "context" $) | nindent 14 }}
+            backend: {{- include "common.ingress.backend" (dict "serviceName" (include "frontend.serviceName" $) "servicePort" "frontend-http" "context" $) | nindent 14 }}
           - path: {{ default "/" .path }}api/v1
             {{- if eq "true" (include "common.ingress.supportsPathType" $) }}
             pathType: {{ default "ImplementationSpecific" .pathType }}
             {{- end }}
-            backend: {{- include "common.ingress.backend" (dict "serviceName" (include "adminBackend.serviceName" .) "servicePort" "backend-http" "context" $)  | nindent 14 }}
+            backend: {{- include "common.ingress.backend" (dict "serviceName" (include "backend.serviceName" .) "servicePort" "backend-http" "context" $)  | nindent 14 }}
     {{- end }}
 {{- end }}
diff --git a/deployment/helmchart/templates/pvc.yaml b/deployment/helmchart/templates/pvc.yaml
index eced3e8..2fc1a39 100644
--- a/deployment/helmchart/templates/pvc.yaml
+++ b/deployment/helmchart/templates/pvc.yaml
@@ -1,5 +1,5 @@
-# Disabled by default because the current admin panel does not need persistence
-{{- if and (include "adminFrontend.host" .) .Values.persistence.enabled (not .Values.persistence.existingClaim) }}
+# Disabled by default because the current dashboard does not need persistence
+{{- if and (include "frontend.host" .) .Values.persistence.enabled (not .Values.persistence.existingClaim) }}
 kind: PersistentVolumeClaim
 apiVersion: v1
 metadata:
@@ -17,7 +17,7 @@ spec:
   resources:
     requests:
       storage: {{ .Values.persistence.size | quote }}
-  {{ include "adminPanel.storageClass" . }}
+  {{ include "dashboard.storageClass" . }}
   {{- if .Values.persistence.selector }}
   selector: {{- include "common.tplvalues.render" (dict "value" .Values.persistence.selector "context" $) | nindent 4 }}
   {{- end -}}
diff --git a/deployment/helmchart/templates/secrets-admin-panel.yaml b/deployment/helmchart/templates/secrets-admin-panel.yaml
index 9955232..969b210 100644
--- a/deployment/helmchart/templates/secrets-admin-panel.yaml
+++ b/deployment/helmchart/templates/secrets-admin-panel.yaml
@@ -1,8 +1,8 @@
-{{- if (include "adminBackend.createSecret" .) }}
+{{- if (include "backend.createSecret" .) }}
 apiVersion: v1
 kind: Secret
 metadata:
-  name: {{ include "adminBackend.secretName" . }}
+  name: {{ include "backend.secretName" . }}
   labels: {{- include "common.labels.standard" . | nindent 4 }}
   {{- if .Values.commonLabels }}
   {{- include "common.tplvalues.render" ( dict "value" .Values.commonLabels "context" $ ) | nindent 4 }}
@@ -12,12 +12,12 @@ metadata:
   {{- end }}
 type: Opaque
 data:
-  {{- if and (.Values.adminBackend.password) (not .Values.adminBackend.existingSecret) }}
-  adminBackend-password: {{ .Values.adminBackend.password | b64enc | quote }}
-  {{- else if not .Values.adminBackend.existingSecret }}
-  adminBackend-password: {{ randAlphaNum 10 | b64enc | quote }}
+  {{- if and (.Values.backend.password) (not .Values.backend.existingSecret) }}
+  backend-password: {{ .Values.backend.password | b64enc | quote }}
+  {{- else if not .Values.backend.existingSecret }}
+  backend-password: {{ randAlphaNum 10 | b64enc | quote }}
   {{- end }}
-  {{- if and (.Values.adminBackend.smtp.password) (.Values.adminBackend.smtp.enabled) (not .Values.adminBackend.smtp.existingSecret) }}
-  smtp-password: {{ .Values.adminBackend.smtp.password | b64enc | quote }}
+  {{- if and (.Values.backend.smtp.password) (.Values.backend.smtp.enabled) (not .Values.backend.smtp.existingSecret) }}
+  smtp-password: {{ .Values.backend.smtp.password | b64enc | quote }}
   {{- end }}
 {{- end }}
diff --git a/deployment/helmchart/templates/serviceaccount.yaml b/deployment/helmchart/templates/serviceaccount.yaml
index ae11495..3efda4e 100644
--- a/deployment/helmchart/templates/serviceaccount.yaml
+++ b/deployment/helmchart/templates/serviceaccount.yaml
@@ -2,7 +2,7 @@
 apiVersion: v1
 kind: ServiceAccount
 metadata:
-  name: {{ include "adminPanel.serviceAccountName" . }}
+  name: {{ include "dashboard.serviceAccountName" . }}
   labels: {{- include "common.labels.standard" . | nindent 4 }}
   {{- if .Values.commonLabels }}
   {{- include "common.tplvalues.render" ( dict "value" .Values.commonLabels "context" $ ) | nindent 4 }}
diff --git a/deployment/helmchart/values-local.yaml b/deployment/helmchart/values-local.yaml
index a33145a..d9d12f6 100644
--- a/deployment/helmchart/values-local.yaml
+++ b/deployment/helmchart/values-local.yaml
@@ -1,4 +1,4 @@
-adminFrontend:
+frontend:
   host: dashboard.oas-test2.maartendewaard.nl
   livenessProbe:
     enabled: false
@@ -7,7 +7,8 @@ adminFrontend:
   image:
     tag: 2-add-helm-chart
 
-adminBackend:
+backend:
+  secretKey: tnsreaiotnau48pl329aftnreisaed
   livenessProbe:
     enabled: false
   readinessProbe:
diff --git a/deployment/helmchart/values.yaml b/deployment/helmchart/values.yaml
index f63b3e9..9f8334d 100644
--- a/deployment/helmchart/values.yaml
+++ b/deployment/helmchart/values.yaml
@@ -21,10 +21,10 @@ global:
 ## @param kubeVersion Force target Kubernetes version (using Helm capabilities if not set)
 ##
 kubeVersion: ""
-## @param nameOverride String to partially override adminPanel.fullname template (will maintain the release name)
+## @param nameOverride String to partially override dashboard.fullname template (will maintain the release name)
 ##
 nameOverride: ""
-## @param fullnameOverride String to fully override adminPanel.fullname template
+## @param fullnameOverride String to fully override dashboard.fullname template
 ##
 fullnameOverride: ""
 ## @param commonLabels Labels to be added to all deployed resources
@@ -44,11 +44,11 @@ image:
   imagePullSecrets: []
 
 ## Admin frontend configuration parameters
-## ref: https://open.greenhost.net/openappstack/admin-frontend
+## ref: https://open.greenhost.net/openappstack/dashboard-frontend
 ##
-adminFrontend:
+frontend:
   ## Admin frontend image version
-  ## ref: https://hub.docker.com/r/bitnami/adminFrontend/tags/
+  ## ref: https://hub.docker.com/r/bitnami/frontend/tags/
   ## @param image.registry Discourse image registry
   ## @param image.repository Discourse image repository
   ## @param image.tag Discourse image tag
@@ -111,18 +111,18 @@ adminFrontend:
     ##
     nodePorts:
       http: ""
-  ## @param adminFrontend.extendEslint Whether to read .eslint.json rules
+  ## @param frontend.extendEslint Whether to read .eslint.json rules
   extendEslint: false
-  ## @param adminFrontend.host Discourse host to create application URLs (include the port if =/= 80)
+  ## @param frontend.host Discourse host to create application URLs (include the port if =/= 80)
   ##
   host: ""
-  ## @param adminFrontend.command Custom command to override image cmd
+  ## @param frontend.command Custom command to override image cmd
   ##
   command: []
-  ## @param adminFrontend.args Custom args for the custom command
+  ## @param frontend.args Custom args for the custom command
   ##
   args: []
-  ## @param adminFrontend.containerSecurityContext Container security context specification
+  ## @param frontend.containerSecurityContext Container security context specification
   ## Example:
   ## capabilities:
   ##   drop:
@@ -138,8 +138,8 @@ adminFrontend:
   ## choice for the user. This also increases chances charts run on environments with little
   ## resources, such as Minikube. If you do want to specify resources, uncomment the following
   ## lines, adjust them as necessary, and remove the curly braces after 'resources:'.
-  ## @param adminFrontend.resources.limits The resources limits for the container
-  ## @param adminFrontend.resources.requests The requested resources for the container
+  ## @param frontend.resources.limits The resources limits for the container
+  ## @param frontend.resources.requests The requested resources for the container
   ##
   resources:
     ## Example:
@@ -156,12 +156,12 @@ adminFrontend:
   ## WARNING: Discourse installation process may take up some time and
   ## setting inappropriate values here may lead to pods failure.
   ## ref: https://kubernetes.io/docs/concepts/workloads/pods/pod-lifecycle/#container-probes
-  ## @param adminFrontend.livenessProbe.enabled Enable/disable livenessProbe
-  ## @param adminFrontend.livenessProbe.initialDelaySeconds Delay before liveness probe is initiated
-  ## @param adminFrontend.livenessProbe.periodSeconds How often to perform the probe
-  ## @param adminFrontend.livenessProbe.timeoutSeconds When the probe times out
-  ## @param adminFrontend.livenessProbe.failureThreshold Minimum consecutive failures for the probe
-  ## @param adminFrontend.livenessProbe.successThreshold Minimum consecutive successes for the probe
+  ## @param frontend.livenessProbe.enabled Enable/disable livenessProbe
+  ## @param frontend.livenessProbe.initialDelaySeconds Delay before liveness probe is initiated
+  ## @param frontend.livenessProbe.periodSeconds How often to perform the probe
+  ## @param frontend.livenessProbe.timeoutSeconds When the probe times out
+  ## @param frontend.livenessProbe.failureThreshold Minimum consecutive failures for the probe
+  ## @param frontend.livenessProbe.successThreshold Minimum consecutive successes for the probe
   ##
   livenessProbe:
     enabled: true
@@ -174,12 +174,12 @@ adminFrontend:
   ## WARNING: Discourse installation process may take up some time and
   ## setting inappropriate values here may lead to pods failure.
   ## ref: https://kubernetes.io/docs/concepts/workloads/pods/pod-lifecycle/#container-probes
-  ## @param adminFrontend.readinessProbe.enabled Enable/disable readinessProbe
-  ## @param adminFrontend.readinessProbe.initialDelaySeconds Delay before readiness probe is initiated
-  ## @param adminFrontend.readinessProbe.periodSeconds How often to perform the probe
-  ## @param adminFrontend.readinessProbe.timeoutSeconds When the probe times out
-  ## @param adminFrontend.readinessProbe.failureThreshold Minimum consecutive failures for the probe
-  ## @param adminFrontend.readinessProbe.successThreshold Minimum consecutive successes for the probe
+  ## @param frontend.readinessProbe.enabled Enable/disable readinessProbe
+  ## @param frontend.readinessProbe.initialDelaySeconds Delay before readiness probe is initiated
+  ## @param frontend.readinessProbe.periodSeconds How often to perform the probe
+  ## @param frontend.readinessProbe.timeoutSeconds When the probe times out
+  ## @param frontend.readinessProbe.failureThreshold Minimum consecutive failures for the probe
+  ## @param frontend.readinessProbe.successThreshold Minimum consecutive successes for the probe
   ##
   readinessProbe:
     enabled: true
@@ -188,27 +188,27 @@ adminFrontend:
     timeoutSeconds: 5
     failureThreshold: 6
     successThreshold: 1
-  ## @param adminFrontend.customLivenessProbe Custom liveness probe to execute (when the main one is disabled)
+  ## @param frontend.customLivenessProbe Custom liveness probe to execute (when the main one is disabled)
   ##
   customLivenessProbe: {}
-  ## @param adminFrontend.customReadinessProbe Custom readiness probe to execute (when the main one is disabled)
+  ## @param frontend.customReadinessProbe Custom readiness probe to execute (when the main one is disabled)
   ##
   customReadinessProbe: {}
-  ## @param adminFrontend.extraEnvVars An array to add extra env vars
+  ## @param frontend.extraEnvVars An array to add extra env vars
   ## For example:
   ## extraEnvVars:
-  ##   adminFrontend:
+  ##   frontend:
   ##   - name: ADMIN_PANEL_ELASTICSEARCH_URL
   ##     value: test
   ##
   extraEnvVars: []
-  ## @param adminFrontend.extraEnvVarsCM Array to add extra configmaps
+  ## @param frontend.extraEnvVarsCM Array to add extra configmaps
   ##
   extraEnvVarsCM: []
-  ## @param adminFrontend.extraEnvVarsSecret Array to add extra environment variables from a secret
+  ## @param frontend.extraEnvVarsSecret Array to add extra environment variables from a secret
   ##
   extraEnvVarsSecret: ""
-  ## @param adminFrontend.extraVolumeMounts Additional volume mounts (used along with `extraVolumes`)
+  ## @param frontend.extraVolumeMounts Additional volume mounts (used along with `extraVolumes`)
   ## Example: Mount CA file
   ## extraVolumeMounts
   ##   - name: ca-cert
@@ -216,12 +216,12 @@ adminFrontend:
   ##     mountPath: /path/to/ca_cert
   ##
   extraVolumeMounts: []
-## Admin frontend configuration parameters
-## ref: https://open.greenhost.net/openappstack/admin-frontend
+## Admin backend configuration parameters
+## ref: https://open.greenhost.net/openappstack/dashboard-backend
 ##
-adminBackend:
+backend:
   ## Admin frontend image version
-  ## ref: https://hub.docker.com/r/bitnami/adminFrontend/tags/
+  ## ref: https://hub.docker.com/r/bitnami/frontend/tags/
   ## @param image.registry Discourse image registry
   ## @param image.repository Discourse image repository
   ## @param image.tag Discourse image tag
@@ -285,36 +285,36 @@ adminBackend:
       http: ""
 
 
-  ## @param adminBackend.reactAppApiUrl URL to the admin-backend API
+  ## @param backend.reactAppApiUrl URL to the dashboard-backend API
   apiUrl: "/api/v1"
 
   ## Variables for future use {{{
 
-  ## @param adminBackend.username Admin user of the application
+  ## @param backend.username Admin user of the application
   ##
   username: user
-  ## @param adminBackend.password password. WARNING: Minimum length of 10 characters
+  ## @param backend.password password. WARNING: Minimum length of 10 characters
   ## Defaults to a random 10-character alphanumeric string if not set
   ##
   password: ""
-  ## @param adminBackend.existingSecret Name of an existing secret containing the password (ignores previous password)
+  ## @param backend.existingSecret Name of an existing secret containing the password (ignores previous password)
   ## The secret should contain the following key:
-  ## adminBackend-password
+  ## backend-password
   ##
   existingSecret: ""
-  ## @param adminBackend.email Admin user email of the application
+  ## @param backend.email Admin user email of the application
   ##
   email: user@example.com
 
   ## Admin panel SMTP settings
-  ## @param adminBackend.smtp.enabled Enable/disable SMTP
-  ## @param adminBackend.smtp.host SMTP host name
-  ## @param adminBackend.smtp.port SMTP port number
-  ## @param adminBackend.smtp.user SMTP account user name
-  ## @param adminBackend.smtp.password SMTP account password
-  ## @param adminBackend.smtp.protocol SMTP protocol (Allowed values: tls, ssl)
-  ## @param adminBackend.smtp.auth SMTP authentication method
-  ## @param adminBackend.smtp.existingSecret Name of an existing Kubernetes secret. The secret must have the following key configured: `smtp-password`
+  ## @param backend.smtp.enabled Enable/disable SMTP
+  ## @param backend.smtp.host SMTP host name
+  ## @param backend.smtp.port SMTP port number
+  ## @param backend.smtp.user SMTP account user name
+  ## @param backend.smtp.password SMTP account password
+  ## @param backend.smtp.protocol SMTP protocol (Allowed values: tls, ssl)
+  ## @param backend.smtp.auth SMTP authentication method
+  ## @param backend.smtp.existingSecret Name of an existing Kubernetes secret. The secret must have the following key configured: `smtp-password`
   ##
   smtp:
     enabled: false
@@ -328,13 +328,19 @@ adminBackend:
 
   ## End variables for future use }}}
 
-  ## @param adminBackend.command Custom command to override image cmd
+  ## @param backend.flaskEnv Overridable flask env for debugging
+  flaskEnv: production
+
+  ## @param backend.secretKey Flask secret for generating JWT tokens
+  # secretKey: OVERRIDE_ME
+
+  ## @param backend.command Custom command to override image cmd
   ##
   command: []
-  ## @param adminBackend.args Custom args for the custom command
+  ## @param backend.args Custom args for the custom command
   ##
   args: []
-  ## @param adminBackend.containerSecurityContext Container security context specification
+  ## @param backend.containerSecurityContext Container security context specification
   ## Example:
   ## capabilities:
   ##   drop:
@@ -350,8 +356,8 @@ adminBackend:
   ## choice for the user. This also increases chances charts run on environments with little
   ## resources, such as Minikube. If you do want to specify resources, uncomment the following
   ## lines, adjust them as necessary, and remove the curly braces after 'resources:'.
-  ## @param adminBackend.resources.limits The resources limits for the container
-  ## @param adminBackend.resources.requests The requested resources for the container
+  ## @param backend.resources.limits The resources limits for the container
+  ## @param backend.resources.requests The requested resources for the container
   ##
   resources:
     ## Example:
@@ -368,12 +374,12 @@ adminBackend:
   ## WARNING: Discourse installation process may take up some time and
   ## setting inappropriate values here may lead to pods failure.
   ## ref: https://kubernetes.io/docs/concepts/workloads/pods/pod-lifecycle/#container-probes
-  ## @param adminBackend.livenessProbe.enabled Enable/disable livenessProbe
-  ## @param adminBackend.livenessProbe.initialDelaySeconds Delay before liveness probe is initiated
-  ## @param adminBackend.livenessProbe.periodSeconds How often to perform the probe
-  ## @param adminBackend.livenessProbe.timeoutSeconds When the probe times out
-  ## @param adminBackend.livenessProbe.failureThreshold Minimum consecutive failures for the probe
-  ## @param adminBackend.livenessProbe.successThreshold Minimum consecutive successes for the probe
+  ## @param backend.livenessProbe.enabled Enable/disable livenessProbe
+  ## @param backend.livenessProbe.initialDelaySeconds Delay before liveness probe is initiated
+  ## @param backend.livenessProbe.periodSeconds How often to perform the probe
+  ## @param backend.livenessProbe.timeoutSeconds When the probe times out
+  ## @param backend.livenessProbe.failureThreshold Minimum consecutive failures for the probe
+  ## @param backend.livenessProbe.successThreshold Minimum consecutive successes for the probe
   ##
   livenessProbe:
     enabled: true
@@ -386,12 +392,12 @@ adminBackend:
   ## WARNING: Discourse installation process may take up some time and
   ## setting inappropriate values here may lead to pods failure.
   ## ref: https://kubernetes.io/docs/concepts/workloads/pods/pod-lifecycle/#container-probes
-  ## @param adminBackend.readinessProbe.enabled Enable/disable readinessProbe
-  ## @param adminBackend.readinessProbe.initialDelaySeconds Delay before readiness probe is initiated
-  ## @param adminBackend.readinessProbe.periodSeconds How often to perform the probe
-  ## @param adminBackend.readinessProbe.timeoutSeconds When the probe times out
-  ## @param adminBackend.readinessProbe.failureThreshold Minimum consecutive failures for the probe
-  ## @param adminBackend.readinessProbe.successThreshold Minimum consecutive successes for the probe
+  ## @param backend.readinessProbe.enabled Enable/disable readinessProbe
+  ## @param backend.readinessProbe.initialDelaySeconds Delay before readiness probe is initiated
+  ## @param backend.readinessProbe.periodSeconds How often to perform the probe
+  ## @param backend.readinessProbe.timeoutSeconds When the probe times out
+  ## @param backend.readinessProbe.failureThreshold Minimum consecutive failures for the probe
+  ## @param backend.readinessProbe.successThreshold Minimum consecutive successes for the probe
   ##
   readinessProbe:
     enabled: true
@@ -400,27 +406,27 @@ adminBackend:
     timeoutSeconds: 5
     failureThreshold: 6
     successThreshold: 1
-  ## @param adminBackend.customLivenessProbe Custom liveness probe to execute (when the main one is disabled)
+  ## @param backend.customLivenessProbe Custom liveness probe to execute (when the main one is disabled)
   ##
   customLivenessProbe: {}
-  ## @param adminBackend.customReadinessProbe Custom readiness probe to execute (when the main one is disabled)
+  ## @param backend.customReadinessProbe Custom readiness probe to execute (when the main one is disabled)
   ##
   customReadinessProbe: {}
-  ## @param adminBackend.extraEnvVars An array to add extra env vars
+  ## @param backend.extraEnvVars An array to add extra env vars
   ## For example:
   ## extraEnvVars:
-  ##   adminBackend:
+  ##   backend:
   ##   - name: ADMIN_PANEL_ELASTICSEARCH_URL
   ##     value: test
   ##
   extraEnvVars: []
-  ## @param adminBackend.extraEnvVarsCM Array to add extra configmaps
+  ## @param backend.extraEnvVarsCM Array to add extra configmaps
   ##
   extraEnvVarsCM: []
-  ## @param adminBackend.extraEnvVarsSecret Array to add extra environment variables from a secret
+  ## @param backend.extraEnvVarsSecret Array to add extra environment variables from a secret
   ##
   extraEnvVarsSecret: ""
-  ## @param adminBackend.extraVolumeMounts Additional volume mounts (used along with `extraVolumes`)
+  ## @param backend.extraVolumeMounts Additional volume mounts (used along with `extraVolumes`)
   ## Example: Mount CA file
   ## extraVolumeMounts
   ##   - name: ca-cert
@@ -494,7 +500,7 @@ persistence:
   ## @param persistence.enabled Whether to enable persistence based on Persistent Volume Claims
   ##
   enabled: false
-  ## @param persistence.storageClass adminPanel & sidekiq data Persistent Volume Storage Class
+  ## @param persistence.storageClass dashboard & sidekiq data Persistent Volume Storage Class
   ## If defined, storageClassName: <storageClass>
   ## If set to "-", storageClassName: "", which disables dynamic provisioning
   ## If undefined (the default) or set to null, no storageClassName spec is
@@ -622,7 +628,7 @@ ingress:
   certManager: false
   ## @param ingress.hostname Default host for the ingress resource
   ##
-  hostname: adminpanel.local
+  hostname: dashboard.local
   ## @param ingress.apiVersion Force Ingress API version (automatically detected if not set)
   ##
   apiVersion: ""
@@ -647,15 +653,15 @@ ingress:
   ## @param ingress.extraHosts The list of additional hostnames to be covered with this ingress record.
   ## Most likely the hostname above will be enough, but in the event more hosts are needed, this is an array
   ## extraHosts:
-  ## - name: adminpanel.local
+  ## - name: dashboard.local
   ##   path: /
   extraHosts: []
   ## @param ingress.extraTls The tls configuration for additional hostnames to be covered with this ingress record.
   ## see: https://kubernetes.io/docs/concepts/services-networking/ingress/#tls
   ## extraTls:
   ## - hosts:
-  ##     - adminpanel.local
-  ##   secretName: adminpanel.local-tls
+  ##     - dashboard.local
+  ##   secretName: dashboard.local-tls
   extraTls: []
   ## @param ingress.secrets If you're providing your own certificates, please use this to add the certificates as secrets
   ## key and certificate should start with -----BEGIN CERTIFICATE----- or
@@ -667,7 +673,7 @@ ingress:
   ## It is also possible to create and manage the certificates outside of this helm chart
   ## Please see README.md for more information
   ## Example:
-  ## - name: adminpanel.local-tls
+  ## - name: dashboard.local-tls
   ##   key:
   ##   certificate:
   secrets: []