diff --git a/base/README.adoc b/base/README.adoc
index 13e88e6..eb13309 100644
--- a/base/README.adoc
+++ b/base/README.adoc
@@ -2,7 +2,7 @@
 
 = base
 
-image::https://img.shields.io/badge/Version-0.1.0-informational?style=flat-square[Version: 0.1.0]
+image::https://img.shields.io/badge/Version-0.2.0-informational?style=flat-square[Version: 0.2.0]
 image::https://img.shields.io/badge/Version-application-informational?style=flat-square[Type: application]
 == Maintainers
 
@@ -17,45 +17,95 @@ image::https://img.shields.io/badge/Version-application-informational?style=flat
 
 == Values
 
-.Values
+.Values Base
 |===
 | Key | Type | Default | Description
 
-| commons.helm.release.driftDetection
+| base.helm.release.driftDetection
 | object
 | `{}`
-|
+| driftDetection of FluxCD HelmRelease
 
-| commons.helm.release.install
+| base.helm.release.install
 | object
 | `{}`
-|
+| install of FluxCD HelmRelease
 
-| commons.helm.release.test
-| object
-| `{}`
-|
-
-| commons.helm.release.upgrade
-| object
-| `{}`
-|
-
-| commons.namespace.labels
-| object
-| `{}`
-| labels for every new created namespace (together or overwritten by components.<component-release-name.namespace.labels)
-
-| componentCommons.helm.release.interval
+| base.helm.release.interval
 | string
 | `"10m"`
-|
+| interval of FluxCD HelmRelease
 
-| componentCommons.helm.release.valuesFrom
+| base.helm.release.test
+| object
+| `{}`
+| test of FluxCD HelmRelease
+
+| base.helm.release.upgrade
+| object
+| `{}`
+| upgrade of FluxCD HelmRelease
+
+| base.helm.release.valuesFrom
 | list
 | `[]`
 | valuesFrom for every components (for use values from ConfigMap or Secret)
 
+| base.helm.repo.interval
+| string
+| `"10m"`
+| interval of FluxCD Repository
+
+| base.helm.repo.namespace
+| string
+| `nil`
+| namespace, where the GitRepo resource is installed (maybe needed together with secretRef)
+
+| base.helm.repo.ref
+| object
+| `{"branch":"main"}`
+| default ref (if no branch is set - maybe overwritten by semver or so)
+
+| base.helm.repo.secretRef
+| string
+| `nil`
+| secret to get access to the git-repo
+
+| base.helm.repo.url
+| string
+| `"https://codeberg.org/wrenix/flux-charts.git"`
+| git repo where all components are stored
+
+| base.helm.repo.verify
+| string
+| `nil`
+| secret to get access to the git-repo
+
+| base.namespace.labels
+| object
+| `{}`
+| labels for every new created namespace (together or overwritten by components.<component-release-name.namespace.labels)
+|===
+
+.Values Shared Values - between all components
+|===
+| Key | Type | Default | Description
+
+| commons
+| object
+| `{}`
+| commons are values which are additional
+
+| global
+| object
+| `{}`
+| global are values which overwrite values global
+|===
+
+.Values A Component
+|===
+| Key | Type | Default | Description
+
 | components.<component-release-name>.enabled
 | bool
 | `false`
@@ -90,11 +140,6 @@ image::https://img.shields.io/badge/Version-application-informational?style=flat
 | list
 | `[]`
 | valuesFrom just for this component (for use values from ConfigMap or Secret)
-
-| global
-| object
-| `{}`
-|
 |===
 
 Autogenerated from chart metadata using https://github.com/norwoodj/helm-docs[helm-docs]
diff --git a/base/values.yaml b/base/values.yaml
index affca33..ee511a0 100644
--- a/base/values.yaml
+++ b/base/values.yaml
@@ -5,36 +5,59 @@
 base:
   namespace:
     # -- labels for every new created namespace (together or overwritten by components.<component-release-name.namespace.labels)
+    # @section -- Base
     labels: {}
 
   helm:
     repo:
       # -- git repo where all components are stored
+      # @section -- Base
       url: https://codeberg.org/wrenix/flux-charts.git
       # -- namespace, where the GitRepo resource is installed (maybe needed together with secretRef)
+      # @section -- Base
       namespace:
       # -- default ref (if no branch is set - maybe overwritten by semver or so)
+      # @section -- Base
       ref:
         branch: main
       # -- secret to get access to the git-repo
+      # @section -- Base
       secretRef:
       # -- secret to get access to the git-repo
+      # @section -- Base
       verify:
+      # -- interval of FluxCD Repository
+      # @section -- Base
       interval: 10m
     release:
+      # -- interval of FluxCD HelmRelease
+      # @section -- Base
       interval: 10m
+      # -- install of FluxCD HelmRelease
+      # @section -- Base
       install: {}
+      # -- test of FluxCD HelmRelease
+      # @section -- Base
       test: {}
+      # -- upgrade of FluxCD HelmRelease
+      # @section -- Base
       upgrade: {}
+      # -- driftDetection of FluxCD HelmRelease
+      # @section -- Base
       driftDetection: {}
       # -- valuesFrom for every components (for use values from ConfigMap or Secret)
+      # @section -- Base
       valuesFrom: []
 
 ##
 # Shared Values
 # between all components
 ##
+# -- global are values which overwrite values global
+# @section -- Shared Values - between all components
 global: {}
+# -- commons are values which are additional
+# @section -- Shared Values - between all components
 commons: {}
 
 
@@ -44,17 +67,24 @@ commons: {}
 components:
   <component-release-name>:
     # -- enable component-release to install
+    # @section -- A Component
     enabled: false
     # -- optional component-name (if not set component-release-name is used as component-name)
+    # @section -- A Component
     name:
     namespace:
       # -- if not set, it reuse namespace where this base-chart is deployed
+      # @section -- A Component
       name:
       # -- if create a new namespace use labels (and the common namespace.labels)
+      # @section -- A Component
       labels: {}
       # -- use the named namespace but does not create it
+      # @section -- A Component
       skip_create: false
     # -- valuesFrom just for this component (for use values from ConfigMap or Secret)
+    # @section -- A Component
     valuesFrom: []
     # -- set values on component-release
+    # @section -- A Component
     values: {}
diff --git a/docs/modules/components/README.adoc.gotmpl b/docs/modules/components/README.adoc.gotmpl
index 7c5fb98..4d96707 100644
--- a/docs/modules/components/README.adoc.gotmpl
+++ b/docs/modules/components/README.adoc.gotmpl
@@ -19,10 +19,25 @@ image::https://img.shields.io/badge/AppVersion-{{ .AppVersion }}-informational?s
 |===
 {{ end }}
 {{ define "chart.valuesHeader" }}== Values{{ end }}
-{{ define "chart.valuesTable" }}.Values
+{{ define "chart.valuesTable" -}}
+{{- if .Sections.Sections -}}
+{{- range .Sections.Sections }}
+.Values {{.SectionName }}
+{{ template "chart.valuesOneTable" .SectionItems }}
+{{- end }}{{/* range sections*/}}
+{{- if .Sections.DefaultSection.SectionItems -}}
+.Values {{.Sections.DefaultSection.SectionName }}
+{{ template "chart.valuesOneTable" .Sections.DefaultSection.SectionItems }}
+{{- end }}{{/* end default section */}}
+{{- else }}{{/* if no sections */}}
+.Values
+{{ template "chart.valuesOneTable" .Values }}
+{{- end }}
+{{ end }}{{/* end chart.valuesTable */}}
+{{ define "chart.valuesOneTable" -}}
 |===
 | Key | Type | Default | Description
-  {{- range .Values }}
+  {{- range . }}
 
 | {{ .Key }}
 | {{ .Type }}
@@ -30,7 +45,7 @@ image::https://img.shields.io/badge/AppVersion-{{ .AppVersion }}-informational?s
 | {{ if .Description }}{{ .Description }}{{ else }}{{ .AutoDescription }}{{ end }}
   {{- end }}
 |===
-{{ end }}
+{{ end }}{{/* end chart.valuesOneTable */}}
 
 {{ template "chart.header" . }}
 {{ template "chart.deprecationWarning" . }}
diff --git a/infra-certificates/README.adoc b/infra-certificates/README.adoc
index f574831..e63e3b4 100644
--- a/infra-certificates/README.adoc
+++ b/infra-certificates/README.adoc
@@ -17,34 +17,58 @@ image::https://img.shields.io/badge/Version-application-informational?style=flat
 
 == Values
 
-.Values
+.Values Commons Monitoring
+|===
+| Key | Type | Default | Description
+
+| commons.grafana.dashboards.labels
+| object
+| `{"grafana_dashboard":"1"}`
+| labels of grafana dashboard configmap
+
+| commons.grafana.datasource.labels
+| object
+| `{"grafana_datasource":"1"}`
+| labels of grafana datasource configmap and secret
+
+| commons.prometheus.monitor.labels
+| object
+| `{}`
+| labels on Pod- and Service-Monitor
+|===
+
+.Values Commons helm release
 |===
 | Key | Type | Default | Description
 
 | commons.helm.release.driftDetection
 | object
 | `{}`
