diff --git a/charts/kellnr/templates/_helpers.tpl b/charts/kellnr/templates/_helpers.tpl
index c919ef7..77d4207 100644
--- a/charts/kellnr/templates/_helpers.tpl
+++ b/charts/kellnr/templates/_helpers.tpl
@@ -257,6 +257,15 @@ KELLNR_OAUTH2__READ_ONLY_GROUP_VALUE: {{ .Values.kellnr.oauth2.readOnlyGroupValu
 {{ if not (eq .Values.kellnr.oauth2.buttonText nil) }}
 KELLNR_OAUTH2__BUTTON_TEXT: {{ .Values.kellnr.oauth2.buttonText | quote }}
 {{ end }}
+{{ if not (eq .Values.kellnr.toolchain.enabled nil) }}
+KELLNR_TOOLCHAIN__ENABLED: {{ .Values.kellnr.toolchain.enabled | quote }}
+{{ end }}
+{{ if not (eq .Values.kellnr.toolchain.maxSize nil) }}
+KELLNR_TOOLCHAIN__MAX_SIZE: {{ .Values.kellnr.toolchain.maxSize | quote }}
+{{ end }}
+{{ if not (eq .Values.kellnr.s3.toolchain_bucket nil) }}
+KELLNR_S3__TOOLCHAIN_BUCKET: {{ .Values.kellnr.s3.toolchain_bucket | quote }}
+{{ end }}
 {{- end }}
 
 {{/*
diff --git a/charts/kellnr/values.yaml b/charts/kellnr/values.yaml
index aa007d1..0e91657 100644
--- a/charts/kellnr/values.yaml
+++ b/charts/kellnr/values.yaml
@@ -128,6 +128,7 @@ kellnr:
     allowHttp: null # true
     crates_bucket: null # "kellnr-crates"
     cratesio_bucket: null # "kellnr-cratesio"
+    toolchain_bucket: null # "kellnr-toolchain"
 
   # OAuth2/OpenID Connect authentication
   # See https://kellnr.io/documentation for details
@@ -160,6 +161,10 @@ kellnr:
     # Text displayed on the OAuth2 login button
     buttonText: null # "Login with SSO"
 
+  toolchain:
+    enabled: false
+    maxSize: 500
+
 service:
   api:
     type: ClusterIP