diff --git a/charts/snyk-broker/values.schema.json b/charts/snyk-broker/values.schema.json
index eeadd22..48db9b0 100644
--- a/charts/snyk-broker/values.schema.json
+++ b/charts/snyk-broker/values.schema.json
@@ -7,17 +7,29 @@
         "pattern": "^http(s?):\/\/.*"
       }
     },
-    "urlWithSchema":{
-      "type":"string",
+    "urlWithSchema": {
+      "type": "string",
       "pattern": "^$|^http(s?):\/\/.*"
     }
   },
   "type": "object",
   "properties": {
+    "brokerTokenSecret": {
+      "type": "string"
+    },
+    "brokerTokenSecretKey": {
+      "type": "string"
+    },
     "brokerToken": {
       "anyOf": [
-        { "type": "string", "format": "uuid" },
-        { "type": "string", "format": "" }
+        {
+          "type": "string",
+          "format": "uuid"
+        },
+        {
+          "type": "string",
+          "format": ""
+        }
       ]
     },
     "brokerClientUrl": {
@@ -79,16 +91,22 @@
         "container-registry-agent"
       ]
     },
-    "scmToken":{
+    "scmToken": {
       "type": "string"
     },
-    "scmTokenPool":{
-      "type":"string"
+    "scmTokenSecret": {
+      "type": "string"
+    },
+    "scmTokenSecretKey": {
+      "type": "string"
     },
-    "useExternalSecretScmTokenPool":{
+    "scmTokenPool": {
+      "type": "string"
+    },
+    "useExternalSecretScmTokenPool": {
       "type": "boolean"
     },
-    "github":{
+    "github": {
       "$ref": "#/$defs/urlNoSchema"
     },
     "githubApi": {
@@ -112,25 +130,25 @@
     "bitbucketApi": {
       "$ref": "#/$defs/urlNoSchema"
     },
-    "gitlab":{
+    "gitlab": {
       "$ref": "#/$defs/urlNoSchema"
     },
     "azureReposOrg": {
       "type": "string"
     },
-    "azureReposHost":{
+    "azureReposHost": {
       "$ref": "#/$defs/urlNoSchema"
     },
-    "azureReposToken":{
+    "azureReposToken": {
       "type": "string"
     },
-    "artifactoryUrl":{
+    "artifactoryUrl": {
       "$ref": "#/$defs/urlNoSchema"
     },
-    "baseNexusUrl":{
+    "baseNexusUrl": {
       "$ref": "#/$defs/urlWithSchema"
     },
-    "nexusUrl":{
+    "nexusUrl": {
       "$ref": "#/$defs/urlWithSchema"
     },
     "brokerClientValidationUrl": {
@@ -150,7 +168,7 @@
     },
     "crType": {
       "type": "string",
-      "enum":[
+      "enum": [
         "",
         "artifactory-cr",
         "harbor-cr",
@@ -203,7 +221,7 @@
         ""
       ]
     },
-    "enableCodeAgent":{
+    "enableCodeAgent": {
       "type": [
         "boolean",
         "string"
@@ -216,9 +234,14 @@
       ]
     },
     "upstreamUrlCodeAgent": {
-
     },
-    "snykToken":{
+    "snyTokenSecret": {
+      "type": "string"
+    },
+    "snykTokenSecretKey": {
+      "type": "string"
+    },
+    "snykToken": {
       "anyOf": [
         {
           "type": "string",
@@ -237,24 +260,24 @@
     "gitClientUrl": {
       "type": "string"
     },
-    "logLevel":{
+    "logLevel": {
       "type": "string",
-      "enum":[
+      "enum": [
         "info",
         "debug"
       ]
     },
-    "logEnableBody":{
+    "logEnableBody": {
       "type": "string",
-      "enum":[
+      "enum": [
         "false",
         "true"
       ]
     },
-    "enableBrokerLocalWebserverOverHttps":{
+    "enableBrokerLocalWebserverOverHttps": {
       "type": "boolean"
     },
-    "httpsCert":{
+    "httpsCert": {
       "type": "string"
     },
     "httpsKey": {
@@ -270,13 +293,13 @@
     "disableCaCertTrust": {
       "type": "boolean"
     },
-    "tlsRejectUnauthorized":{
+    "tlsRejectUnauthorized": {
       "type": [
         "string",
         "boolean",
         "integer"
       ],
-      "enum":[
+      "enum": [
         "",
         0,
         "0",
@@ -285,32 +308,32 @@
         "disable"
       ]
     },
-    "httpProxy":{
+    "httpProxy": {
       "$ref": "#/$defs/urlWithSchema"
     },
-    "httpsProxy":{
+    "httpsProxy": {
       "$ref": "#/$defs/urlWithSchema"
     },
     "noProxy": {
       "$ref": "#/$defs/urlWithSchema"
     },
-    "acceptJson":{
+    "acceptJson": {
       "type": "string"
     },
     "image": {
       "type": "object",
       "additionalProperties": false,
-      "properties":{
-        "repository":{
+      "properties": {
+        "repository": {
           "type": "string"
         },
-        "crRepository":{
+        "crRepository": {
           "type": "string"
         },
-        "caRepository":{
+        "caRepository": {
           "type": "string"
         },
-        "pullPolicy":{
+        "pullPolicy": {
           "type": "string",
           "enum": [
             "Always",
@@ -326,7 +349,7 @@
     "imagePullSecrets": {
       "type": "array"
     },
-    "healthCheckPath":{
+    "healthCheckPath": {
       "type": "string"
     },
     "systemCheckPath": {
@@ -374,7 +397,7 @@
     "deployment": {
       "type": "object"
     },
-    "serviceAccount":{
+    "serviceAccount": {
       "type": "object",
       "additionalProperties": false,
       "properties": {
@@ -404,10 +427,10 @@
     "securityContextCa": {
       "type": "object"
     },
-    "service":{
+    "service": {
       "type": "object",
       "additionalProperties": false,
-      "properties":{
+      "properties": {
         "brokerType": {
           "type": "string"
         },
@@ -421,7 +444,7 @@
           "type": "integer"
         },
         "tls": {
-          "type" :"array"
+          "type": "array"
         }
       }
     },
@@ -431,7 +454,7 @@
         "enabled": {
           "type": "boolean"
         },
-        "ingressClassName":{
+        "ingressClassName": {
           "type": "string"
         },
         "annotations": {
@@ -446,18 +469,18 @@
         "pathType": {
           "type": "string"
         },
-        "hosts":{
+        "hosts": {
           "type": "array"
         },
-        "extraPaths":{
+        "extraPaths": {
           "type": "array"
         },
-        "tls":{
+        "tls": {
           "type": "array"
         }
       }
     },
-    "extraObjects":{
+    "extraObjects": {
       "type": "array"
     },
     "extraVolumes": {
@@ -472,7 +495,7 @@
     "extraPodSpecs": {
       "nullable": true
     },
-    "extraPodSpecsCr":{
+    "extraPodSpecsCr": {
       "nullable": true
     }
   },