-|
+| driftDetection of FluxCD HelmRelease
 
 | commons.helm.release.install
 | object
 | `{}`
-|
+| install of FluxCD HelmRelease
 
 | commons.helm.release.test
 | object
 | `{}`
-|
+| test of FluxCD HelmRelease
 
 | commons.helm.release.upgrade
 | object
 | `{}`
-|
+| upgrade of FluxCD HelmRelease
+|===
+.Values Other Values
+|===
+| Key | Type | Default | Description
 
-| commons.prometheus.monitor.labels
+| commons.prometheus.rules.labels
 | object
 | `{}`
-|
+| labels on PrometheusRules
 
 | email
 | string
diff --git a/infra-certificates/values.yaml b/infra-certificates/values.yaml
index e5cdaf8..f35c8ed 100644
--- a/infra-certificates/values.yaml
+++ b/infra-certificates/values.yaml
@@ -5,22 +5,37 @@ init:
 commons:
   helm:
     release:
+      # -- install of FluxCD HelmRelease
+      # @section -- Commons helm release
       install: {}
+      # -- test of FluxCD HelmRelease
+      # @section -- Commons helm release
       test: {}
+      # -- upgrade of FluxCD HelmRelease
+      # @section -- Commons helm release
       upgrade: {}
+      # -- driftDetection of FluxCD HelmRelease
+      # @section -- Commons helm release
       driftDetection: {}
 
   prometheus:
     monitor:
+      # -- labels on Pod- and Service-Monitor
+      # @section -- Commons Monitoring
       labels: {}
     rules:
+      # -- labels on PrometheusRules
       labels: {}
 
   grafana:
     datasource:
+      # -- labels of grafana datasource configmap and secret
+      # @section -- Commons Monitoring
       labels:
         grafana_datasource: "1"
     dashboards:
+      # -- labels of grafana dashboard configmap
+      # @section -- Commons Monitoring
       labels:
         grafana_dashboard: "1"
 
diff --git a/infra-fluxcd/README.adoc b/infra-fluxcd/README.adoc
index 606499a..80b6811 100644
--- a/infra-fluxcd/README.adoc
+++ b/infra-fluxcd/README.adoc
@@ -17,29 +17,33 @@ image::https://img.shields.io/badge/Version-application-informational?style=flat
 
 == Values
 
-.Values
+.Values Commons Monitoring
 |===
 | Key | Type | Default | Description
 
-| commons.grafana.dashboards.labels.grafana_dashboard
-| string
-| `"1"`
-|
+| commons.grafana.dashboards.labels
+| object
+| `{"grafana_dashboard":"1"}`
+| labels of grafana dashboard configmap
 
 | commons.prometheus.monitor.labels
 | object
 | `{}`
-|
+| labels on Pod- and Service-Monitor
 
 | commons.prometheus.rules.labels
 | object
 | `{}`
-|
+| labels on PrometheusRules
+|===
+.Values Other Values
+|===
+| Key | Type | Default | Description
 
 | grafana.dashboards.annotations
 | object
 | `{}`
-|
+| annotations of grafana dashboard configmap
 
 | init.namespace
 | string
diff --git a/infra-fluxcd/values.yaml b/infra-fluxcd/values.yaml
index b60dd6d..b9f412c 100644
--- a/infra-fluxcd/values.yaml
+++ b/infra-fluxcd/values.yaml
@@ -3,20 +3,28 @@ init:
   namespace: "bases"
 
 commons:
-  grafana:
-    dashboards:
-      labels:
-        grafana_dashboard: "1"
   prometheus:
     monitor:
+      # -- labels on Pod- and Service-Monitor
+      # @section -- Commons Monitoring
       labels: {}
     rules:
+      # -- labels on PrometheusRules
+      # @section -- Commons Monitoring
       labels: {}
 
+  grafana:
+    dashboards:
+      # -- labels of grafana dashboard configmap
+      # @section -- Commons Monitoring
+      labels:
+        grafana_dashboard: "1"
+
 prometheus:
   kubeStateMetricsConfig:
     namespace:
 
 grafana:
   dashboards:
+    # -- annotations of grafana dashboard configmap
     annotations: {}
diff --git a/infra-ingress/README.adoc b/infra-ingress/README.adoc
index 993969e..b08f606 100644
--- a/infra-ingress/README.adoc
+++ b/infra-ingress/README.adoc
@@ -17,39 +17,53 @@ image::https://img.shields.io/badge/Version-application-informational?style=flat
 
 == Values
 
-.Values
+.Values Commons helm release
 |===
 | Key | Type | Default | Description
 
 | commons.helm.release.driftDetection
 | object
 | `{}`
-|
+| driftDetection of FluxCD HelmRelease
 
 | commons.helm.release.install
 | object
 | `{}`
-|
+| install of FluxCD HelmRelease
 
 | commons.helm.release.test
 | object
 | `{}`
-|
+| test of FluxCD HelmRelease
 
 | commons.helm.release.upgrade
 | object
 | `{}`
-|
+| upgrade of FluxCD HelmRelease
+|===
+
+.Values Commons Ingress
+|===
+| Key | Type | Default | Description
 
 | commons.ingress.domain
 | string
 | `"wrenix.eu"`
-|
+| top domain for all services
+|===
+
+.Values Commons Monitoring
+|===
+| Key | Type | Default | Description
 
 | commons.prometheus.monitor.labels
 | object
 | `{}`
-|
+| labels on Pod- and Service-Monitor
+|===
+.Values Other Values
+|===
+| Key | Type | Default | Description
 
 | controller
 | string
diff --git a/infra-ingress/values.yaml b/infra-ingress/values.yaml
index 0480f69..7d4ef48 100644
--- a/infra-ingress/values.yaml
+++ b/infra-ingress/values.yaml
@@ -5,16 +5,28 @@ init:
 commons:
   helm:
     release:
+      # -- install of FluxCD HelmRelease
+      # @section -- Commons helm release
       install: {}
+      # -- test of FluxCD HelmRelease
+      # @section -- Commons helm release
       test: {}
+      # -- upgrade of FluxCD HelmRelease
+      # @section -- Commons helm release
       upgrade: {}
+      # -- driftDetection of FluxCD HelmRelease
+      # @section -- Commons helm release
       driftDetection: {}
 
   ingress:
+    # -- top domain for all services
+    # @section -- Commons Ingress
     domain: "wrenix.eu"
 
   prometheus:
     monitor:
+      # -- labels on Pod- and Service-Monitor
+      # @section -- Commons Monitoring
       labels: {}
 
 controller: "traefik"
diff --git a/infra-logging/README.adoc b/infra-logging/README.adoc
index 6217459..d7f68cd 100644
--- a/infra-logging/README.adoc
+++ b/infra-logging/README.adoc
@@ -17,49 +17,58 @@ image::https://img.shields.io/badge/Version-application-informational?style=flat
 
 == Values
 
-.Values
+.Values Commons Monitoring
 |===
 | Key | Type | Default | Description
 
-| commons.grafana.dashboards.labels.grafana_dashboard
-| string
-| `"1"`
-|
-
-| commons.grafana.datasource.labels.grafana_datasource
-| string
-| `"1"`
-|
-
-| commons.helm.release.driftDetection
+| commons.grafana.dashboards.labels
 | object
-| `{}`
-|
+| `{"grafana_dashboard":"1"}`
+| labels of grafana dashboard configmap
 
-| commons.helm.release.install
+| commons.grafana.datasource.labels
 | object
-| `{}`
-|
-
-| commons.helm.release.test
-| object
-| `{}`
-|
-
-| commons.helm.release.upgrade
-| object
-| `{}`
-|
+| `{"grafana_datasource":"1"}`
+| labels of grafana datasource configmap and secret
 
 | commons.prometheus.monitor.labels
 | object
 | `{}`
-|
+| labels on Pod- and Service-Monitor
 
 | commons.prometheus.rules.labels
 | object
 | `{}`
-|
+| labels on PrometheusRules
+|===
+
+.Values Commons helm release
+|===
+| Key | Type | Default | Description
+
+| commons.helm.release.driftDetection
+| object
+| `{}`
+| driftDetection of FluxCD HelmRelease
+
+| commons.helm.release.install
+| object
+| `{}`
+| install of FluxCD HelmRelease
+
+| commons.helm.release.test
+| object
+| `{}`
+| test of FluxCD HelmRelease
+
+| commons.helm.release.upgrade
+| object
+| `{}`
+| upgrade of FluxCD HelmRelease
+|===
+.Values Other Values
+|===
+| Key | Type | Default | Description
 
 | fluentd.replicas
 | int
@@ -69,7 +78,7 @@ image::https://img.shields.io/badge/Version-application-informational?style=flat
 | grafana.dashboards.annotations
 | object
 | `{}`
-|
+| annotations of grafana dashboard configmap
 
 | init.namespace
 | string
diff --git a/infra-logging/values.yaml b/infra-logging/values.yaml
index 68ac15e..33eca70 100644
--- a/infra-logging/values.yaml
+++ b/infra-logging/values.yaml
@@ -5,27 +5,44 @@ init:
 commons:
   helm:
     release:
