diff --git a/forgejo-runner/templates/deployment.yaml b/forgejo-runner/templates/deployment.yaml
index 9c074ac..f7a6a60 100644
--- a/forgejo-runner/templates/deployment.yaml
+++ b/forgejo-runner/templates/deployment.yaml
@@ -66,11 +66,8 @@ spec:
               value: /certs/client
             - name: DOCKER_TLS_VERIFY
               value: "1"
-            {{- with .Values.runner.config.file.runner.envs }}
-            {{- range $key, $value := . }}
-            - name: {{ $key }}
-              value: {{ $value | quote }}
-            {{- end }}
+            {{- with .Values.extraEnvVars }}
+            {{- toYaml . | nindent 12 }}
             {{- end }}
           volumeMounts:
             - name: runner-configfile
diff --git a/forgejo-runner/values.yaml b/forgejo-runner/values.yaml
index ca6224b..20741fd 100644
--- a/forgejo-runner/values.yaml
+++ b/forgejo-runner/values.yaml
@@ -212,3 +212,11 @@ nodeSelector: {}
 tolerations: []
 
 affinity: {}
+
+## Additional environment variables to be set on runner container
+## Example:
+## extraEnvVars:
+##   - name: FOO
+##     value: "bar"
+##
+extraEnvVars: []