diff --git a/chart/jenkins-operator/Chart.yaml b/chart/jenkins-operator/Chart.yaml
index 66216f79..f72667fd 100644
--- a/chart/jenkins-operator/Chart.yaml
+++ b/chart/jenkins-operator/Chart.yaml
@@ -2,5 +2,5 @@ apiVersion: v2
 appVersion: "0.4.0"
 description: Kubernetes native operator which fully manages Jenkins on Kubernetes
 name: jenkins-operator
-version: 0.3.0
+version: 0.3.1
 icon: https://raw.githubusercontent.com/jenkinsci/kubernetes-operator/master/assets/jenkins-operator-icon.png
diff --git a/chart/jenkins-operator/templates/jenkins.yaml b/chart/jenkins-operator/templates/jenkins.yaml
index 17b7e5ae..e49f4f39 100644
--- a/chart/jenkins-operator/templates/jenkins.yaml
+++ b/chart/jenkins-operator/templates/jenkins.yaml
@@ -10,26 +10,30 @@ metadata:
 spec:
   configurationAsCode:
     configurations:
-      {{- range .Values.jenkins.configuration.configurationAsCode }}
+    {{- range .Values.jenkins.configuration.configurationAsCode }}
     - name: {{ .configMapName }}
-      {{- end }}
+    {{- end }}
+    {{- if .Values.jenkins.configuration.configurationAsCode }}
     secret:
       {{- if .Values.jenkins.configuration.secretRefName }}
       name: {{ .Values.jenkins.configuration.secretRefName }}
-      {{ else if .Values.jenkins.configuration.secretData }}
+      {{- else if .Values.jenkins.configuration.secretData }}
       name: jenkins-{{ .Values.jenkins.name }}
       {{- end }}
+    {{- end }}
   groovyScripts:
     configurations:
-      {{- range .Values.jenkins.configuration.groovyScripts }}
+    {{- range .Values.jenkins.configuration.groovyScripts }}
     - name: {{ .configMapName }}
-      {{- end }}
+    {{- end }}
+    {{- if .Values.jenkins.configuration.groovyScripts }}
     secret:
       {{- if .Values.jenkins.configuration.secretRefName }}
       name: {{ .Values.jenkins.configuration.secretRefName }}
-      {{ else if .Values.jenkins.configuration.secretData }}
+      {{- else if .Values.jenkins.configuration.secretData }}
       name: jenkins-{{ .Values.jenkins.name }}
       {{- end }}
+    {{- end }}
   {{- if .Values.jenkins.backup.enabled }}
   backup:
     containerName: {{ .Values.jenkins.backup.containerName }}