diff --git a/.gitignore b/.gitignore
index c633945..db05d4a 100644
--- a/.gitignore
+++ b/.gitignore
@@ -9,5 +9,6 @@ sample-values-dev365-cognito-dex.yaml
 sample-values-dev365-aws.yaml
 sample-values-dev365-gcp.yaml
 sample-values-dev365-gcp-dex.yaml
+sample-values-dev365-dex-H2.yaml
 secretFiles/*
 !secretFiles/README.md
\ No newline at end of file
diff --git a/examples/AzureAuthentication-Example1.md b/examples/AzureAuthentication-Example1.md
index 7e94016..4e4ff57 100644
--- a/examples/AzureAuthentication-Example1.md
+++ b/examples/AzureAuthentication-Example1.md
@@ -82,7 +82,7 @@ dex:
 ## API properties
 api:
   enabled: true
-  version: "2.6.0"
+  version: "2.10.0"
   replicaCount: "1"
   serviceType: "ClusterIP"
   properties:
@@ -91,7 +91,7 @@ api:
 ## Executor properties
 executor:
   enabled: true
-  version: "2.6.0"  
+  version: "2.10.0"  
   replicaCount: "1"
   serviceType: "ClusterIP"
   properties:
@@ -101,14 +101,14 @@ executor:
 ## Registry properties
 registry:
   enabled: true
-  version: "2.6.0"
+  version: "2.10.0"
   replicaCount: "1"
   serviceType: "ClusterIP"
 
 ## UI Properties
 ui:
   enabled: true
-  version: "2.6.0"
+  version: "2.10.0"
   replicaCount: "1"
   serviceType: "ClusterIP"
 
diff --git a/examples/AzureAuthentication-Example2.md b/examples/AzureAuthentication-Example2.md
index 392fe44..b1dc2a6 100644
--- a/examples/AzureAuthentication-Example2.md
+++ b/examples/AzureAuthentication-Example2.md
@@ -83,7 +83,7 @@ dex:
 ## API properties
 api:
   enabled: true
-  version: "2.6.0"
+  version: "2.10.0"
   replicaCount: "1"
   serviceType: "ClusterIP"
   properties:
@@ -96,7 +96,7 @@ api:
 ## Executor properties
 executor:
   enabled: true
-  version: "2.6.0"  
+  version: "2.10.0"  
   replicaCount: "1"
   serviceType: "ClusterIP"
   properties:
@@ -106,14 +106,14 @@ executor:
 ## Registry properties
 registry:
   enabled: true
-  version: "2.6.0"
+  version: "2.10.0"
   replicaCount: "1"
   serviceType: "ClusterIP"
 
 ## UI Properties
 ui:
   enabled: true
-  version: "2.6.0"
+  version: "2.10.0"
   replicaCount: "1"
   serviceType: "ClusterIP"
 
diff --git a/examples/AzureAuthentication-Example3.md b/examples/AzureAuthentication-Example3.md
index 99eb9c3..ce5e28b 100644
--- a/examples/AzureAuthentication-Example3.md
+++ b/examples/AzureAuthentication-Example3.md
@@ -83,7 +83,7 @@ dex:
 ## API properties
 api:
   enabled: true
-  version: "2.6.0"
+  version: "2.10.0"
   replicaCount: "1"
   serviceType: "ClusterIP"
   properties:
@@ -96,7 +96,7 @@ api:
 ## Executor properties
 executor:
   enabled: true
-  version: "2.6.0"  
+  version: "2.10.0"  
   replicaCount: "1"
   serviceType: "ClusterIP"
   properties:
@@ -106,14 +106,14 @@ executor:
 ## Registry properties
 registry:
   enabled: true
-  version: "2.6.0"
+  version: "2.10.0"
   replicaCount: "1"
   serviceType: "ClusterIP"
 
 ## UI Properties
 ui:
   enabled: true
-  version: "2.6.0"
+  version: "2.10.0"
   replicaCount: "1"
   serviceType: "ClusterIP"
 
diff --git a/examples/AzureAuthentication-Example4.md b/examples/AzureAuthentication-Example4.md
index f8faa42..066e85c 100644
--- a/examples/AzureAuthentication-Example4.md
+++ b/examples/AzureAuthentication-Example4.md
@@ -82,7 +82,7 @@ dex:
 ## API properties
 api:
   enabled: true
-  version: "2.6.0"
+  version: "2.10.0"
   replicaCount: "1"
   serviceType: "ClusterIP"
   properties:
@@ -95,7 +95,7 @@ api:
 ## Executor properties
 executor:
   enabled: true
-  version: "2.6.0"  
+  version: "2.10.0"  
   replicaCount: "1"
   serviceType: "ClusterIP"
   properties:
@@ -105,14 +105,14 @@ executor:
 ## Registry properties
 registry:
   enabled: true
-  version: "2.6.0"
+  version: "2.10.0"
   replicaCount: "1"
   serviceType: "ClusterIP"
 
 ## UI Properties
 ui:
   enabled: true
-  version: "2.6.0"
+  version: "2.10.0"
   replicaCount: "1"
   serviceType: "ClusterIP"
 
diff --git a/examples/CognitoAuthentication-Example1.md b/examples/CognitoAuthentication-Example1.md
index a2de240..a10e188 100644
--- a/examples/CognitoAuthentication-Example1.md
+++ b/examples/CognitoAuthentication-Example1.md
@@ -91,7 +91,7 @@ dex:
 ## API properties
 api:
   enabled: true
-  version: "2.6.0"
+  version: "2.10.0"
   replicaCount: "1"
   serviceType: "ClusterIP"
   properties:
@@ -104,7 +104,7 @@ api:
 ## Executor properties
 executor:
   enabled: true
-  version: "2.6.0"  
+  version: "2.10.0"  
   replicaCount: "1"
   serviceType: "ClusterIP"
   properties:
@@ -114,14 +114,14 @@ executor:
 ## Registry properties
 registry:
   enabled: true
-  version: "2.6.0"
+  version: "2.10.0"
   replicaCount: "1"
   serviceType: "ClusterIP"
 
 ## UI Properties
 ui:
   enabled: true
-  version: "2.6.0"
+  version: "2.10.0"
   replicaCount: "1"
   serviceType: "ClusterIP"
 
diff --git a/examples/GithubAuthentication-Example1.md b/examples/GithubAuthentication-Example1.md
index 00af43f..ae8ddfa 100644
--- a/examples/GithubAuthentication-Example1.md
+++ b/examples/GithubAuthentication-Example1.md
@@ -80,7 +80,7 @@ dex:
 ## API properties
 api:
   enabled: true
-  version: "2.6.0"
+  version: "2.10.0"
   replicaCount: "1"
   serviceType: "ClusterIP"
   properties:
@@ -89,7 +89,7 @@ api:
 ## Executor properties
 executor:
   enabled: true
-  version: "2.6.0"  
+  version: "2.10.0"  
   replicaCount: "1"
   serviceType: "ClusterIP"
   properties:
@@ -99,14 +99,14 @@ executor:
 ## Registry properties
 registry:
   enabled: true
-  version: "2.6.0"
+  version: "2.10.0"
   replicaCount: "1"
   serviceType: "ClusterIP"
 
 ## UI Properties
 ui:
   enabled: true
-  version: "2.6.0"
+  version: "2.10.0"
   replicaCount: "1"
   serviceType: "ClusterIP"
 
diff --git a/examples/GoogleAuthentication-Example1.md b/examples/GoogleAuthentication-Example1.md
index 40a947e..534bad0 100644
--- a/examples/GoogleAuthentication-Example1.md
+++ b/examples/GoogleAuthentication-Example1.md
@@ -108,7 +108,7 @@ dex:
 ## API properties
 api:
   enabled: true
-  version: "2.6.0"
+  version: "2.10.0"
   replicaCount: "1"
   serviceType: "ClusterIP"
   properties:
@@ -117,7 +117,7 @@ api:
 ## Executor properties
 executor:
   enabled: true
-  version: "2.6.0"  
+  version: "2.10.0"  
   replicaCount: "1"
   serviceType: "ClusterIP"
   properties:
@@ -127,14 +127,14 @@ executor:
 ## Registry properties
 registry:
   enabled: true
-  version: "2.6.0"
+  version: "2.10.0"
   replicaCount: "1"
   serviceType: "ClusterIP"
 
 ## UI Properties
 ui:
   enabled: true
-  version: "2.6.0"
+  version: "2.10.0"
   replicaCount: "1"
   serviceType: "ClusterIP"
 
diff --git a/examples/GoogleAuthentication-Example2.md b/examples/GoogleAuthentication-Example2.md
index 44e4a9b..5030040 100644
--- a/examples/GoogleAuthentication-Example2.md
+++ b/examples/GoogleAuthentication-Example2.md
@@ -109,7 +109,7 @@ dex:
 ## API properties
 api:
   enabled: true
-  version: "2.6.0"
+  version: "2.10.0"
   replicaCount: "1"
   serviceType: "ClusterIP"
   properties:
@@ -122,7 +122,7 @@ api:
 ## Executor properties
 executor:
   enabled: true
-  version: "2.6.0"  
+  version: "2.10.0"  
   replicaCount: "1"
   serviceType: "ClusterIP"
   properties:
@@ -132,14 +132,14 @@ executor:
 ## Registry properties
 registry:
   enabled: true
-  version: "2.6.0"
+  version: "2.10.0"
   replicaCount: "1"
   serviceType: "ClusterIP"
 
 ## UI Properties
 ui:
   enabled: true
-  version: "2.6.0"
+  version: "2.10.0"
   replicaCount: "1"
   serviceType: "ClusterIP"
 
diff --git a/templates/secrets-api.yaml b/templates/secrets-api.yaml
index a70d36f..d5afc90 100644
--- a/templates/secrets-api.yaml
+++ b/templates/secrets-api.yaml
@@ -15,7 +15,7 @@ stringData:
   PatSecret: '{{ .Values.security.patSecret | b64enc }}'
   InternalSecret: '{{ .Values.security.internalSecret | b64enc }}'
   DexIssuerUri: '{{ .Values.security.dexIssuerUri }}'
-  DexClientId: '{{ .Values.registry.properties.DexClientId }}'
+  DexClientId: '{{ .Values.security.dexClientId }}'
   
   DatasourceHostname: '{{ .Values.api.properties.databaseHostname }}'
   DatasourceDatabase: '{{ .Values.api.properties.databaseName }}'
diff --git a/templates/secrets-registry.yaml b/templates/secrets-registry.yaml
index 6d2887f..d1cd0e1 100644
--- a/templates/secrets-registry.yaml
+++ b/templates/secrets-registry.yaml
@@ -14,7 +14,7 @@ stringData:
   InternalSecret: '{{ .Values.security.internalSecret | b64enc }}'
   TerrakubeEnableSecurity: 'true'
   TerrakubeUiURL: 'https://{{ .Values.ingress.ui.domain }}'
-  AppClientId: '{{ .Values.registry.properties.DexClientId }}'
+  AppClientId: '{{ .Values.security.dexClientId }}'
   AppIssuerUri: 'https://{{ .Values.ingress.api.domain }}/dex'
 
   {{- if and (.Values.storage.azure).storageAccountName (.Values.storage.azure).storageAccountAccessKey }}