diff --git a/substrate/scripts/kubernetes/templates/service.yaml b/substrate/scripts/kubernetes/templates/service.yaml
index eb986adbca..01ba9d5a56 100644
--- a/substrate/scripts/kubernetes/templates/service.yaml
+++ b/substrate/scripts/kubernetes/templates/service.yaml
@@ -35,8 +35,7 @@ spec:
   type: NodePort
   # don't route exteral traffic to non-local pods
   externalTrafficPolicy: Local
-{{- else }}
-{{- if .Values.validator.keys }}
+{{- else if .Values.validator.keys }}
 {{- $root := . -}}
 {{- range until (int .Values.nodes.replicas) }}
 ---
@@ -53,4 +52,3 @@ spec:
       protocol: TCP
 {{- end }}
 {{- end }}
-{{- end }}
diff --git a/substrate/scripts/kubernetes/templates/statefulset.yaml b/substrate/scripts/kubernetes/templates/statefulset.yaml
index 27ea85e9b7..0f34b3507a 100644
--- a/substrate/scripts/kubernetes/templates/statefulset.yaml
+++ b/substrate/scripts/kubernetes/templates/statefulset.yaml
@@ -58,7 +58,7 @@ spec:
           - sed -n -r "s/^${POD_NAME}-key ([^ ]+)$/\1/p" /etc/validator/secrets > {{ .Values.image.basepath }}/key;
             sed -n -r "s/^${POD_NAME}-node-key ([^ ]+)$/\1/p" /etc/validator/secrets > {{ .Values.image.basepath }}/node-key;
             sed -n -r "s/^${POD_NAME}-name ([^ ]+)$/\1/p" /etc/validator/secrets > {{ .Values.image.basepath }}/name;
-            test -z {{ .Values.image.basepath }}/name && echo "${POD_NAME}" > {{ .Values.image.basepath }}/name
+            test -s {{ .Values.image.basepath }}/name || echo "${POD_NAME}" > {{ .Values.image.basepath }}/name
         env:
           # from (workaround for hostname)
           # https://kubernetes.io/docs/tasks/inject-data-application/environment-variable-expose-pod-information/