+      # -- install of FluxCD HelmRelease
+      # @section -- Commons helm release
       install: {}
+      # -- test of FluxCD HelmRelease
+      # @section -- Commons helm release
       test: {}
+      # -- upgrade of FluxCD HelmRelease
+      # @section -- Commons helm release
       upgrade: {}
+      # -- driftDetection of FluxCD HelmRelease
+      # @section -- Commons helm release
       driftDetection: {}
 
-  grafana:
-    datasource:
-      labels:
-        grafana_datasource: "1"
-    dashboards:
-      labels:
-        grafana_dashboard: "1"
-
   prometheus:
     monitor:
+      # -- labels on Pod- and Service-Monitor
+      # @section -- Commons Monitoring
       labels: {}
     rules:
+      # -- labels on PrometheusRules
+      # @section -- Commons Monitoring
       labels: {}
 
+  grafana:
+    datasource:
+      # -- labels of grafana datasource configmap and secret
+      # @section -- Commons Monitoring
+      labels:
+        grafana_datasource: "1"
+    dashboards:
+      # -- labels of grafana dashboard configmap
+      # @section -- Commons Monitoring
+      labels:
+        grafana_dashboard: "1"
+
 grafana:
   dashboards:
+    # -- annotations of grafana dashboard configmap
     annotations: {}
 
 fluentd:
diff --git a/infra-monitoring/README.adoc b/infra-monitoring/README.adoc
index dce58f2..4d21326 100644
--- a/infra-monitoring/README.adoc
+++ b/infra-monitoring/README.adoc
@@ -17,7 +17,76 @@ image::https://img.shields.io/badge/Version-application-informational?style=flat
 
 == Values
 
-.Values
+.Values Commons helm release
+|===
+| Key | Type | Default | Description
+
+| commons.helm.release.driftDetection
+| object
+| `{}`
+| driftDetection of FluxCD HelmRelease
+
+| commons.helm.release.install
+| object
+| `{}`
+| install of FluxCD HelmRelease
+
+| commons.helm.release.test
+| object
+| `{}`
+| test of FluxCD HelmRelease
+
+| commons.helm.release.upgrade
+| object
+| `{}`
+| upgrade of FluxCD HelmRelease
+|===
+
+.Values Commons Ingress
+|===
+| Key | Type | Default | Description
+
+| commons.ingress.annotations
+| object
+| `{"cert-manager.io/cluster-issuer":"letsencrypt-prod"}`
+| annotations for all ingress objects
+
+| commons.ingress.domain
+| string
+| `"wrenix.eu"`
+| top domain for all services
+
+| commons.ingress.tls.enabled
+| bool
+| `false`
+| tls on every ingress
+
+| commons.ingress.tls.override
+| string
+| `nil`
+| use own definition of tls (e.g. for own or wildcard certificate)
+|===
+
+.Values Commons
+|===
+| Key | Type | Default | Description
+
+| commons.masterPassword
+| string
+| `"CHANGEME"`
+| masterPassword to generate secrets
+|===
+
+.Values Commons Monitoring
+|===
+| Key | Type | Default | Description
+
+| commons.prometheus.monitor.labels
+| object
+| `{}`
+| labels on Pod- and Service-Monitor
+|===
+.Values Other Values
 |===
 | Key | Type | Default | Description
 
@@ -128,7 +197,7 @@ image::https://img.shields.io/badge/Version-application-informational?style=flat
 
 | commons.auth.authentik.backend
 | string
-| `"authentik"`
+| `"authentik-server"`
 |
 
 | commons.auth.authentik.domain
@@ -151,56 +220,6 @@ image::https://img.shields.io/badge/Version-application-informational?style=flat
 | `"authentik"`
 |
 
-| commons.helm.release.driftDetection
-| object
-| `{}`
-|
-
-| commons.helm.release.install
-| object
-| `{}`
-|
-
-| commons.helm.release.test
-| object
-| `{}`
-|
-
-| commons.helm.release.upgrade
-| object
-| `{}`
-|
-
-| commons.ingress.annotations."cert-manager.io/cluster-issuer"
-| string
-| `"letsencrypt-prod"`
-|
-
-| commons.ingress.domain
-| string
-| `"wrenix.eu"`
-|
-
-| commons.ingress.tls.enabled
-| bool
-| `false`
-| tls on every ingress
-
-| commons.ingress.tls.override
-| string
-| `nil`
-| use own definition of tls (e.g. for own or wildcard certificate)
-
-| commons.masterPassword
-| string
-| `"CHANGEME"`
-|
-
-| commons.prometheus.monitor.labels
-| object
-| `{}`
-|
-
 | grafana.adminPassword
 | string
 | `nil`
diff --git a/infra-monitoring/values.yaml b/infra-monitoring/values.yaml
index 8c56b8b..833fb6f 100644
--- a/infra-monitoring/values.yaml
+++ b/infra-monitoring/values.yaml
@@ -3,6 +3,8 @@ init:
   namespace: "bases"
 
 commons:
+  # -- masterPassword to generate secrets
+  # @section -- Commons
   masterPassword: "CHANGEME"
 
   auth:
@@ -15,23 +17,39 @@ commons:
 
   helm:
     release:
+      # -- install of FluxCD HelmRelease
+      # @section -- Commons helm release
       install: {}
+      # -- test of FluxCD HelmRelease
+      # @section -- Commons helm release
       test: {}
+      # -- upgrade of FluxCD HelmRelease
+      # @section -- Commons helm release
       upgrade: {}
+      # -- driftDetection of FluxCD HelmRelease
+      # @section -- Commons helm release
       driftDetection: {}
 
   ingress:
+    # -- top domain for all services
+    # @section -- Commons Ingress
     domain: "wrenix.eu"
+    # -- annotations for all ingress objects
+    # @section -- Commons Ingress
     annotations:
       cert-manager.io/cluster-issuer: letsencrypt-prod
     tls:
       # -- tls on every ingress
+      # @section -- Commons Ingress
       enabled: false
       # -- use own definition of tls (e.g. for own or wildcard certificate)
+      # @section -- Commons Ingress
       override:
 
   prometheus:
     monitor:
+      # -- labels on Pod- and Service-Monitor
+      # @section -- Commons Monitoring
       labels: {}
 
 alertmanager:
diff --git a/infra-trivy/README.adoc b/infra-trivy/README.adoc
index e74c731..0e03771 100644
--- a/infra-trivy/README.adoc
+++ b/infra-trivy/README.adoc
@@ -17,54 +17,63 @@ image::https://img.shields.io/badge/Version-application-informational?style=flat
 
 == Values
 
-.Values
+.Values Commons Monitoring
 |===
 | Key | Type | Default | Description
 
-| commons.grafana.dashboards.labels.grafana_dashboard
-| string
-| `"1"`
-|
-
-| commons.helm.release.driftDetection
+| commons.grafana.dashboards.labels
 | object
-| `{}`
-|
-
-| commons.helm.release.install
-| object
-| `{}`
-|
-
-| commons.helm.release.test
-| object
-| `{}`
-|
-
-| commons.helm.release.upgrade
-| object
-| `{}`
-|
+| `{"grafana_dashboard":"1"}`
+| labels of grafana dashboard configmap
 
 | commons.prometheus.alertmanager.labels
 | object
 | `{}`
-|
+| labels on AlertmanagerConf
 
 | commons.prometheus.monitor.labels
 | object
 | `{}`
-|
+| labels on Pod- and Service-Monitor
 
 | commons.prometheus.rules.labels
 | object
 | `{}`
-|
+| labels on PrometheusRules
+|===
+
+.Values Commons helm release
+|===
+| Key | Type | Default | Description
+
+| commons.helm.release.driftDetection
+| object
+| `{}`
+| driftDetection of FluxCD HelmRelease
+
+| commons.helm.release.install
+| object
+| `{}`
+| install of FluxCD HelmRelease
+
+| commons.helm.release.test
+| object
+| `{}`
+| test of FluxCD HelmRelease
+
+| commons.helm.release.upgrade
+| object
+| `{}`
+| upgrade of FluxCD HelmRelease
+|===
+.Values Other Values
+|===
+| Key | Type | Default | Description
 
 | grafana.dashboards.annotations
 | object
 | `{}`
-|
+| annotations of grafana dashboard configmap
 
 | init.namespace
 | string
diff --git a/infra-trivy/values.yaml b/infra-trivy/values.yaml
index 9657ac9..1ee4c6c 100644
--- a/infra-trivy/values.yaml
+++ b/infra-trivy/values.yaml
@@ -5,26 +5,43 @@ init:
 commons:
   helm:
     release:
+      # -- install of FluxCD HelmRelease
+      # @section -- Commons helm release
       install: {}
+      # -- test of FluxCD HelmRelease
+      # @section -- Commons helm release
       test: {}
+      # -- upgrade of FluxCD HelmRelease
+      # @section -- Commons helm release
       upgrade: {}
+      # -- driftDetection of FluxCD HelmRelease
+      # @section -- Commons helm release
       driftDetection: {}
 
   prometheus:
     alertmanager:
+      # -- labels on AlertmanagerConf
+      # @section -- Commons Monitoring
       labels: {}
     monitor:
