diff --git a/chainlink/Chart.lock b/chainlink/Chart.lock
new file mode 100644
index 0000000..9325b43
--- /dev/null
+++ b/chainlink/Chart.lock
@@ -0,0 +1,6 @@
+dependencies:
+- name: base
+  repository: file://../base
+  version: 1.0.0
+digest: sha256:f40bb973d13e50df11c689f0e97f5ea9ff47623b9835e50ee5d0da301f03296a
+generated: "2023-01-04T10:54:28.019079539+01:00"
diff --git a/chainlink/Chart.yaml b/chainlink/Chart.yaml
index 5d619ee..b47b091 100644
--- a/chainlink/Chart.yaml
+++ b/chainlink/Chart.yaml
@@ -16,4 +16,8 @@ maintainers:
   - name: Leo Vigna
     email: leo@vulcan.link
 
-appVersion: 0.10.9
+appVersion: 0.11.0
+dependencies:
+  - name: base
+    repository: file://../base
+    version: 1.x.x
diff --git a/chainlink/templates/config-toml-configmap.yaml b/chainlink/templates/config-toml-configmap.yaml
new file mode 100644
index 0000000..b32bfbf
--- /dev/null
+++ b/chainlink/templates/config-toml-configmap.yaml
@@ -0,0 +1,6 @@
+apiVersion: v1
+kind: ConfigMap
+metadata:
+  name:  {{ include "chainlink.fullname" . }}-config-toml
+data:
+  value: {{- toYaml .Values.configToml }}
diff --git a/chainlink/templates/secrets-toml-configmap.yaml b/chainlink/templates/secrets-toml-configmap.yaml
new file mode 100644
index 0000000..9049094
--- /dev/null
+++ b/chainlink/templates/secrets-toml-configmap.yaml
@@ -0,0 +1,6 @@
+apiVersion: v1
+kind: ConfigMap
+metadata:
+  name:  {{ include "chainlink.fullname" . }}-secrets-toml
+data:
+  value: {{- toYaml .Values.secretsToml }}
diff --git a/chainlink/templates/statefulset.yaml b/chainlink/templates/statefulset.yaml
index 498b27f..1c37e7f 100644
--- a/chainlink/templates/statefulset.yaml
+++ b/chainlink/templates/statefulset.yaml
@@ -70,6 +70,10 @@ spec:
           volumeMounts:
             - name: config
               mountPath: {{ .Values.volumes.config.mountPath }}
+            - name: configToml
+              mountPath: {{ .Values.volumes.configToml.mountPath }}
+            - name: secretsToml
+              mountPath: {{ .Values.volumes.secretsToml.mountPath }}
           resources:
             {{- toYaml .Values.resources | nindent 12 }}
       {{- with .Values.nodeSelector }}
@@ -93,3 +97,15 @@ spec:
               path: api
             - key: WALLET_PASSWORD
               path: password
+        - name: configToml
+          configMap:
+            name: {{ include "chainlink.fullname" . }}-config-toml
+            items:
+            - key: value
+              path: config.toml
+        - name: secretsToml
+          secretsMap:
+            name: {{ include "chainlink.fullname" . }}-secrets-toml
+            items:
+            - key: value
+              path: secrets.toml
diff --git a/chainlink/values.yaml b/chainlink/values.yaml
index ac3838c..acb0ce4 100644
--- a/chainlink/values.yaml
+++ b/chainlink/values.yaml
@@ -7,7 +7,7 @@ image:
   repository: smartcontract/chainlink
   pullPolicy: IfNotPresent
   command: ["chainlink", "local", "node"]
-  args: ["-a", "/etc/chainlink/api", "-p", "/etc/chainlink/password"]
+  args: ["-a", "/etc/chainlink/api", "-p", "/etc/chainlink/password", "-c", "/etc/chainlink/config.toml", "-s", "/etc/chainlink/secrets.toml"]
 config:
   # Login Info
   ROOT: /chainlink
@@ -21,7 +21,7 @@ config:
   CHAINLINK_PORT: "6688"
   CHAINLINK_TLS_PORT: "0"
   # Database
-  DATABASE_TIMEOUT: "0"
+  # DATABASE_TIMEOUT: "0"
   DATABASE_URL: postgresql://postgres@postgresql:5432/chainlink?sslmode=disable
   # Ethereum
   ETH_URL: ws://geth:8546
@@ -91,6 +91,10 @@ container:
 volumes:
   config:
     mountPath: /etc/chainlink
+  configToml:
+    mountPath: /etc/chainlink
+  secretsToml:
+    mountPath: /etc/chainlink
 
 service:
   type: ClusterIP
@@ -110,3 +114,6 @@ resources: {}
 nodeSelector: {}
 tolerations: []
 affinity: {}
+
+configToml: ''
+secretsToml: ''