diff --git a/charts/gha-runner-scale-set-experimental/tests/autoscaling_runner_set_annotations_test.yaml b/charts/gha-runner-scale-set-experimental/tests/autoscaling_runner_set_annotations_test.yaml
index 09340e76..50ed838c 100644
--- a/charts/gha-runner-scale-set-experimental/tests/autoscaling_runner_set_annotations_test.yaml
+++ b/charts/gha-runner-scale-set-experimental/tests/autoscaling_runner_set_annotations_test.yaml
@@ -146,3 +146,4 @@ tests:
       - equal:
           path: spec.ephemeralRunnerConfigSecretMetadata.annotations.runner-secret
           value: "true"
+
diff --git a/charts/gha-runner-scale-set-experimental/tests/autoscaling_runner_set_labels_test.yaml b/charts/gha-runner-scale-set-experimental/tests/autoscaling_runner_set_labels_test.yaml
index fb4610e3..eae95364 100644
--- a/charts/gha-runner-scale-set-experimental/tests/autoscaling_runner_set_labels_test.yaml
+++ b/charts/gha-runner-scale-set-experimental/tests/autoscaling_runner_set_labels_test.yaml
@@ -359,4 +359,4 @@ tests:
           value: "true"
       - equal:
           path: spec.ephemeralRunnerConfigSecretMetadata.labels.runner-secret
-          value: "true"
\ No newline at end of file
+          value: "true"
diff --git a/charts/gha-runner-scale-set/templates/autoscalingrunnerset.yaml b/charts/gha-runner-scale-set/templates/autoscalingrunnerset.yaml
index d8440dc5..a194e570 100644
--- a/charts/gha-runner-scale-set/templates/autoscalingrunnerset.yaml
+++ b/charts/gha-runner-scale-set/templates/autoscalingrunnerset.yaml
@@ -1,3 +1,4 @@
+{{- $resourceMeta := default (dict) .Values.resourceMeta }}
 {{- $hasCustomResourceMeta := (and .Values.resourceMeta .Values.resourceMeta.autoscalingRunnerSet) }}
 apiVersion: actions.github.com/v1alpha1
 kind: AutoscalingRunnerSet
@@ -154,42 +155,42 @@ spec:
     {{- toYaml . | nindent 4 }}
   {{- end }}
 
-  {{- with .Values.resourceMeta.autoscalingListener }}
+  {{- with (index $resourceMeta "autoscalingListener") }}
   autoscalingListener:
     {{- include "gha-runner-scale-set.resourceMetaSpec" . | nindent 4 }}
   {{- end }}
 
-  {{- with .Values.resourceMeta.listenerServiceAccount }}
+  {{- with (index $resourceMeta "listenerServiceAccount") }}
   listenerServiceAccountMetadata:
     {{- include "gha-runner-scale-set.resourceMetaSpec" . | nindent 4 }}
   {{- end }}
 
-  {{- with .Values.resourceMeta.listenerRole }}
+  {{- with (index $resourceMeta "listenerRole") }}
   listenerRoleMetadata:
     {{- include "gha-runner-scale-set.resourceMetaSpec" . | nindent 4 }}
   {{- end }}
 
-  {{- with .Values.resourceMeta.listenerRoleBinding }}
+  {{- with (index $resourceMeta "listenerRoleBinding") }}
   listenerRoleBindingMetadata:
     {{- include "gha-runner-scale-set.resourceMetaSpec" . | nindent 4 }}
   {{- end }}
 
-  {{- with .Values.resourceMeta.listenerConfigSecret }}
+  {{- with (index $resourceMeta "listenerConfigSecret") }}
   listenerConfigSecretMetadata:
     {{- include "gha-runner-scale-set.resourceMetaSpec" . | nindent 4 }}
   {{- end }}
 
-  {{- with .Values.resourceMeta.ephemeralRunnerSet }}
+  {{- with (index $resourceMeta "ephemeralRunnerSet") }}
   ephemeralRunnerSetMetadata:
     {{- include "gha-runner-scale-set.resourceMetaSpec" . | nindent 4 }}
   {{- end }}
 
-  {{- with .Values.resourceMeta.ephemeralRunner }}
+  {{- with (index $resourceMeta "ephemeralRunner") }}
   ephemeralRunnerMetadata:
     {{- include "gha-runner-scale-set.resourceMetaSpec" . | nindent 4 }}
   {{- end }}
 
-  {{- with .Values.resourceMeta.ephemeralRunnerConfigSecret }}
+  {{- with (index $resourceMeta "ephemeralRunnerConfigSecret") }}
   ephemeralRunnerConfigSecretMetadata:
     {{- include "gha-runner-scale-set.resourceMetaSpec" . | nindent 4 }}
   {{- end }}