diff --git a/helm/index.yaml b/helm/index.yaml
index 69d624ab9f..085c5338b0 100644
--- a/helm/index.yaml
+++ b/helm/index.yaml
@@ -3,14 +3,14 @@ entries:
   squidex:
   - apiVersion: v2
     appVersion: 5.8.0
-    created: "2021-09-13T13:02:07.445459+02:00"
+    created: "2021-09-14T12:45:07.461676+02:00"
     dependencies:
     - condition: mongodb-replicaset.enabled
       name: mongodb-replicaset
       repository: https://kubernetes-charts.storage.googleapis.com/
       version: 3.9.6
     description: Squidex CMS
-    digest: 4837131004d23a1de21eb6d8d8576e6fadad990a49136af061d2c7e43bbaff9d
+    digest: a43c063a49326332b4a03e6d50fee1605ccd6ead9f04e9946b05a830e8c1be54
     home: https://squidex.io/
     keywords:
     - cms
@@ -26,4 +26,4 @@ entries:
     urls:
     - https://squidex.github.io/squidex/helm/squidex-1.0.0.tgz
     version: 1.0.0
-generated: "2021-09-13T13:02:07.441734+02:00"
\ No newline at end of file
+generated: "2021-09-14T12:45:07.458758+02:00"
diff --git a/helm/squidex-1.0.0.tgz b/helm/squidex-1.0.0.tgz
index 1d4d4aa441..f0f671b057 100644
Binary files a/helm/squidex-1.0.0.tgz and b/helm/squidex-1.0.0.tgz differ
diff --git a/helm/squidex/templates/deployment.yaml b/helm/squidex/templates/deployment.yaml
index 0bff8c1873..df17fb6680 100644
--- a/helm/squidex/templates/deployment.yaml
+++ b/helm/squidex/templates/deployment.yaml
@@ -11,6 +11,7 @@ spec:
     matchLabels:
       {{- include "squidex.selectors" . | indent 6 }}
       orleans/serviceId: "squidex-{{ default .Chart.AppVersion .Values.image.tag }}"
+      orleans/clusterId: "squidex"
   template:
     metadata:
       labels:
diff --git a/helm/squidex/values.yaml b/helm/squidex/values.yaml
index 9e0fa0eb3a..f58b0b1704 100644
--- a/helm/squidex/values.yaml
+++ b/helm/squidex/values.yaml
@@ -32,29 +32,99 @@ ingress:
   #      - chart-example.local
 
 env:
-  URLS__BASEURL: null
-  URLS__ENFORCEHTTPS: false
-  EVENTSTORE__CONSUME: true
+  # Define the type of the event store
   EVENTSTORE__TYPE: MongoDb
-  IDENTITY__ADMINEMAIL: null
-  IDENTITY__ADMINPASSWORD: null
-  IDENTITY__SHOWPII: true
-  LETSENCRYPT_HOST: null
-  LETSENCRYPT_EMAIL: null
-  LOGGING__HUMAN: "false"
   EVENTSTORE__MONGODB__DATABASE: "Squidex"
-  STORE__MONGODB__DATABASE: "Squidex"
-  STORE__MONGODB__CONTENTDATABASE: "SquidexContent"
+
+  # CREATE LOCAL ADMIN USER
+  IDENTITY__ADMINEMAIL: ""
+  IDENTITY__ADMINPASSWORD: ""
+  IDENTITY__ADMINRECREATE: false # Recreate the admin if it does not exist or the password does not match
+  IDENTITY__ALLOWPASSWORDAUTH: "true" # Enable password auth. Set this to false if you want to disable local login, leaving only 3rd party login options
+  IDENTITY__LOCKAUTOMATICALLY: "false" # Lock new users automatically, the administrator must unlock them
+  IDENTITY__SHOWPII: true # Set to true to show PII (Personally Identifiable Information) in the logs
+  IDENTITY__PRIVACYURL: "https://squidex.io/privacy" # The url to you privacy statements, if you host squidex by yourself
+
+  # Settings for Google auth (keep empty to disable)
   IDENTITY__GOOGLECLIENT: null
   IDENTITY__GOOGLESECRET: null
-  IDENTITY__MICROSOFTCLIENT: null
-  IDENTITY__MICROSOFTSECRET: null
+
+  # Settings for Github auth (keep empty to disable)
   IDENTITY__GITHUBCLIENT: null
   IDENTITY__GITHUBSECRET: null
-  IDENTITY__ALLOWPASSWORDAUTH: "true"
-  IDENTITY__LOCKAUTOMATICALLY: "false"
-  ORLEANS__CLUSTERING: MongoDB
+
+  # Settings for Microsoft auth (keep empty to disable)
+  # NOTE: Tennant is optional for using a specific AzureAD tenant
+  IDENTITY__MICROSOFTCLIENT: null
+  IDENTITY__MICROSOFTSECRET: null
+  IDENTITY__MICROSOFTTENANT: null
+
+  # Settings for your custom oidc server
+  IDENTITY__OIDCNAME: null
+  IDENTITY__OIDCAUTHORITY: null
+  IDENTITY__OIDCCLIENT: null
+  IDENTITY__OIDCSECRET: null
+  IDENTITY__OIDCMETADATAADDRESS: null
+  IDENTITY__OIDCSCOPES: [] # ["email"]
+  IDENTITY__OIDCRESPONSETYPE: null # id_token or code
+  IDENTITY__OIDCGETCLAIMSFROMUSERINFOENDPOINT: false
+  IDENTITY__OIDCSINGOUTREDIRECTURL: null
+
+  LETSENCRYPT_HOST: null
+  LETSENCRYPT_EMAIL: null
+
+  # LOGGING SETTINGS
+  LOGGING__LEVEL: INFORMATION # Trace, Debug, Information, Warning, Error, Fatal
+  LOGGING__HUMAN: true # Setting the flag to true, enables well formatteds json logs
+  LOGGING__COLORS: true # Set to true, to use colors
+  LOGGING__LOGREQUESTS: true # Set to false to disable logging of http requests
+  LOGGING__STOREENABLED: true # False to disable the log store
+  LOGGING__STORERETENTIONINDAYS: 90 # The number of days request log items will be stored
+  LOGGING__STACKDRIVER__ENABLED: false # True, to enable stackdriver integration
+  LOGGING__OTLP__ENABLED: false # True, to enable OpenTelemetry Protocol integration
+  LOGGING__OLTP__ENDPOINT: null # The endpoint to the agent
+  LOGGING__APPLICATIONINSIGHTS__ENABLED: false # True, to enable application insights integraon
+  LOGGING__APPLICATIONINSIGHTS__CONNECTIONSTRING: null # "instrumentationkey=keyvalue"
+
+  # Define the clustering type
+  ORLEANS__CLUSTERING: MongoDB # SUPPORTED: MongoDB, Development
+  ORLEANS__KUBERNETES: true # Tell Orleans it is running in kubernetes
+
+  # Define the type of the read store
+  STORE__TYPE: MongoDb
+  STORE__MONGODB__DATABASE: "Squidex"
+  STORE__MONGODB__CONTENTDATABASE: "SquidexContent"
+
+  URLS__BASEURL: https://squidex.local/ # Set the base url of your application, to generate correct urls in background process
+  URLS__ENFORCEHTTPS: false # Set it to true to redirect the user from http to https permanently
 
 mongodb-replicaset:
   enabled: true
-  replicas: 3
\ No newline at end of file
+  replicas: 3
+  
+  auth:
+    enabled: false
+    existingKeySecret: ""
+    existingAdminSecret: ""
+    existingMetricsSecret: ""
+    # adminUser: username
+    # adminPassword: password
+    # metricsUser: metrics
+    # metricsPassword: password
+    # key: keycontent
+  
+  persistentVolume:
+    enabled: true
+    ## mongodb-replicaset 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
+    ##   set, choosing the default provisioner.  (gp2 on AWS, standard on
+    ##   GKE, AWS & OpenStack)
+    ##
+    storageClass: ""
+    accessModes:
+      - ReadWriteOnce
+    size: 10Gi
+
+  nodeSelector: {}
\ No newline at end of file