+      # -- labels on Pod- and Service-Monitor
+      # @section -- Commons Monitoring
       labels: {}
     rules:
+      # -- labels on PrometheusRules
+      # @section -- Commons Monitoring
       labels: {}
 
   grafana:
     dashboards:
+      # -- labels of grafana dashboard configmap
+      # @section -- Commons Monitoring
       labels:
         grafana_dashboard: "1"
 
 grafana:
   dashboards:
+    # -- annotations of grafana dashboard configmap
     annotations: {}
 
 
diff --git a/mycloud-authentik/README.adoc b/mycloud-authentik/README.adoc
index 55cd875..e4b6ac9 100644
--- a/mycloud-authentik/README.adoc
+++ b/mycloud-authentik/README.adoc
@@ -17,39 +17,44 @@ image::https://img.shields.io/badge/Version-application-informational?style=flat
 
 == Values
 
-.Values
+.Values Commons helm release
 |===
 | Key | Type | Default | Description
 
 | commons.helm.release.driftDetection
 | object
 | `{}`
-|
+| driftDetection of FluxCD HelmRelease
 
 | commons.helm.release.install
 | object
 | `{}`
-|
+| install of FluxCD HelmRelease
 
 | commons.helm.release.test
 | object
 | `{}`
-|
+| test of FluxCD HelmRelease
 
 | commons.helm.release.upgrade
 | object
 | `{}`
-|
+| upgrade of FluxCD HelmRelease
+|===
 
-| commons.ingress.annotations."cert-manager.io/cluster-issuer"
-| string
-| `"letsencrypt-prod"`
-|
+.Values Commons Ingress
+|===
+| Key | Type | Default | Description
+
+| commons.ingress.annotations
+| object
+| `{"cert-manager.io/cluster-issuer":"letsencrypt-prod"}`
+| annotations for all ingress objects
 
 | commons.ingress.domain
 | string
 | `"wrenix.eu"`
-|
+| top domain for all services
 
 | commons.ingress.tls.enabled
 | bool
@@ -60,66 +65,100 @@ image::https://img.shields.io/badge/Version-application-informational?style=flat
 | string
 | `nil`
 | use own definition of tls (e.g. for own or wildcard certificate)
+|===
+
+.Values Commons mail
+|===
+| Key | Type | Default | Description
 
 | commons.mail.from
 | string
 | `nil`
-|
+| send from address
 
 | commons.mail.host
 | string
 | `nil`
-|
+| smtp server
 
 | commons.mail.password
 | string
 | `nil`
-|
+| smtp password
 
 | commons.mail.use_ssl
 | bool
 | `false`
-|
+| smtp server use ssl
 
 | commons.mail.use_tls
 | bool
 | `false`
-|
+| smtp server use start tls
 
 | commons.mail.username
 | string
 | `nil`
-|
+| smtp username
+|===
+
+.Values Commons
+|===
+| Key | Type | Default | Description
 
 | commons.masterPassword
 | string
 | `"CHANGEME"`
-|
+| masterPassword to generate secrets
+|===
+
+.Values Commons Monitoring
+|===
+| Key | Type | Default | Description
 
 | commons.prometheus.monitor.labels
 | object
 | `{}`
-|
+| labels on Pod- and Service-Monitor
 
 | commons.prometheus.rules.labels
 | object
 | `{}`
-|
+| labels on PrometheusRules
+|===
+
+.Values Commons Redis
+|===
+| Key | Type | Default | Description
+
+| commons.redis.replicas
+| int
+| `0`
+| replicas
+|===
+
+.Values Commons theme
+|===
+| Key | Type | Default | Description
 
 | commons.theme.favicon
 | string
 | `"/static/dist/assets/icons/icon.png"`
-|
+| favicon everywhere
 
 | commons.theme.logo
 | string
 | `"/static/dist/assets/icons/icon_left_brand.svg"`
-|
+| logo everywhere
 
 | commons.theme.title
 | string
 | `"myCloud"`
-|
+| title everywhere
+|===
+.Values Other Values
+|===
+| Key | Type | Default | Description
 
 | database.host
 | string
diff --git a/mycloud-authentik/values.yaml b/mycloud-authentik/values.yaml
index 7deec47..07f2af0 100644
--- a/mycloud-authentik/values.yaml
+++ b/mycloud-authentik/values.yaml
@@ -3,44 +3,84 @@ init:
   namespace: "bases"
 
 commons:
+  # -- masterPassword to generate secrets
+  # @section -- Commons
   masterPassword: "CHANGEME"
   theme:
+    # -- title everywhere
+    # @section -- Commons theme
     title: myCloud
+    # -- logo everywhere
+    # @section -- Commons theme
     logo: /static/dist/assets/icons/icon_left_brand.svg
+    # -- favicon everywhere
+    # @section -- Commons theme
     favicon: /static/dist/assets/icons/icon.png
 
   mail:
+    # -- smtp server
+    # @section -- Commons mail
     host:
+    # -- smtp username
+    # @section -- Commons mail
     username:
+    # -- smtp password
+    # @section -- Commons mail
     password:
+    # -- send from address
+    # @section -- Commons mail
     from:
+    # -- smtp server use start tls
+    # @section -- Commons mail
     use_tls: false
+    # -- smtp server use ssl
+    # @section -- Commons mail
     use_ssl: false
 
   helm:
     release:
+      # -- install of FluxCD HelmRelease
+      # @section -- Commons helm release
       install: {}
+      # -- test of FluxCD HelmRelease
+      # @section -- Commons helm release
       test: {}
+      # -- upgrade of FluxCD HelmRelease
+      # @section -- Commons helm release
       upgrade: {}
+      # -- driftDetection of FluxCD HelmRelease
+      # @section -- Commons helm release
       driftDetection: {}
 
   ingress:
+    # -- top domain for all services
+    # @section -- Commons Ingress
     domain: "wrenix.eu"
+    # -- annotations for all ingress objects
+    # @section -- Commons Ingress
     annotations:
       cert-manager.io/cluster-issuer: letsencrypt-prod
     tls:
       # -- tls on every ingress
+      # @section -- Commons Ingress
       enabled: true
       # -- use own definition of tls (e.g. for own or wildcard certificate)
+      # @section -- Commons Ingress
       override:
 
   prometheus:
     monitor:
+      # -- labels on Pod- and Service-Monitor
+      # @section -- Commons Monitoring
       labels: {}
     rules:
+      # -- labels on PrometheusRules
+      # @section -- Commons Monitoring
       labels: {}
 
   redis:
+    # -- replicas
+    # @section -- Commons Redis
     replicas: 0
 
 # -- generated by .Values.commons.masterPassword
diff --git a/mycloud-collabora/README.adoc b/mycloud-collabora/README.adoc
index 940309e..da954b9 100644
--- a/mycloud-collabora/README.adoc
+++ b/mycloud-collabora/README.adoc
@@ -17,7 +17,91 @@ image::https://img.shields.io/badge/Version-application-informational?style=flat
 
 == Values
 
-.Values
+.Values Commons Monitoring
+|===
+| Key | Type | Default | Description
+
+| commons.grafana.dashboards.annotations
+| object
+| `{}`
+| annotations of grafana dashboard configmap
+
+| commons.grafana.dashboards.labels
+| object
+| `{}`
+| labels of grafana dashboard configmap
+
+| commons.prometheus.monitor.labels
+| object
+| `{}`
+| labels on Pod- and Service-Monitor
+
+| commons.prometheus.rules.labels
+| object
+| `{}`
+| labels on PrometheusRules
+|===
+
+.Values Commons helm release
+|===
+| Key | Type | Default | Description
+
+| commons.helm.release.driftDetection
+| object
+| `{}`
+| driftDetection of FluxCD HelmRelease
+
+| commons.helm.release.install
+| object
+| `{}`
+| install of FluxCD HelmRelease
+
+| commons.helm.release.test
+| object
+| `{}`
+| test of FluxCD HelmRelease
+
+| commons.helm.release.upgrade
+| object
+| `{}`
+| upgrade of FluxCD HelmRelease
+|===
+
+.Values Commons Ingress
+|===
+| Key | Type | Default | Description
+
+| commons.ingress.annotations
+| object
+| `{"cert-manager.io/cluster-issuer":"letsencrypt-prod"}`
+| annotations for all ingress objects
+
+| commons.ingress.domain
+| string
+| `"wrenix.eu"`
+| top domain for all services
+
+| commons.ingress.tls.enabled
+| bool
+| `true`
+| tls on every ingress
+
+| commons.ingress.tls.override
+| string
+| `nil`
+| use own definition of tls (e.g. for own or wildcard certificate)
+|===
+
+.Values Commons
+|===
+| Key | Type | Default | Description
+
+| commons.masterPassword
+| string
+| `"CHANGEME"`
+| masterPassword to generate secrets
+|===
+.Values Other Values
 |===
 | Key | Type | Default | Description
 
@@ -31,71 +115,6 @@ image::https://img.shields.io/badge/Version-application-informational?style=flat
 | `{}`
 | allowed host to use this collabora instance if not set we allow defaults (like nextcloud) example:  main.host.de: [ "alias1.host.de", "alias2.host.de" ]
 
-| commons.grafana.dashboards.annotations
-| object
-| `{}`
-|
-
-| commons.grafana.dashboards.labels
-| object
-| `{}`
-|
-
-| commons.helm.release.driftDetection
-| object
-| `{}`
-|
-
-| commons.helm.release.install
-| object
-| `{}`
-|
-
-| commons.helm.release.test
-| object
-| `{}`
-|
-
-| commons.helm.release.upgrade
-| object
-| `{}`
-|
-
-| commons.ingress.annotations."cert-manager.io/cluster-issuer"
-| string
-| `"letsencrypt-prod"`
-|
-
-| commons.ingress.domain
-| string
-| `"wrenix.eu"`
-|
-
-| commons.ingress.tls.enabled
-| bool
-| `true`
-| tls on every ingress
-
-| commons.ingress.tls.override
-| string
-| `nil`
-| use own definition of tls (e.g. for own or wildcard certificate)
-
-| commons.masterPassword
-| string
-| `"CHANGEME"`
-|
-
-| commons.prometheus.monitor.labels
-| object
-| `{}`
-|
-
-| commons.prometheus.rules.labels
-| object
-| `{}`
-|
-
 | ingress.annotations
 | object
 | `{"haproxy-ingress.github.io/assign-backend-server-id":"true","haproxy-ingress.github.io/balance-algorithm":"url_param WOPISrc","haproxy-ingress.github.io/config-backend":"hash-type consistent acl admin_url path_beg /cool/getMetrics acl admin_url path_beg /cool/adminws/ acl admin_url path_beg /browser/dist/admin/admin.html http-request deny if admin_url","haproxy-ingress.github.io/timeout-tunnel":"3600s","nginx.ingress.kubernetes.io/server-snippet":"location /cool/getMetrics { deny all; return 403; }\nlocation /cool/adminws/ { deny all; return 403; }\nlocation /browser/dist/admin/admin.html { deny all; return 403; }\n","nginx.ingress.kubernetes.io/upstream-hash-by":"$arg_WOPISrc"}`
diff --git a/mycloud-collabora/values.yaml b/mycloud-collabora/values.yaml
index e38de87..7981211 100644
--- a/mycloud-collabora/values.yaml
+++ b/mycloud-collabora/values.yaml
@@ -3,33 +3,58 @@ init:
   namespace: "bases"
 
 commons:
+  # -- masterPassword to generate secrets
+  # @section -- Commons
   masterPassword: "CHANGEME"
 
   helm:
     release:
+      # -- install of FluxCD HelmRelease
+      # @section -- Commons helm release
       install: {}
+      # -- test of FluxCD HelmRelease
+      # @section -- Commons helm release
       test: {}
+      # -- upgrade of FluxCD HelmRelease
+      # @section -- Commons helm release
       upgrade: {}
+      # -- driftDetection of FluxCD HelmRelease
+      # @section -- Commons helm release
       driftDetection: {}
 
   ingress:
+    # -- top domain for all services
+    # @section -- Commons Ingress
     domain: "wrenix.eu"
+    # -- annotations for all ingress objects
+    # @section -- Commons Ingress
     annotations:
       cert-manager.io/cluster-issuer: letsencrypt-prod
     tls:
       # -- tls on every ingress
+      # @section -- Commons Ingress
       enabled: true
       # -- use own definition of tls (e.g. for own or wildcard certificate)
+      # @section -- Commons Ingress
       override:
 
   prometheus:
     monitor:
+      # -- labels on Pod- and Service-Monitor
+      # @section -- Commons Monitoring
       labels: {}
     rules:
+      # -- labels on PrometheusRules
+      # @section -- Commons Monitoring
       labels: {}
+
   grafana:
     dashboards:
+      # -- labels of grafana dashboard configmap
+      # @section -- Commons Monitoring
       labels: {}
+      # -- annotations of grafana dashboard configmap
+      # @section -- Commons Monitoring
       annotations: {}
 
 
diff --git a/mycloud-gotosocial/README.adoc b/mycloud-gotosocial/README.adoc
index 4f529e1..5d629e8 100644
--- a/mycloud-gotosocial/README.adoc
+++ b/mycloud-gotosocial/README.adoc
@@ -17,7 +17,161 @@ image::https://img.shields.io/badge/Version-application-informational?style=flat
 
 == Values
 
-.Values
+.Values Commons
+|===
+| Key | Type | Default | Description
+
+| commons.auth.host
+| string
+| `nil`
+| default auth.(.Values.commons.ingress.domain)
+
+| commons.masterPassword
+| string
+| `"CHANGEME"`
+| masterPassword to generate secrets
+|===
+
+.Values Commons helm release
+|===
+| Key | Type | Default | Description
+
+| commons.helm.release.driftDetection
+| object
+| `{}`
+| driftDetection of FluxCD HelmRelease
+
+| commons.helm.release.install
+| object
+| `{}`
+| install of FluxCD HelmRelease
+
+| commons.helm.release.test
+| object
+| `{}`
+| test of FluxCD HelmRelease
+
+| commons.helm.release.upgrade
+| object
+| `{}`
+| upgrade of FluxCD HelmRelease
+|===
+
+.Values Commons Ingress
+|===
+| Key | Type | Default | Description
+
+| commons.ingress.annotations
+| object
+| `{"cert-manager.io/cluster-issuer":"letsencrypt-prod"}`
+| annotations for all ingress objects
+
+| commons.ingress.domain
+| string
+| `"wrenix.eu"`
+| top domain for all services
+
+| commons.ingress.tls.enabled
+| bool
+| `true`
+| tls on every ingress
+
+| commons.ingress.tls.override
+| string
+| `nil`
+| use own definition of tls (e.g. for own or wildcard certificate)
+|===
+
+.Values Commons mail
+|===
+| Key | Type | Default | Description
+
+| commons.mail.from
+| string
+| `nil`
+| send from address
+
+| commons.mail.host
+| string
+| `nil`
+| smtp server
+
+| commons.mail.password
+| string
+| `nil`
+| smtp password
+
+| commons.mail.use_ssl
+| bool
+| `false`
+| smtp server use ssl
+
+| commons.mail.use_tls
+| bool
+| `false`
+| smtp server use start tls
+
+| commons.mail.username
+| string
+| `nil`
+| smtp username
+|===
+
+.Values Commons Persistence
+|===
+| Key | Type | Default | Description
+
+| commons.persistence.hostPath.enabled
+| bool
+| `false`
+| use hostPath instatt of PVC
+
+| commons.persistence.hostPath.prefix
+| string
+| `"/var/lib/mycloud"`
+| use hostPath under the following path
+
+| commons.persistence.storageClass
+| string
+| `nil`
+| storageClass of PVC
+|===
+
+.Values Commons Monitoring
+|===
+| Key | Type | Default | Description
+
+| commons.prometheus.monitor.labels
+| object
+| `{}`
+| labels on Pod- and Service-Monitor
+
+| commons.prometheus.rules.labels
+| object
+| `{}`
+| labels on PrometheusRules
+|===
+
+.Values Commons theme
+|===
+| Key | Type | Default | Description
+
+| commons.theme.favicon
+| string
+| `"/static/dist/assets/icons/icon.png"`
+| favicon everywhere
+
+| commons.theme.logo
+| string
+| `"/static/dist/assets/icons/icon_left_brand.svg"`
+| logo everywhere
+
+| commons.theme.title
+| string
+| `"myCloud"`
+| title everywhere
+|===
+.Values Other Values
 |===
 | Key | Type | Default | Description
 
@@ -31,126 +185,6 @@ image::https://img.shields.io/badge/Version-application-informational?style=flat
 | `nil`
 | generated by .Values.commons.masterPassword
 
-| commons.auth.host
-| string
-| `nil`
-| default auth.(.Values.commons.ingress.domain)
-
-| commons.helm.release.driftDetection
-| object
-| `{}`
-|
-
-| commons.helm.release.install
-| object
-| `{}`
-|
-
-| commons.helm.release.test
-| object
-| `{}`
-|
-
-| commons.helm.release.upgrade
-| object
-| `{}`
-|
-
-| commons.ingress.annotations."cert-manager.io/cluster-issuer"
-| string
-| `"letsencrypt-prod"`
-|
-
-| commons.ingress.domain
-| string
-| `"wrenix.eu"`
-|
-
-| commons.ingress.tls.enabled
-| bool
-| `true`
-| tls on every ingress
-
-| commons.ingress.tls.override
-| string
-| `nil`
-| use own definition of tls (e.g. for own or wildcard certificate)
-
-| commons.mail.from
-| string
-| `nil`
-|
-
-| commons.mail.host
-| string
-| `nil`
-|
-
-| commons.mail.password
-| string
-| `nil`
-|
-
-| commons.mail.use_ssl
-| bool
-| `false`
-|
-
-| commons.mail.use_tls
-| bool
-| `false`
-|
-
-| commons.mail.username
-| string
-| `nil`
-|
-
-| commons.masterPassword
-| string
-| `"CHANGEME"`
-|
-
-| commons.persistence.hostPath.enabled
-| bool
-| `false`
-|
-
-| commons.persistence.hostPath.prefix
-| string
-| `"/var/lib/mycloud"`
-|
-
-| commons.persistence.storageClass
-| string
-| `nil`
-|
-
-| commons.prometheus.monitor.labels
-| object
-| `{}`
-|
-
-| commons.prometheus.rules.labels
-| object
-| `{}`
-|
-
-| commons.theme.favicon
-| string
-| `"/static/dist/assets/icons/icon.png"`
-|
-
-| commons.theme.logo
-| string
-| `"/static/dist/assets/icons/icon_left_brand.svg"`
-|
-
-| commons.theme.title
-| string
-| `"myCloud"`
-|
-
 | database.host
 | string
 | `"mycloud-services-postgresql"`
