diff --git a/galaxykubeman/templates/config-setup-galaxy.yaml b/galaxykubeman/templates/config-setup-galaxy.yaml
index 906f128..dd357ca 100644
--- a/galaxykubeman/templates/config-setup-galaxy.yaml
+++ b/galaxykubeman/templates/config-setup-galaxy.yaml
@@ -1,3 +1,4 @@
+---
 apiVersion: v1
 metadata:
   name: {{ .Release.Name }}-galaxykubeman-setup-galaxy
diff --git a/galaxykubeman/templates/configs.yaml b/galaxykubeman/templates/configs.yaml
index 2e227fb..ab4838a 100644
--- a/galaxykubeman/templates/configs.yaml
+++ b/galaxykubeman/templates/configs.yaml
@@ -1,4 +1,5 @@
 {{- if .Values.configs }}
+---
 apiVersion: v1
 metadata:
   name: {{ .Release.Name }}-galaxykubeman-configs
@@ -15,6 +16,5 @@ data:
     {{- $entry | nindent 8 }}
   {{- end -}}
   {{- end }}
----
 {{- end -}}
 
diff --git a/galaxykubeman/templates/job-predelete.yaml b/galaxykubeman/templates/job-predelete.yaml
index 3f38631..6490968 100644
--- a/galaxykubeman/templates/job-predelete.yaml
+++ b/galaxykubeman/templates/job-predelete.yaml
@@ -1,3 +1,4 @@
+---
 apiVersion: batch/v1
 kind: Job
 metadata:
diff --git a/galaxykubeman/templates/job-setup-galaxy.yaml b/galaxykubeman/templates/job-setup-galaxy.yaml
index 004d523..5cd5b0f 100644
--- a/galaxykubeman/templates/job-setup-galaxy.yaml
+++ b/galaxykubeman/templates/job-setup-galaxy.yaml
@@ -1,3 +1,4 @@
+---
 apiVersion: batch/v1
 kind: Job
 metadata:
diff --git a/galaxykubeman/templates/persistence-restore.yaml b/galaxykubeman/templates/persistence-restore.yaml
index 15c52ad..96e8aff 100644
--- a/galaxykubeman/templates/persistence-restore.yaml
+++ b/galaxykubeman/templates/persistence-restore.yaml
@@ -1,4 +1,5 @@
 {{ if .Values.restore.persistence.nfs.galaxy.pvcID -}}
+---
 apiVersion: v1
 kind: PersistentVolumeClaim
 metadata:
@@ -19,8 +20,8 @@ spec:
       storage: {{ .Values.galaxy.persistence.size | quote }}
   volumeMode: Filesystem
   volumeName: "pvc-{{.Values.restore.persistence.nfs.galaxy.pvcID}}"
----
 {{ if .Values.restore.persistence.nfs.galaxy.deployVolume -}}
+---
 apiVersion: v1
 kind: PersistentVolume
 metadata:
@@ -58,6 +59,5 @@ spec:
   claimRef:
     namespace: {{ .Release.Namespace }}
     name: {{ .Release.Name }}-galaxy-galaxy-pvc
----
 {{ end -}}
 {{ end -}}
diff --git a/galaxykubeman/templates/persistence.yaml b/galaxykubeman/templates/persistence.yaml
index a060610..52394be 100644
--- a/galaxykubeman/templates/persistence.yaml
+++ b/galaxykubeman/templates/persistence.yaml
@@ -1,5 +1,6 @@
 {{- range $key, $entry := .Values.persistence -}}
 {{- if $entry -}}
+---
 apiVersion: v1
 kind: PersistentVolumeClaim
 metadata:
@@ -42,10 +43,8 @@ spec:
   {{- tpl $nowhitespace $ | trim | nindent 2 -}}
   {{- end }}
 
----
-
 {{ if $entry.persistentVolume }}
-
+---
 apiVersion: v1
 kind: PersistentVolume
 metadata:
@@ -95,8 +94,6 @@ spec:
   {{- tpl $nowhitespace $ | trim | nindent 2 -}}
   {{- end }}
 
----
-
 {{ end -}}
 {{- end -}}
 {{- end -}}
diff --git a/galaxykubeman/templates/priority-class.yaml b/galaxykubeman/templates/priority-class.yaml
index ab36942..eac4084 100644
--- a/galaxykubeman/templates/priority-class.yaml
+++ b/galaxykubeman/templates/priority-class.yaml
@@ -1,3 +1,4 @@
+---
 apiVersion: scheduling.k8s.io/v1
 kind: PriorityClass
 metadata:
diff --git a/galaxykubeman/templates/rbac.yaml b/galaxykubeman/templates/rbac.yaml
index a3153fa..e31c631 100644
--- a/galaxykubeman/templates/rbac.yaml
+++ b/galaxykubeman/templates/rbac.yaml
@@ -1,4 +1,5 @@
 {{- if .Values.rbac.enabled }}
+---
 kind: Role
 apiVersion: rbac.authorization.k8s.io/v1
 metadata:
@@ -18,7 +19,6 @@ rules:
     verbs: ["*"]
 
 ---
-
 kind: RoleBinding
 apiVersion: rbac.authorization.k8s.io/v1
 metadata:
@@ -32,6 +32,4 @@ roleRef:
   apiGroup: rbac.authorization.k8s.io
   kind: Role
   name: {{ include "galaxykubeman.roleName" . }}
-
----
 {{- end -}}
diff --git a/galaxykubeman/templates/resource-quota.yaml b/galaxykubeman/templates/resource-quota.yaml
index 7a42533..5b90242 100644
--- a/galaxykubeman/templates/resource-quota.yaml
+++ b/galaxykubeman/templates/resource-quota.yaml
@@ -1,3 +1,4 @@
+---
 apiVersion: v1
 kind: ResourceQuota
 metadata:
diff --git a/galaxykubeman/templates/secrets.yaml b/galaxykubeman/templates/secrets.yaml
index 4934bbb..3ed1909 100644
--- a/galaxykubeman/templates/secrets.yaml
+++ b/galaxykubeman/templates/secrets.yaml
@@ -1,4 +1,5 @@
 {{- if .Values.secrets }}
+---
 apiVersion: v1
 metadata:
   name: {{ .Release.Name }}-galaxykubeman-secrets
@@ -16,5 +17,4 @@ stringData:
     {{ $secentry | indent 8 -}}
   {{- end -}}
   {{- end }}
----
 {{- end -}}
\ No newline at end of file