diff --git a/templates/rolebinding-job.yaml b/templates/rolebinding-job.yaml
index 6c240f5..d21d12d 100644
--- a/templates/rolebinding-job.yaml
+++ b/templates/rolebinding-job.yaml
@@ -17,6 +17,6 @@ roleRef:
 subjects:
   - kind: ServiceAccount
     name: {{ $name }}
-    namespace: {{ .Release.Namespace }}
+    namespace: {{ .Values.namespace | default .Release.Namespace }}
 {{- end }}
 {{- end }}
diff --git a/templates/secret-token.yaml b/templates/secret-token.yaml
index 5016dd9..5e6dcfe 100644
--- a/templates/secret-token.yaml
+++ b/templates/secret-token.yaml
@@ -11,7 +11,7 @@ metadata:
   labels:
     {{- include "gitea.actions.labels" . | nindent 4 }}
     app.kubernetes.io/component: token-job
-{{ $secret := (lookup "v1" "Secret" .Release.Namespace $secretName) -}}
+{{ $secret := (lookup "v1" "Secret" (.Values.namespace | default .Release.Namespace) $secretName) -}}
 {{ if $secret -}}
 data:
   token: {{ (b64dec (index $secret.data "token")) | b64enc }}