diff --git a/mycloud-gotosocial/values.yaml b/mycloud-gotosocial/values.yaml
index ba3f31f..b976356 100644
--- a/mycloud-gotosocial/values.yaml
+++ b/mycloud-gotosocial/values.yaml
@@ -3,52 +3,97 @@ init:
   namespace: "bases"
 
 commons:
+  # -- masterPassword to generate secrets
+  # @section -- Commons
   masterPassword: "CHANGEME"
 
   auth:
     # -- default auth.(.Values.commons.ingress.domain)
+    # @section -- Commons
     host:
 
   theme:
+    # -- title everywhere
+    # @section -- Commons theme
     title: myCloud
+    # -- logo everywhere
+    # @section -- Commons theme
     logo: /static/dist/assets/icons/icon_left_brand.svg
+    # -- favicon everywhere
+    # @section -- Commons theme
     favicon: /static/dist/assets/icons/icon.png
 
   mail:
+    # -- smtp server
+    # @section -- Commons mail
     host:
+    # -- smtp username
+    # @section -- Commons mail
     username:
+    # -- smtp password
+    # @section -- Commons mail
     password:
+    # -- send from address
+    # @section -- Commons mail
     from:
+    # -- smtp server use start tls
+    # @section -- Commons mail
     use_tls: false
+    # -- smtp server use ssl
+    # @section -- Commons mail
     use_ssl: false
 
   persistence:
+    # -- storageClass of PVC
+    # @section -- Commons Persistence
     storageClass:
     hostPath:
+      # -- use hostPath instatt of PVC
+      # @section -- Commons Persistence
       enabled: false
+      # -- use hostPath under the following path
+      # @section -- Commons Persistence
       prefix: "/var/lib/mycloud"
 
   helm:
     release:
+      # -- install of FluxCD HelmRelease
+      # @section -- Commons helm release
       install: {}
+      # -- test of FluxCD HelmRelease
+      # @section -- Commons helm release
       test: {}
+      # -- upgrade of FluxCD HelmRelease
+      # @section -- Commons helm release
       upgrade: {}
+      # -- driftDetection of FluxCD HelmRelease
+      # @section -- Commons helm release
       driftDetection: {}
 
   ingress:
+    # -- top domain for all services
+    # @section -- Commons Ingress
     domain: "wrenix.eu"
+    # -- annotations for all ingress objects
+    # @section -- Commons Ingress
     annotations:
       cert-manager.io/cluster-issuer: letsencrypt-prod
     tls:
       # -- tls on every ingress
+      # @section -- Commons Ingress
       enabled: true
       # -- use own definition of tls (e.g. for own or wildcard certificate)
+      # @section -- Commons Ingress
       override:
 
   prometheus:
     monitor:
+      # -- labels on Pod- and Service-Monitor
+      # @section -- Commons Monitoring
       labels: {}
     rules:
+      # -- labels on PrometheusRules
+      # @section -- Commons Monitoring
       labels: {}
 
 auth:
diff --git a/mycloud-matrix/README.adoc b/mycloud-matrix/README.adoc
index 354308c..60e6259 100644
--- a/mycloud-matrix/README.adoc
+++ b/mycloud-matrix/README.adoc
@@ -17,7 +17,7 @@ image::https://img.shields.io/badge/Version-application-informational?style=flat
 
 == Values
 
-.Values
+.Values Commons
 |===
 | Key | Type | Default | Description
 
@@ -26,35 +26,75 @@ image::https://img.shields.io/badge/Version-application-informational?style=flat
 | `nil`
 | default auth.(.Values.commons.ingress.domain)
 
+| commons.masterPassword
+| string
+| `"CHANGEME"`
+| masterPassword to generate secrets
+|===
+
+.Values Commons Monitoring
+|===
+| Key | Type | Default | Description
+
+| commons.grafana.dashboards.annotations
+| string
+| `nil`
+| annotations of grafana dashboard configmap
+
+| commons.grafana.dashboards.labels
+| object
+| `{"grafana_dashboard":"1"}`
+| labels of grafana dashboard configmap
+
+| commons.prometheus.monitor.labels
+| object
+| `{}`
+| labels on Pod- and Service-Monitor
+
+| commons.prometheus.rules.labels
+| object
+| `{}`
+| labels on PrometheusRules
+|===
+
+.Values Commons helm release
+|===
+| Key | Type | Default | Description
+
 | commons.helm.release.driftDetection
 | object
 | `{}`
-|
+| driftDetection of FluxCD HelmRelease
 
 | commons.helm.release.install
 | object
 | `{}`
-|
+| install of FluxCD HelmRelease
 
 | commons.helm.release.test
 | object
 | `{}`
-|
+| test of FluxCD HelmRelease
 
 | commons.helm.release.upgrade
 | object
 | `{}`
-|
+| upgrade of FluxCD HelmRelease
+|===
 
-| commons.ingress.annotations."cert-manager.io/cluster-issuer"
-| string
-| `"letsencrypt-prod"`
-|
+.Values Commons Ingress
+|===
+| Key | Type | Default | Description
+
+| commons.ingress.annotations
+| object
+| `{"cert-manager.io/cluster-issuer":"letsencrypt-prod"}`
+| annotations for all ingress objects
 
 | commons.ingress.domain
 | string
 | `"wrenix.eu"`
-|
+| top domain for all services
 
 | commons.ingress.tls.enabled
 | bool
@@ -65,86 +105,140 @@ image::https://img.shields.io/badge/Version-application-informational?style=flat
 | string
 | `nil`
 | use own definition of tls (e.g. for own or wildcard certificate)
+|===
+
+.Values Commons mail
+|===
+| Key | Type | Default | Description
 
 | commons.mail.from
 | string
 | `nil`
-|
+| send from address
 
 | commons.mail.host
 | string
 | `nil`
-|
+| smtp server
 
 | commons.mail.password
 | string
 | `nil`
-|
+| smtp password
 
 | commons.mail.use_ssl
 | bool
 | `false`
-|
+| smtp server use ssl
 
 | commons.mail.use_tls
 | bool
 | `false`
-|
+| smtp server use start tls
 
 | commons.mail.username
 | string
 | `nil`
-|
+| smtp username
+|===
 
-| commons.masterPassword
-| string
-| `"CHANGEME"`
-|
+.Values Commons Persistence
+|===
+| Key | Type | Default | Description
 
 | commons.persistence.hostPath.enabled
 | bool
 | `false`
-|
+| use hostPath instatt of PVC
 
 | commons.persistence.hostPath.prefix
 | string
 | `"/var/lib/mycloud"`
-|
+| use hostPath under the following path
 
 | commons.persistence.storageClass
 | string
 | `nil`
-|
+| storageClass of PVC
+|===
 
-| commons.prometheus.monitor.labels
-| object
-| `{}`
-|
-
-| commons.prometheus.rules.labels
-| object
-| `{}`
-|
+.Values Commons theme
+|===
+| Key | Type | Default | Description
 
 | commons.theme.favicon
 | string
 | `"/static/dist/assets/icons/icon.png"`
-|
+| favicon everywhere
 
 | commons.theme.logo
 | string
 | `"/static/dist/assets/icons/icon_left_brand.svg"`
-|
+| logo everywhere
 
 | commons.theme.title
 | string
 | `"myCloud"`
+| title everywhere
+|===
+.Values Other Values
+|===
+| Key | Type | Default | Description
+
+| bridge.signal.admins
+| list
+| `[]`
+|
+
+| bridge.signal.enabled
+| bool
+| `false`
+|
+
+| databases.authenticationService.host
+| string
+| `"mycloud-services-postgresql"`
+| default is from mycloud-services
+
+| databases.authenticationService.name
+| string
+| `"matrix-authentication-service"`
+|
+
+| databases.authenticationService.password
+| string
+| `nil`
+| generated by .commons.masterPassword (equal to mycloud-services)
+
+| databases.authenticationService.username
+| string
+| `"matrix-authentication-service"`
+|
+
+| databases.bridge.signal.host
+| string
+| `"mycloud-services-postgresql"`
+| default is from mycloud-services
+
+| databases.bridge.signal.name
+| string
+| `"matrix-bridge-signal"`
+|
+
+| databases.bridge.signal.password
+| string
+| `nil`
+| generated by .commons.masterPassword (equal to mycloud-services)
+
+| databases.bridge.signal.username
+| string
+| `"matrix-bridge-signal"`
 |
 
 | databases.server.host
 | string
 | `"mycloud-services-postgresql"`
