diff --git a/templates/gitea/act_runner/job.yaml b/templates/gitea/act_runner/job.yaml
index e8189d9..777eb77 100644
--- a/templates/gitea/act_runner/job.yaml
+++ b/templates/gitea/act_runner/job.yaml
@@ -86,9 +86,9 @@ spec:
               {{- if .Values.persistence.subPath }}
               subPath: {{ .Values.persistence.subPath }}
               {{- end }}
-      {{- with .Values.actions.provisioning.nodeSelector }}
+      {{- range $key, $value := .Values.actions.provisioning.nodeSelector }}
       nodeSelector:
-        {{- toYaml . | nindent 8 }}
+        {{ $key }}: {{ $value | quote }}
       {{- end }}
       {{- with .Values.actions.provisioning.affinity }}
       affinity:
diff --git a/templates/gitea/act_runner/statefulset.yaml b/templates/gitea/act_runner/statefulset.yaml
index 996778c..72b4e19 100644
--- a/templates/gitea/act_runner/statefulset.yaml
+++ b/templates/gitea/act_runner/statefulset.yaml
@@ -96,9 +96,9 @@ spec:
             {{- with .Values.actions.statefulset.dind.extraVolumeMounts }}
             {{- toYaml . | nindent 12 }}
             {{- end }}
-      {{- with .Values.actions.statefulset.nodeSelector }}
+      {{- range $key, $value := .Values.actions.statefulset.nodeSelector }}
       nodeSelector:
-        {{- toYaml . | nindent 8 }}
+        {{ $key }}: {{ $value | quote }}
       {{- end }}
       {{- with .Values.actions.statefulset.affinity }}
       affinity:
diff --git a/templates/gitea/deployment.yaml b/templates/gitea/deployment.yaml
index fa242cc..3d0c2ca 100644
--- a/templates/gitea/deployment.yaml
+++ b/templates/gitea/deployment.yaml
@@ -360,9 +360,9 @@ spec:
       hostAliases:
         {{- toYaml . | nindent 8 }}
       {{- end }}
-      {{- with .Values.nodeSelector }}
+      {{- range $key, $value := .Values.nodeSelector }}
       nodeSelector:
-        {{- toYaml . | nindent 8 }}
+        {{ $key }}: {{ $value | quote }}
       {{- end }}
     {{- with .Values.affinity }}
       affinity: