diff --git a/forgejo-runner/Chart.yaml b/forgejo-runner/Chart.yaml
index a36fd56..e460511 100644
--- a/forgejo-runner/Chart.yaml
+++ b/forgejo-runner/Chart.yaml
@@ -2,7 +2,7 @@ apiVersion: v2
 name: forgejo-runner
 description: Deploy runner for an forgejo instance (default codeberg.org)
 type: application
-version: 0.2.11
+version: 0.2.12
 # renovate: image=code.forgejo.org/forgejo/runner
 appVersion: "3.5.1"
 maintainers:
diff --git a/forgejo-runner/README.adoc b/forgejo-runner/README.adoc
index b8961a1..35a6fe8 100644
--- a/forgejo-runner/README.adoc
+++ b/forgejo-runner/README.adoc
@@ -2,7 +2,7 @@
 
 = forgejo-runner
 
-image::https://img.shields.io/badge/Version-0.2.11-informational?style=flat-square[Version: 0.2.11]
+image::https://img.shields.io/badge/Version-0.2.12-informational?style=flat-square[Version: 0.2.12]
 image::https://img.shields.io/badge/Version-application-informational?style=flat-square[Type: application]
 image::https://img.shields.io/badge/AppVersion-3.5.1-informational?style=flat-square[AppVersion: 3.5.1]
 == Maintainers
@@ -248,6 +248,11 @@ helm uninstall forgejo-runner-release
 | `"27.3.1-dind"`
 |
 
+| extraEnvVars
+| list
+| `[]`
+| Additional environment variables to be set on runner container Example: extraEnvVars:   - name: FOO     value: "bar"
+
 | fullnameOverride
 | string
 | `""`
diff --git a/forgejo-runner/templates/deployment.yaml b/forgejo-runner/templates/deployment.yaml
index 61166f4..f7a6a60 100644
--- a/forgejo-runner/templates/deployment.yaml
+++ b/forgejo-runner/templates/deployment.yaml
@@ -66,6 +66,9 @@ spec:
               value: /certs/client
             - name: DOCKER_TLS_VERIFY
               value: "1"
+            {{- with .Values.extraEnvVars }}
+            {{- toYaml . | nindent 12 }}
+            {{- end }}
           volumeMounts:
             - name: runner-configfile
               mountPath: /etc/runner
diff --git a/forgejo-runner/templates/jobs.yaml b/forgejo-runner/templates/jobs.yaml
index 50ba4d0..5f66027 100644
--- a/forgejo-runner/templates/jobs.yaml
+++ b/forgejo-runner/templates/jobs.yaml
@@ -60,6 +60,7 @@ metadata:
   name: {{ $secretName }}
   annotations:
     helm.sh/resource-policy: keep
+    "helm.sh/hook": "pre-install,pre-upgrade"
 type: Opaque
 ---
 apiVersion: v1
diff --git a/forgejo-runner/templates/secrets.yaml b/forgejo-runner/templates/secrets.yaml
index ce511ab..6d9b249 100644
--- a/forgejo-runner/templates/secrets.yaml
+++ b/forgejo-runner/templates/secrets.yaml
@@ -7,5 +7,6 @@ metadata:
     {{- include "forgejo-runner.labels" . | nindent 4 }}
   annotations:
     config-hash: {{ toYaml .Values.runner.config.file | sha256sum }}
+    "helm.sh/hook": "pre-install,pre-upgrade"
 data:
   config.yaml: {{ toYaml .Values.runner.config.file | b64enc }}
diff --git a/forgejo-runner/values.yaml b/forgejo-runner/values.yaml
index ca6224b..2abfc83 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: []