-| default is from mysql-services
+| default is from mycloud-services
 
 | databases.server.name
 | string
@@ -161,6 +255,36 @@ image::https://img.shields.io/badge/Version-application-informational?style=flat
 | `"matrix-synapse"`
 |
 
+| databases.slidingSync.host
+| string
+| `"mycloud-services-postgresql"`
+| default is from mycloud-services
+
+| databases.slidingSync.name
+| string
+| `"matrix-sliding-sync"`
+|
+
+| databases.slidingSync.password
+| string
+| `nil`
+| generated by .commons.masterPassword (equal to mycloud-services)
+
+| databases.slidingSync.username
+| string
+| `"matrix-sliding-sync"`
+|
+
+| ingress.authenticationService.annotations
+| string
+| `nil`
+|
+
+| ingress.authenticationService.host
+| string
+| `nil`
+| default: auth.matrix.(.commons.ingress.domain)
+
 | ingress.element.annotations
 | string
 | `nil`
@@ -201,6 +325,16 @@ image::https://img.shields.io/badge/Version-application-informational?style=flat
 | `nil`
 | default: matrix.(.commons.ingress.domain)
 
+| ingress.slidingSync.annotations
+| string
+| `nil`
+|
+
+| ingress.slidingSync.host
+| string
+| `nil`
+| default: sliding.matrix.(.commons.ingress.domain)
+
 | init.namespace
 | string
 | `"bases"`
@@ -231,6 +365,21 @@ image::https://img.shields.io/badge/Version-application-informational?style=flat
 | `nil`
 | generated by .commons.masterPassword
 
+| server.auth.webClient
+| string
+| `nil`
+| default: element.(.commons.ingress.domain)
+
+| server.authenticationService.admins
+| list
+| `[]`
+|
+
+| server.authenticationService.enabled
+| bool
+| `false`
+|
+
 | server.host
 | string
 | `nil`
@@ -246,6 +395,16 @@ image::https://img.shields.io/badge/Version-application-informational?style=flat
 | `nil`
 | default .commons.mail.host
 
+| server.scaling
+| bool
+| `false`
+|
+
+| server.slidingSync.enabled
+| bool
+| `false`
+|
+
 | server.software
 | string
 | `"synapse"`
diff --git a/mycloud-matrix/values.yaml b/mycloud-matrix/values.yaml
index ac335ff..0dcfa0a 100644
--- a/mycloud-matrix/values.yaml
+++ b/mycloud-matrix/values.yaml
@@ -3,58 +3,107 @@ init:
   namespace: "bases"
 
 commons:
+  # -- masterPassword to generate secrets
+  # @section -- Commons
   masterPassword: "CHANGEME"
 
   auth:
     # -- default auth.(.Values.commons.ingress.domain)
+    # @section -- Commons
     host:
 
   theme:
+    # -- title everywhere
+    # @section -- Commons theme
     title: myCloud
+    # -- logo everywhere
+    # @section -- Commons theme
     logo: /static/dist/assets/icons/icon_left_brand.svg
+    # -- favicon everywhere
+    # @section -- Commons theme
     favicon: /static/dist/assets/icons/icon.png
 
   mail:
+    # -- smtp server
+    # @section -- Commons mail
     host:
+    # -- smtp username
+    # @section -- Commons mail
     username:
+    # -- smtp password
+    # @section -- Commons mail
     password:
+    # -- send from address
+    # @section -- Commons mail
     from:
+    # -- smtp server use start tls
+    # @section -- Commons mail
     use_tls: false
+    # -- smtp server use ssl
+    # @section -- Commons mail
     use_ssl: false
 
   persistence:
+    # -- storageClass of PVC
+    # @section -- Commons Persistence
     storageClass:
     hostPath:
+      # -- use hostPath instatt of PVC
+      # @section -- Commons Persistence
       enabled: false
+      # -- use hostPath under the following path
+      # @section -- Commons Persistence
       prefix: "/var/lib/mycloud"
 
   helm:
     release:
+       # -- install of FluxCD HelmRelease
+      # @section -- Commons helm release
       install: {}
+      # -- test of FluxCD HelmRelease
+      # @section -- Commons helm release
       test: {}
+      # -- upgrade of FluxCD HelmRelease
+      # @section -- Commons helm release
       upgrade: {}
+      # -- driftDetection of FluxCD HelmRelease
+      # @section -- Commons helm release
       driftDetection: {}
 
   ingress:
+    # -- top domain for all services
+    # @section -- Commons Ingress
     domain: "wrenix.eu"
+    # -- annotations for all ingress objects
+    # @section -- Commons Ingress
     annotations:
       cert-manager.io/cluster-issuer: letsencrypt-prod
     tls:
       # -- tls on every ingress
+      # @section -- Commons Ingress
       enabled: true
       # -- use own definition of tls (e.g. for own or wildcard certificate)
+      # @section -- Commons Ingress
       override:
 
   prometheus:
     monitor:
+      # -- labels on Pod- and Service-Monitor
+      # @section -- Commons Monitoring
       labels: {}
     rules:
+      # -- labels on PrometheusRules
+      # @section -- Commons Monitoring
       labels: {}
 
   grafana:
     dashboards:
+      # -- labels of grafana dashboard configmap
+      # @section -- Commons Monitoring
       labels:
         grafana_dashboard: "1"
+      # -- annotations of grafana dashboard configmap
+      # @section -- Commons Monitoring
       annotations:
 
 server:
diff --git a/mycloud-nextcloud/README.adoc b/mycloud-nextcloud/README.adoc
index 7c6bd48..a7c702b 100644
--- a/mycloud-nextcloud/README.adoc
+++ b/mycloud-nextcloud/README.adoc
@@ -17,7 +17,171 @@ image::https://img.shields.io/badge/Version-application-informational?style=flat
 
 == Values
 
-.Values
+.Values Commons
+|===
+| Key | Type | Default | Description
+
+| commons.auth.host
+| string
+| `nil`
+| default auth.(.Values.commons.ingress.domain)
+
+| commons.masterPassword
+| string
+| `"CHANGEME"`
+| masterPassword to generate secrets
+|===
+
+.Values Commons helm release
+|===
+| Key | Type | Default | Description
+
+| commons.helm.release.driftDetection
+| object
+| `{}`
+| driftDetection of FluxCD HelmRelease
+
+| commons.helm.release.install
+| object
+| `{}`
+| install of FluxCD HelmRelease
+
+| commons.helm.release.test
+| object
+| `{}`
+| test of FluxCD HelmRelease
+
+| commons.helm.release.upgrade
+| object
+| `{}`
+| upgrade of FluxCD HelmRelease
+|===
+
+.Values Commons Ingress
+|===
+| Key | Type | Default | Description
+
+| commons.ingress.annotations
+| object
+| `{"cert-manager.io/cluster-issuer":"letsencrypt-prod"}`
+| annotations for all ingress objects
+
+| commons.ingress.domain
+| string
+| `"wrenix.eu"`
+| top domain for all services
+
+| commons.ingress.tls.enabled
+| bool
+| `true`
+| tls on every ingress
+
+| commons.ingress.tls.override
+| string
+| `nil`
+| use own definition of tls (e.g. for own or wildcard certificate)
+|===
+
+.Values Commons mail
+|===
+| Key | Type | Default | Description
+
+| commons.mail.from
+| string
+| `nil`
+| send from address
+
+| commons.mail.host
+| string
+| `nil`
+| smtp server
+
+| commons.mail.password
+| string
+| `nil`
+| smtp password
+
+| commons.mail.use_ssl
+| bool
+| `false`
+| smtp server use ssl
+
+| commons.mail.use_tls
+| bool
+| `false`
+| smtp server use start tls
+
+| commons.mail.username
+| string
+| `nil`
+| smtp username
+|===
+
+.Values Commons Persistence
+|===
+| Key | Type | Default | Description
+
+| commons.persistence.hostPath.enabled
+| bool
+| `false`
+| use hostPath instatt of PVC
+
+| commons.persistence.hostPath.prefix
+| string
+| `"/var/lib/mycloud"`
+| use hostPath under the following path
+
+| commons.persistence.storageClass
+| string
+| `nil`
+| storageClass of PVC
+|===
+
+.Values Commons Monitoring
+|===
+| Key | Type | Default | Description
+
+| commons.prometheus.monitor.labels
+| object
+| `{}`
+| labels on Pod- and Service-Monitor
+
+| commons.prometheus.rules.labels
+| object
+| `{}`
+| labels on PrometheusRules
+|===
+
+.Values Commons Redis
+|===
+| Key | Type | Default | Description
+
+| commons.redis.replicas
+| int
+| `0`
+| replicas
+|===
+
+.Values Commons theme
+|===
+| Key | Type | Default | Description
+
+| commons.theme.favicon
+| string
+| `"/static/dist/assets/icons/icon.png"`
+| favicon everywhere
+
+| commons.theme.logo
+| string
+| `"/static/dist/assets/icons/icon_left_brand.svg"`
+| logo everywhere
+
+| commons.theme.title
+| string
+| `"myCloud"`
+| title everywhere
+|===
+.Values Other Values
 |===
 | Key | Type | Default | Description
 
