diff --git a/.gitignore b/.gitignore
index 485dee6..b17f7cf 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
 .idea
+terminfinder-chart/Chart.lock
diff --git a/README.md b/README.md
index 574c9cc..8451be0 100644
--- a/README.md
+++ b/README.md
@@ -10,16 +10,12 @@ Complete Helm Chart repository for deploying the Terminfinder to any kubernetes
 
 [SECURITY.md](./docs/SECURITY.md)
 
-## Components
+It's recommended to use a dedicated PostgreSQL instance for production usage.
 
-* Frontend: `registry.opencode.de/ig-bvc/demo-apps/terminfinder-sh/terminfinder-sh-frontend:v2.2.0`
-* Backend: `registry.opencode.de/ig-bvc/demo-apps/terminfinder-sh/terminfinder-sh-backend:V1.0.9`
-* Postgres (part of Backend):
-  Using [this public Helm chart](https://github.com/bitnami/charts/tree/main/bitnami/postgresql/) as fundament, but can
-  be disabled through `values.yaml` of the backend file.
+## Local development
 
-Please modify the `values.yaml` files or use the CLI method for deployment and configuration. It's recommended to use a
-dedicated PostgreSQL instance for production usage.
+1. install and run minikube or other local K8s services https://kubernetes.io/docs/tasks/tools/
+2. use scripts in installation below
 
 ## Installation
 
@@ -38,31 +34,48 @@ dedicated PostgreSQL instance for production usage.
 
 ### Installation steps
 
-1. Prepare the value files for the backend and frontend each.
-2. Install the helm charts with `helm install ...` CLI Command
+1. Prepare the value files.
+2. Install the helm charts with `helm install ...` CLI Command:
 
 ```bash
 # Create a namespace (or use default), where to work in:
-$ kubectl create ns terminfinder-demo
+$ kubectl create namespace terminfinder-demo
 
 # First installing the helm chart, to the name
-$ helm install terminfinder-backend ./charts/terminfinder-backend -n terminfinder-demo -f demo-backend.values.yaml
-
-# Second installing the helm chart of the frontend
-$ helm install terminfinder-frontend ./charts/terminfinder-frontend -n terminfinder-demo -f demo-frontend.values.yaml
+$ helm install terminfinder-demo terminfinder-chart -n terminfinder-demo
 
 # Verify installation of helm charts:
 $ helm list -n terminfinder-demo
 $ kubectl get deploy -n terminfinder-demo
+```
+
+### Upgrade release
+
+To upgrade the helm chart, use the `helm upgrade ...` command:
 
-# Go to your configured ingress host domain (e.g. terminfinder.open-code.local) and test it out!
-# The URL of the ingresses you can get here:
-$ kubectl get ingress -n terminfinder-demo
+```bash
+# Upgrade HelmChart
+$ helm upgrade terminfinder-demo terminfinder-chart -n terminfinder-demo
 ```
 
-Your can upgrade the helm chart as usually with `helm upgrade ...` command.
+### Delete Release
+
+To delete the helm chart (release), use the `helm uninstall...` command.
+
+Note that the persistent volume may be available even if the helm release is uninstalled.
+
+```bash
+# Delete release
+$ helm uninstall terminfinder-demo -n terminfinder-demo
+```
+
+```bash
+# Delete PVCs and namespace
+$ kubectl delete pvc --all -n terminfinder-demo
+$ kubectl delete namespace terminfinder-demo
+```
 
-### Using an own PostgreSQL DB instance
+## Using an own PostgreSQL DB instance
 
 The helm chart deployment of the `terminfinder-frontend` will be kept untouched.
 
diff --git a/demo-backend.values.yaml b/demo-backend.values.yaml
deleted file mode 100644
index e45b8b1..0000000
--- a/demo-backend.values.yaml
+++ /dev/null
@@ -1,58 +0,0 @@
-replicaCount: 1
-
-ingress:
-  enabled: true
-  className: "nginx"
-  annotations:
-    nginx.ingress.kubernetes.io/rewrite-target: "/$2"
-    nginx.ingress.kubernetes.io/enable-cors: "true"
-    nginx.ingress.kubernetes.io/cors-allow-origin: "https://terminfinder.opencode.local"
-    nginx.ingress.kubernetes.io/ssl-redirect: "true"
-    cert-manager.io/cluster-issuer: selfsigned # More here: https://cert-manager.io/docs/configuration/selfsigned/#deployment
-  hosts:
-    # For this demo, we create a local dns entry (e.g. via /etc/hosts) and try it out with that
-    # TODO: Change domain for your use-case
-    - host: terminfinder.opencode.local
-      paths:
-        - path: /api(/|$)(.*)
-          pathType: Prefix
-  tls:
-    - secretName: cert-terminfinder.opencode.local
-      hosts:
-        - terminfinder.opencode.local
-
-# For testing, enabled the autoscaling
-autoscaling:
-  enabled: true
-  minReplicas: 1
-  maxReplicas: 10
-  targetCPUUtilizationPercentage: 80
-  targetMemoryUtilizationPercentage: 80
-
-# This is just for testing, since in minikube we cant run completely as non-root
-postgresql:
-  volumePermissions:
-    enabled: false
-
-  primary:
-    ## Update permissions for the data folder
-    initContainers:
-      - name: update-permissions
-        image: docker.io/busybox:latest
-        imagePullPolicy: Always
-        command:
-          - "sh"
-          - "-c"
-          - "chown -R 1001:1001 /bitnami/postgresql && chmod -R 0700 /bitnami/postgresql"
-        securityContext:
-          runAsUser: 0
-        volumeMounts:
-          - name: data
-            mountPath: /bitnami/postgresql
-        resources:
-          requests:
-            memory: 64Mi
-            cpu: 250m
-          limits:
-            memory: 64Mi
-            cpu: 250m
diff --git a/demo-frontend.values.yaml b/demo-frontend.values.yaml
deleted file mode 100644
index 5f18005..0000000
--- a/demo-frontend.values.yaml
+++ /dev/null
@@ -1,33 +0,0 @@
-app:
-  title: "Terminfinder Helm Demo"
-  locale: "DE-de" # supported: DE-de, EN-en
-  addressing: "du" # supported: du, sie
-  backend_url: https://terminfinder.opencode.local/api # Public URL to our Backend
-
-replicaCount: 1
-
-ingress:
-  enabled: true
-  className: "nginx"
-  annotations:
-    nginx.ingress.kubernetes.io/ssl-redirect: "true"
-    cert-manager.io/cluster-issuer: selfsigned
-  hosts:
-    # For this demo, we create a local dns entry (e.g. via /etc/hosts) to try it out with this domain
-    # TODO: Change domain for your use-case
-    - host: terminfinder.opencode.local
-      paths:
-        - path: /
-          pathType: Prefix
-  tls:
-    - secretName: cert-terminfinder.opencode.local
-      hosts:
-        - terminfinder.opencode.local
-
-# For testing, enabled the autoscaling
-autoscaling:
-  enabled: true
-  minReplicas: 1
-  maxReplicas: 5
-  targetCPUUtilizationPercentage: 80
-  targetMemoryUtilizationPercentage: 80
diff --git a/terminfinder-chart/charts/backend/charts/common-2.2.4.tgz b/terminfinder-chart/charts/backend/charts/common-2.2.4.tgz
deleted file mode 100644
index 9016f32..0000000
Binary files a/terminfinder-chart/charts/backend/charts/common-2.2.4.tgz and /dev/null differ
diff --git a/terminfinder-chart/charts/frontend/templates/configMap.yml b/terminfinder-chart/charts/frontend/templates/configMap.yml
deleted file mode 100644
index 6fa82e2..0000000
--- a/terminfinder-chart/charts/frontend/templates/configMap.yml
+++ /dev/null
@@ -1,9 +0,0 @@
-apiVersion: v1
-kind: ConfigMap
-metadata:
-  name: {{ .Release.Name }}-customer-config
-data:
-  Anrede: "{{ .Values.customerConfig.ADDRESSING }}"
-  Sprache: "{{ .Values.customerConfig.LOCALE }}"
-  Titel: "{{ .Values.customerConfig.TITLE }}"
-  email: "{{ .Values.customerConfig.EMAIL }}"
diff --git a/terminfinder-chart/charts/resources/templates/postgresql.yaml b/terminfinder-chart/charts/resources/templates/postgresql.yaml
deleted file mode 100644
index 07e9d3f..0000000
--- a/terminfinder-chart/charts/resources/templates/postgresql.yaml
+++ /dev/null
@@ -1,11 +0,0 @@
-{{- if .Values.postgres.enabled -}}
-apiVersion: cloud.dataport.de/v1alpha1
-kind: PostgreSQL
-metadata:
-  name: {{ include "terminfinder-resources.fullname" . }}-db
-  namespace: {{ .Release.Namespace }}
-spec:
-  storageSize: {{ .Values.postgres.storageSize }}
-  pgVersion: "{{ .Values.postgres.pgVersion }}"
-  instances: {{ .Values.postgres.instances }}
-{{- end }}
diff --git a/terminfinder-chart/charts/resources/values.yaml b/terminfinder-chart/charts/resources/values.yaml
deleted file mode 100644
index e7a855c..0000000
--- a/terminfinder-chart/charts/resources/values.yaml
+++ /dev/null
@@ -1,12 +0,0 @@
-loki:
-  endpoint: http://loki-gateway.logging-system.svc.cluster.local/loki/api/v1/push
-  tenantId: 6703bd86-3601-4ea8-96e4-ecff048f1de9
-
-postgres:
-  storageSize: "2Gi"
-  pgVersion: "15"
-  instances: 3
-  enabled: true
-
-traefik:
-  enabled: true
diff --git a/terminfinder-chart/charts/backend/.helmignore b/terminfinder-chart/charts/terminfinder-backend/.helmignore
similarity index 100%
rename from terminfinder-chart/charts/backend/.helmignore
rename to terminfinder-chart/charts/terminfinder-backend/.helmignore
diff --git a/terminfinder-chart/charts/backend/Chart.lock b/terminfinder-chart/charts/terminfinder-backend/Chart.lock
similarity index 53%
rename from terminfinder-chart/charts/backend/Chart.lock
rename to terminfinder-chart/charts/terminfinder-backend/Chart.lock
index 5ad7ab0..54f5fc0 100644
--- a/terminfinder-chart/charts/backend/Chart.lock
+++ b/terminfinder-chart/charts/terminfinder-backend/Chart.lock
@@ -4,6 +4,6 @@ dependencies:
   version: 12.1.2
 - name: common
   repository: https://charts.bitnami.com/bitnami
-  version: 2.2.4
-digest: sha256:55f16e9b5bade9e719e7e6673b24d182e9316e8669820cdc68b4c37f518c3e5b
-generated: "2023-03-23T11:14:06.498295+01:00"
+  version: 2.20.3
+digest: sha256:8fccf7c770b0e1a7a1f64fcd77a3afede13a967fe7c182ebbfe2d21f9cfed0b7
+generated: "2024-07-01T16:33:04.750757+02:00"
diff --git a/terminfinder-chart/charts/backend/Chart.yaml b/terminfinder-chart/charts/terminfinder-backend/Chart.yaml
similarity index 100%
rename from terminfinder-chart/charts/backend/Chart.yaml
rename to terminfinder-chart/charts/terminfinder-backend/Chart.yaml
diff --git a/terminfinder-chart/charts/terminfinder-backend/charts/common-2.20.3.tgz b/terminfinder-chart/charts/terminfinder-backend/charts/common-2.20.3.tgz
new file mode 100644
index 0000000..cbac269
Binary files /dev/null and b/terminfinder-chart/charts/terminfinder-backend/charts/common-2.20.3.tgz differ
diff --git a/terminfinder-chart/charts/backend/charts/postgresql-12.1.2.tgz b/terminfinder-chart/charts/terminfinder-backend/charts/postgresql-12.1.2.tgz
similarity index 100%
rename from terminfinder-chart/charts/backend/charts/postgresql-12.1.2.tgz
rename to terminfinder-chart/charts/terminfinder-backend/charts/postgresql-12.1.2.tgz
diff --git a/terminfinder-chart/charts/backend/templates/NOTES.txt b/terminfinder-chart/charts/terminfinder-backend/templates/NOTES.txt
similarity index 100%
rename from terminfinder-chart/charts/backend/templates/NOTES.txt
rename to terminfinder-chart/charts/terminfinder-backend/templates/NOTES.txt
diff --git a/terminfinder-chart/charts/backend/templates/_helpers.tpl b/terminfinder-chart/charts/terminfinder-backend/templates/_helpers.tpl
similarity index 100%
rename from terminfinder-chart/charts/backend/templates/_helpers.tpl
rename to terminfinder-chart/charts/terminfinder-backend/templates/_helpers.tpl
diff --git a/terminfinder-chart/charts/backend/templates/deployment.yaml b/terminfinder-chart/charts/terminfinder-backend/templates/deployment.yaml
similarity index 87%
rename from terminfinder-chart/charts/backend/templates/deployment.yaml
rename to terminfinder-chart/charts/terminfinder-backend/templates/deployment.yaml
index be60cf3..d371577 100644
--- a/terminfinder-chart/charts/backend/templates/deployment.yaml
+++ b/terminfinder-chart/charts/terminfinder-backend/templates/deployment.yaml
@@ -1,4 +1,4 @@
-{{- $svc := .Values.global.postgresql.service.name | default (printf "%s-postgresql-hl" (include "terminfinder-backend.fullname" .)) }}
+{{- $svc := .Values.global.postgresql.service.name | default (printf "%s-postgresql" (include "common.names.namespace" .)) }}
 apiVersion: apps/v1
 kind: Deployment
 metadata:
@@ -41,7 +41,7 @@ spec:
             - name: DB_PORT
               value: {{ .Values.global.postgresql.service.ports.postgresql | quote }}
             - name: DB_ADDRESS
-              value: {{ printf "%s.%s.svc" $svc .Release.Namespace }}
+              value: {{ printf "%s" $svc }}
             - name: DB_USERNAME
               value: {{ .Values.global.postgresql.auth.username }}
             - name: ASPNETCORE_URLS
@@ -50,7 +50,7 @@ spec:
             - name: DB_PASSWORD
               valueFrom:
                 secretKeyRef:
-                  name: {{ .Values.global.postgresql.auth.existingSecret | default (printf "%s-postgresql" (include "common.names.fullname" .)) }}
+                  name: {{ .Values.global.postgresql.auth.existingSecret | default (printf "%s-postgresql" (include "common.names.namespace" .)) }}
                   key: {{ .Values.global.postgresql.auth.secretKeys.userPasswordKey | default "password" }}
             # Patches
             - name: Terminfinder__UseHttps
@@ -60,12 +60,19 @@ spec:
             - name: Terminfinder__Log4NetConfigFilename
               value: log4net.Console.debug.config
             - name: ConnectionStrings__TerminfinderConnection
-              value: "Server=$(DB_ADDRESS);Port=$(DB_PORT);Database=$(DB_DATABASE);User ID=$(DB_USERNAME);password=$(DB_PASSWORD);"
+              value: "Server=$(DB_ADDRESS),$(DB_PORT);Database=$(DB_DATABASE);User ID=$(DB_USERNAME);password=$(DB_PASSWORD);"
           ports:
             - name: http
               containerPort: 8080
               protocol: TCP
+          startupProbe:
+            failureThreshold: 3
+            periodSeconds: 10
+            httpGet:
+              path: /app
+              port: http
           livenessProbe:
+            initialDelaySeconds: 10
             httpGet:
               path: /app
               port: http
diff --git a/terminfinder-chart/charts/backend/templates/hpa.yaml b/terminfinder-chart/charts/terminfinder-backend/templates/hpa.yaml
similarity index 100%
rename from terminfinder-chart/charts/backend/templates/hpa.yaml
rename to terminfinder-chart/charts/terminfinder-backend/templates/hpa.yaml
diff --git a/terminfinder-chart/charts/backend/templates/ingress.yaml b/terminfinder-chart/charts/terminfinder-backend/templates/ingress.yaml
similarity index 100%
rename from terminfinder-chart/charts/backend/templates/ingress.yaml
rename to terminfinder-chart/charts/terminfinder-backend/templates/ingress.yaml
diff --git a/terminfinder-chart/charts/backend/templates/service.yaml b/terminfinder-chart/charts/terminfinder-backend/templates/service.yaml
similarity index 100%
rename from terminfinder-chart/charts/backend/templates/service.yaml
rename to terminfinder-chart/charts/terminfinder-backend/templates/service.yaml
diff --git a/terminfinder-chart/charts/backend/templates/serviceaccount.yaml b/terminfinder-chart/charts/terminfinder-backend/templates/serviceaccount.yaml
similarity index 100%
rename from terminfinder-chart/charts/backend/templates/serviceaccount.yaml
rename to terminfinder-chart/charts/terminfinder-backend/templates/serviceaccount.yaml
diff --git a/terminfinder-chart/charts/backend/values.yaml b/terminfinder-chart/charts/terminfinder-backend/values.yaml
similarity index 67%
rename from terminfinder-chart/charts/backend/values.yaml
rename to terminfinder-chart/charts/terminfinder-backend/values.yaml
index 4ae88ca..7ba12ab 100644
--- a/terminfinder-chart/charts/backend/values.yaml
+++ b/terminfinder-chart/charts/terminfinder-backend/values.yaml
@@ -9,8 +9,7 @@ global:
       database: terminfinder
       existingSecret: "" # if not set, default: "{{ Release.Name }}-postgres"
       secretKeys:
-        userPasswordKey: "terminfinder"
-
+        userPasswordKey: "password"
     service:
       name: "" # if not set, default: "{{ Release.Name }}-postgres"
       ports:
@@ -100,22 +99,13 @@ affinity: { }
 postgresql:
   enabled: true
 
-  #architecture: standalone
-
   serviceAccount:
     create: true
 
-  image:
-    registry: docker.io # Notice, may this is not allowed
-    repository: mxzinke/postgresql-rootless # This is an special image, which is based on bitnami/postgresql
-    tag: 15
-    pullPolicy: IfNotPresent
-    pullSecrets: [ ]
-
   ## Set permissions for the data volume
   ## Only needed when volume has not correct permissions
   volumePermissions:
-    enabled: false
+    enabled: true
 
     image:
       registry: docker.io # Notice, may this is not allowed
@@ -124,58 +114,6 @@ postgresql:
       # pullPolicy: Always
       # pullSecrets: []
 
-    resources:
-      requests:
-        memory: 64Mi
-        cpu: 250m
-      limits:
-        memory: 64Mi
-        cpu: 250m
-
-    containerSecurityContext:
-      enabled: true
-      runAsUser: 1001
-      runAsGroup: 1001
-      allowPrivilegeEscalation: false
-      runAsNonRoot: true
-      capabilities:
-        drop:
-          - ALL
-
-  primary:
-    ## Enable security context with non-root user
-    podSecurityContext:
-      enabled: true
-      runAsUser: 1001
-      runAsGroup: 1001
-      fsGroup: 1001
-    containerSecurityContext:
-      enabled: true
-      runAsUser: 1001
-      runAsGroup: 1001
-      allowPrivilegeEscalation: false
-      runAsNonRoot: true
-      capabilities:
-        drop:
-          - ALL
-
-    ## Enable persistence using Persistent Volume Claims
-    ## For BSI compliance, we need to use non-root user
-    persistence:
-      enabled: true
-      accessModes:
-        - ReadWriteOnce
-      size: 8Gi
-
-    # Resources (minimal)
-    resources:
-      requests:
-        memory: 256Mi
-        cpu: 250m
-      limits:
-        memory: 256Mi
-        cpu: 250m
-
     initdb:
       # Enabling the UUID-OSSP
       scripts:
diff --git a/terminfinder-chart/charts/frontend/.helmignore b/terminfinder-chart/charts/terminfinder-frontend/.helmignore
similarity index 100%
rename from terminfinder-chart/charts/frontend/.helmignore
rename to terminfinder-chart/charts/terminfinder-frontend/.helmignore
diff --git a/terminfinder-chart/charts/frontend/Chart.yaml b/terminfinder-chart/charts/terminfinder-frontend/Chart.yaml
similarity index 100%
rename from terminfinder-chart/charts/frontend/Chart.yaml
rename to terminfinder-chart/charts/terminfinder-frontend/Chart.yaml
diff --git a/terminfinder-chart/charts/frontend/templates/NOTES.txt b/terminfinder-chart/charts/terminfinder-frontend/templates/NOTES.txt
similarity index 100%
rename from terminfinder-chart/charts/frontend/templates/NOTES.txt
rename to terminfinder-chart/charts/terminfinder-frontend/templates/NOTES.txt
diff --git a/terminfinder-chart/charts/frontend/templates/_helpers.tpl b/terminfinder-chart/charts/terminfinder-frontend/templates/_helpers.tpl
similarity index 100%
rename from terminfinder-chart/charts/frontend/templates/_helpers.tpl
rename to terminfinder-chart/charts/terminfinder-frontend/templates/_helpers.tpl
diff --git a/terminfinder-chart/charts/frontend/templates/deployment.yaml b/terminfinder-chart/charts/terminfinder-frontend/templates/deployment.yaml
similarity index 78%
rename from terminfinder-chart/charts/frontend/templates/deployment.yaml
rename to terminfinder-chart/charts/terminfinder-frontend/templates/deployment.yaml
index 146b62a..7ccaa11 100644
--- a/terminfinder-chart/charts/frontend/templates/deployment.yaml
+++ b/terminfinder-chart/charts/terminfinder-frontend/templates/deployment.yaml
@@ -36,25 +36,13 @@ spec:
           imagePullPolicy: {{ .Values.image.pullPolicy }}
           env:
             - name: ADDRESSING
-              valueFrom:
-                configMapKeyRef:
-                  name: {{ .Release.Name }}-customer-config
-                  key: Anrede
+              value: {{ .Values.customerConfig.ADDRESSING }}
             - name: LOCALE
-              valueFrom:
-                configMapKeyRef:
-                  name: {{ .Release.Name }}-customer-config
-                  key: Sprache
+              value: {{ .Values.customerConfig.LOCALE }}
             - name: TITLE
-              valueFrom:
-                configMapKeyRef:
-                  name: {{ .Release.Name }}-customer-config
-                  key: Titel
+              value: {{ .Values.customerConfig.TITLE }}
             - name: EMAIL
-              valueFrom:
-                configMapKeyRef:
-                  name: {{ .Release.Name }}-customer-config
-                  key: email
+              value: {{ .Values.customerConfig.EMAIL }}
             - name: API_URL
               value: {{ .Values.app.backend_url }}
           ports:
diff --git a/terminfinder-chart/charts/frontend/templates/hpa.yaml b/terminfinder-chart/charts/terminfinder-frontend/templates/hpa.yaml
similarity index 100%
rename from terminfinder-chart/charts/frontend/templates/hpa.yaml
rename to terminfinder-chart/charts/terminfinder-frontend/templates/hpa.yaml
diff --git a/terminfinder-chart/charts/frontend/templates/ingress.yaml b/terminfinder-chart/charts/terminfinder-frontend/templates/ingress.yaml
similarity index 100%
rename from terminfinder-chart/charts/frontend/templates/ingress.yaml
rename to terminfinder-chart/charts/terminfinder-frontend/templates/ingress.yaml
diff --git a/terminfinder-chart/charts/frontend/templates/service.yaml b/terminfinder-chart/charts/terminfinder-frontend/templates/service.yaml
similarity index 100%
rename from terminfinder-chart/charts/frontend/templates/service.yaml
rename to terminfinder-chart/charts/terminfinder-frontend/templates/service.yaml
diff --git a/terminfinder-chart/charts/frontend/templates/serviceaccount.yaml b/terminfinder-chart/charts/terminfinder-frontend/templates/serviceaccount.yaml
similarity index 100%
rename from terminfinder-chart/charts/frontend/templates/serviceaccount.yaml
rename to terminfinder-chart/charts/terminfinder-frontend/templates/serviceaccount.yaml
diff --git a/terminfinder-chart/charts/frontend/values.yaml b/terminfinder-chart/charts/terminfinder-frontend/values.yaml
similarity index 100%
rename from terminfinder-chart/charts/frontend/values.yaml
rename to terminfinder-chart/charts/terminfinder-frontend/values.yaml
diff --git a/terminfinder-chart/charts/resources/Chart.yaml b/terminfinder-chart/charts/terminfinder-resources/Chart.yaml
similarity index 100%
rename from terminfinder-chart/charts/resources/Chart.yaml
rename to terminfinder-chart/charts/terminfinder-resources/Chart.yaml
diff --git a/terminfinder-chart/charts/resources/templates/_helpers.tpl b/terminfinder-chart/charts/terminfinder-resources/templates/_helpers.tpl
similarity index 100%
rename from terminfinder-chart/charts/resources/templates/_helpers.tpl
rename to terminfinder-chart/charts/terminfinder-resources/templates/_helpers.tpl
diff --git a/terminfinder-chart/charts/resources/templates/observability.yaml b/terminfinder-chart/charts/terminfinder-resources/templates/observability.yaml
similarity index 81%
rename from terminfinder-chart/charts/resources/templates/observability.yaml
rename to terminfinder-chart/charts/terminfinder-resources/templates/observability.yaml
index 4271ef0..eb1a4b7 100644
--- a/terminfinder-chart/charts/resources/templates/observability.yaml
+++ b/terminfinder-chart/charts/terminfinder-resources/templates/observability.yaml
@@ -1,3 +1,4 @@
+{{- if .Values.grafana.enabled -}}
 apiVersion: monitoring.grafana.com/v1alpha1
 kind: LogsInstance
 metadata:
@@ -5,8 +6,8 @@ metadata:
   namespace: {{ .Release.Namespace }}
 spec:
   clients:
-  - url: {{.Values.loki.endpoint}}
-    tenantId: {{.Values.loki.tenantId}}
+  - url: {{.Values.grafana.loki.endpoint}}
+    tenantId: {{.Values.grafana.loki.tenantId}}
   podLogsSelector:
     matchLabels:
       {{- include "terminfinder-resources.labels" . | nindent 6 }}
@@ -24,3 +25,4 @@ spec:
     - cri: {}
   selector:
     matchLabels: {}
+{{- end }}
diff --git a/terminfinder-chart/charts/resources/templates/traefik.yaml b/terminfinder-chart/charts/terminfinder-resources/templates/traefik.yaml
similarity index 100%
rename from terminfinder-chart/charts/resources/templates/traefik.yaml
rename to terminfinder-chart/charts/terminfinder-resources/templates/traefik.yaml
diff --git a/terminfinder-chart/charts/terminfinder-resources/values.yaml b/terminfinder-chart/charts/terminfinder-resources/values.yaml
new file mode 100644
index 0000000..c7927e3
--- /dev/null
+++ b/terminfinder-chart/charts/terminfinder-resources/values.yaml
@@ -0,0 +1,8 @@
+grafana:
+  loki:
+    endpoint: http://loki-gateway.logging-system.svc.cluster.local/loki/api/v1/push
+    tenantId: 6703bd86-3601-4ea8-96e4-ecff048f1de9
+  enabled: true
+
+traefik:
+  enabled: true
diff --git a/terminfinder-chart/values.yaml b/terminfinder-chart/values.yaml
index 115e24b..2dd7bf5 100644
--- a/terminfinder-chart/values.yaml
+++ b/terminfinder-chart/values.yaml
@@ -1,4 +1,4 @@
-terminfinder-frontend-oss:
+terminfinder-frontend:
   # Default values for terminfinder-frontend.
   # This is a YAML-formatted file.
   # Declare variables to be passed into your templates.
@@ -14,12 +14,6 @@ terminfinder-frontend-oss:
 
   replicaCount: 1 # Not HA for now!
 
-  image:
-    repository: registry.opencode.de/dataport/terminfinder/terminfinder-frontend
-    pullPolicy: IfNotPresent
-    # Overrides the image tag whose default is the chart appVersion.
-    tag: ""
-
   imagePullSecrets: [ ]
   nameOverride: ""
   fullnameOverride: ""
@@ -96,31 +90,13 @@ terminfinder-frontend-oss:
 
   affinity: { }
 
-terminfinder-backend-oss:
+terminfinder-backend:
   # Default values for terminfinder-backend.
   # This is a YAML-formatted file.
   # Declare variables to be passed into your templates.
 
-  global:
-    postgresql:
-      auth:
-        username: pgsql-admin
-        database: terminfinder
-        existingSecret: "" # if not set, default: "{{ Release.Name }}-postgres"
-
-      service:
-        name: "" # if not set, default: "{{ Release.Name }}-postgres"
-        ports:
-          postgresql: 5432 # Default port
-
   replicaCount: 1
 
-  image:
-    repository: registry.opencode.de/dataport/terminfinder/terminfinder-backend
-    pullPolicy: IfNotPresent
-    # Overrides the image tag whose default is the chart appVersion.
-    tag: ""
-
   imagePullSecrets: [ ]
   nameOverride: ""
   fullnameOverride: ""
@@ -203,24 +179,14 @@ terminfinder-backend-oss:
     serviceAccount:
       create: true
 
-    image:
-      registry: docker.io # Notice, may this is not allowed
-      repository: mxzinke/postgresql-rootless # This is an special image, which is based on bitnami/postgresql
-      tag: 15
-      pullPolicy: IfNotPresent
-      pullSecrets: [ ]
-
     ## Set permissions for the data volume
     ## Only needed when volume has not correct permissions
     volumePermissions:
       enabled: false
 
       image:
-        registry: docker.io # Notice, may this is not allowed
+        registry: docker.io
         repository: bitnami/bitnami-shell
-        # tag: 11-debian-11-r77
-        # pullPolicy: Always
-        # pullSecrets: []
 
       resources:
         requests:
@@ -231,7 +197,7 @@ terminfinder-backend-oss:
           cpu: 250m
 
       containerSecurityContext:
-        enabled: true
+        enabled: false
         runAsUser: 1001
         runAsGroup: 1001
         allowPrivilegeEscalation: false
@@ -243,12 +209,12 @@ terminfinder-backend-oss:
     primary:
       ## Enable security context with non-root user
       podSecurityContext:
-        enabled: true
+        enabled: false
         runAsUser: 1001
         runAsGroup: 1001
         fsGroup: 1001
       containerSecurityContext:
-        enabled: true
+        enabled: false
         runAsUser: 1001
         runAsGroup: 1001
         allowPrivilegeEscalation: false
@@ -285,15 +251,12 @@ terminfinder-backend-oss:
     # https://github.com/bitnami/charts/tree/main/bitnami/postgresql#parameters
 
 terminfinder-resources:
-  loki:
-    endpoint: http://loki-gateway.logging-system.svc.cluster.local/loki/api/v1/push
-    tenantId: 6703bd86-3601-4ea8-96e4-ecff048f1de9
-
-  postgres:
-    storageSize: "2Gi"
-    pgVersion: "15"
-    instances: 3
-    enabled: true
+  grafana:
+    enabled: false
+    loki:
+      endpoint: http://loki-gateway.logging-system.svc.cluster.local/loki/api/v1/push
+      tenantId: 6703bd86-3601-4ea8-96e4-ecff048f1de9
+      enabled: false
 
   traefik:
-    enabled: true
+    enabled: false