@@ -91,126 +255,6 @@ image::https://img.shields.io/badge/Version-application-informational?style=flat
 | `"sub"`
 | oidc field which us used as id in nextcloud for username (for security reason it is sub, but could be overwritten by username) https://goauthentik.io/integrations/services/nextcloud/#provider-and-application
 
-| commons.auth.host
-| string
-| `nil`
-| default auth.(.Values.commons.ingress.domain)
-
-| commons.helm.release.driftDetection
-| object
-| `{}`
-|
-
-| commons.helm.release.install
-| object
-| `{}`
-|
-
-| commons.helm.release.test
-| object
-| `{}`
-|
-
-| commons.helm.release.upgrade
-| object
-| `{}`
-|
-
-| commons.ingress.annotations."cert-manager.io/cluster-issuer"
-| string
-| `"letsencrypt-prod"`
-|
-
-| commons.ingress.domain
-| string
-| `"wrenix.eu"`
-|
-
-| commons.ingress.tls.enabled
-| bool
-| `true`
-| tls on every ingress
-
-| commons.ingress.tls.override
-| string
-| `nil`
-| use own definition of tls (e.g. for own or wildcard certificate)
-
-| commons.mail.from
-| string
-| `nil`
-|
-
-| commons.mail.host
-| string
-| `nil`
-|
-
-| commons.mail.password
-| string
-| `nil`
-|
-
-| commons.mail.use_ssl
-| bool
-| `false`
-|
-
-| commons.mail.use_tls
-| bool
-| `false`
-|
-
-| commons.mail.username
-| string
-| `nil`
-|
-
-| commons.masterPassword
-| string
-| `"CHANGEME"`
-|
-
-| commons.persistence.hostPath.enabled
-| bool
-| `false`
-|
-
-| commons.persistence.hostPath.prefix
-| string
-| `"/var/lib/mycloud"`
-|
-
-| commons.persistence.storageClass
-| string
-| `nil`
-|
-
-| commons.prometheus.monitor.labels
-| object
-| `{}`
-|
-
-| commons.prometheus.rules.labels
-| object
-| `{}`
-|
-
-| commons.theme.favicon
-| string
-| `"/static/dist/assets/icons/icon.png"`
-|
-
-| commons.theme.logo
-| string
-| `"/static/dist/assets/icons/icon_left_brand.svg"`
-|
-
-| commons.theme.title
-| string
-| `"myCloud"`
-|
-
 | database.host
 | string
 | `"mycloud-services-postgresql"`
@@ -231,11 +275,6 @@ image::https://img.shields.io/badge/Version-application-informational?style=flat
 | `"nextcloud"`
 |
 
-| helm.nextcloud.chart
-| string
-| `"6378227fe4a3b36c9d968e6ece377036b6c2df1a"`
-| version of the helm chart (current on git)
-
 | ingress.annotations
 | string
 | `nil`
diff --git a/mycloud-nextcloud/values.yaml b/mycloud-nextcloud/values.yaml
index a7832e6..363c15e 100644
--- a/mycloud-nextcloud/values.yaml
+++ b/mycloud-nextcloud/values.yaml
@@ -3,55 +3,102 @@ init:
   namespace: "bases"
 
 commons:
+  # -- masterPassword to generate secrets
+  # @section -- Commons
   masterPassword: "CHANGEME"
 
   auth:
     # -- default auth.(.Values.commons.ingress.domain)
+    # @section -- Commons
     host:
 
   theme:
+    # -- title everywhere
+    # @section -- Commons theme
     title: myCloud
+    # -- logo everywhere
+    # @section -- Commons theme
     logo: /static/dist/assets/icons/icon_left_brand.svg
+    # -- favicon everywhere
+    # @section -- Commons theme
     favicon: /static/dist/assets/icons/icon.png
 
   mail:
+    # -- smtp server
+    # @section -- Commons mail
     host:
+    # -- smtp username
+    # @section -- Commons mail
     username:
+    # -- smtp password
+    # @section -- Commons mail
     password:
+    # -- send from address
+    # @section -- Commons mail
     from:
+    # -- smtp server use start tls
+    # @section -- Commons mail
     use_tls: false
+    # -- smtp server use ssl
+    # @section -- Commons mail
     use_ssl: false
 
   persistence:
+    # -- storageClass of PVC
+    # @section -- Commons Persistence
     storageClass:
     hostPath:
+      # -- use hostPath instatt of PVC
+      # @section -- Commons Persistence
       enabled: false
+      # -- use hostPath under the following path
+      # @section -- Commons Persistence
       prefix: "/var/lib/mycloud"
 
   helm:
     release:
+      # -- install of FluxCD HelmRelease
+      # @section -- Commons helm release
       install: {}
+      # -- test of FluxCD HelmRelease
+      # @section -- Commons helm release
       test: {}
+      # -- upgrade of FluxCD HelmRelease
+      # @section -- Commons helm release
       upgrade: {}
+      # -- driftDetection of FluxCD HelmRelease
+      # @section -- Commons helm release
       driftDetection: {}
 
   ingress:
+    # -- top domain for all services
+    # @section -- Commons Ingress
     domain: "wrenix.eu"
+    # -- annotations for all ingress objects
+    # @section -- Commons Ingress
     annotations:
       cert-manager.io/cluster-issuer: letsencrypt-prod
     tls:
       # -- tls on every ingress
+      # @section -- Commons Ingress
       enabled: true
       # -- use own definition of tls (e.g. for own or wildcard certificate)
+      # @section -- Commons Ingress
       override:
 
   prometheus:
     monitor:
+      # -- labels on Pod- and Service-Monitor
+      # @section -- Commons Monitoring
       labels: {}
     rules:
+      # -- labels on PrometheusRules
+      # @section -- Commons Monitoring
       labels: {}
 
   redis:
+    # -- replicas
+    # @section -- Commons Redis
     replicas: 0
 
 # -- generated by .Values.commons.masterPassword
diff --git a/mycloud-services/README.adoc b/mycloud-services/README.adoc
index a9d9b39..701c929 100644
--- a/mycloud-services/README.adoc
+++ b/mycloud-services/README.adoc
@@ -17,55 +17,74 @@ image::https://img.shields.io/badge/Version-application-informational?style=flat
 
 == Values
 
-.Values
+.Values Commons helm release
 |===
 | Key | Type | Default | Description
 
 | commons.helm.release.driftDetection
 | object
 | `{}`
-|
+| driftDetection of FluxCD HelmRelease
 
 | commons.helm.release.install
 | object
 | `{}`
-|
+| install of FluxCD HelmRelease
 
 | commons.helm.release.test
 | object
 | `{}`
-|
+| test of FluxCD HelmRelease
 
 | commons.helm.release.upgrade
 | object
 | `{}`
-|
+| upgrade of FluxCD HelmRelease
+|===
+
+.Values Commons
+|===
+| Key | Type | Default | Description
 
 | commons.masterPassword
 | string
 | `"CHANGEME"`
-|
+| masterPassword to generate secrets
+|===
+
+.Values Commons Persistence
+|===
+| Key | Type | Default | Description
 
 | commons.persistence.hostPath.enabled
 | bool
 | `false`
-|
+| use hostPath instatt of PVC
 
 | commons.persistence.hostPath.prefix
 | string
 | `"/var/lib/mycloud"`
-|
+| use hostPath under the following path
 
 | commons.persistence.storageClass
 | string
 | `nil`
-|
+| storageClass of PVC
+|===
+.Values Other Values
+|===
+| Key | Type | Default | Description
 
 | databases
 | object
-| `{"example":{"password":null,"type":"none","username":"example-password"}}`
+| `{"example":{"additionalParams":null,"password":null,"type":"none","username":"example-password"}}`
 | create databases
 
+| databases.example.additionalParams
+| string
+| `nil`
+| additional params for databases
+
 | databases.example.password
 | string
 | `nil`
diff --git a/mycloud-services/values.yaml b/mycloud-services/values.yaml
index a902e2c..9005baa 100644
--- a/mycloud-services/values.yaml
+++ b/mycloud-services/values.yaml
@@ -1,17 +1,33 @@
 commons:
+  # -- masterPassword to generate secrets
+  # @section -- Commons
   masterPassword: "CHANGEME"
 
   persistence:
+    # -- storageClass of PVC
+    # @section -- Commons Persistence
     storageClass:
     hostPath:
+      # -- use hostPath instatt of PVC
+      # @section -- Commons Persistence
       enabled: false
+      # -- use hostPath under the following path
+      # @section -- Commons Persistence
       prefix: "/var/lib/mycloud"
 
   helm:
     release:
+      # -- install of FluxCD HelmRelease
+      # @section -- Commons helm release
       install: {}
+      # -- test of FluxCD HelmRelease
+      # @section -- Commons helm release
       test: {}
+      # -- upgrade of FluxCD HelmRelease
+      # @section -- Commons helm release
       upgrade: {}
+      # -- driftDetection of FluxCD HelmRelease
+      # @section -- Commons helm release
       driftDetection: {}
 
 postgresql: