diff --git a/Chart.yaml b/Chart.yaml
index 7ba29d24..261ffa6d 100644
--- a/Chart.yaml
+++ b/Chart.yaml
@@ -1,7 +1,7 @@
 apiVersion: v1
 description: Puppet automates the delivery and operation of software.
 name: puppetserver
-version: 0.3.0
+version: 0.3.1
 appVersion: 6.7.1
 keywords: ["puppet", "puppetserver", "automation", "iac", "infrastructure", "cm", "ci", "cd"]
 home: https://puppet.com/
diff --git a/templates/postgres-deployment.yaml b/templates/postgres-deployment.yaml
index 74303b5c..81bb026e 100644
--- a/templates/postgres-deployment.yaml
+++ b/templates/postgres-deployment.yaml
@@ -52,13 +52,13 @@ spec:
             name: postgres-custom-extensions
     {{- if .Values.nodeSelector }}
       nodeSelector:
-{{ toYaml .Values.nodeSelector | indent 8 }}
+{{ toYaml .Values.nodeSelector | nindent 10 }}
     {{- end }}
     {{- if .Values.affinity }}
       affinity:
-{{ toYaml .Values.affinity | indent 8 }}
+{{ toYaml .Values.affinity | nindent 10 }}
     {{- end }}
     {{- if .Values.tolerations }}
       tolerations:
-{{ toYaml .Values.tolerations| indent 8 }}
+{{ toYaml .Values.tolerations| nindent 10 }}
     {{- end }}
diff --git a/templates/puppetboard-deployment.yaml b/templates/puppetboard-deployment.yaml
index 94259af9..6e114a3a 100644
--- a/templates/puppetboard-deployment.yaml
+++ b/templates/puppetboard-deployment.yaml
@@ -32,16 +32,16 @@ spec:
           ports:
             - name: puppetboard
               containerPort: 8000
-{{- end }}
     {{- if .Values.nodeSelector }}
       nodeSelector:
-{{ toYaml .Values.nodeSelector | indent 8 }}
+{{ toYaml .Values.nodeSelector | nindent 10 }}
     {{- end }}
     {{- if .Values.affinity }}
       affinity:
-{{ toYaml .Values.affinity | indent 8 }}
+{{ toYaml .Values.affinity | nindent 10 }}
     {{- end }}
     {{- if .Values.tolerations }}
       tolerations:
-{{ toYaml .Values.tolerations| indent 8 }}
+{{ toYaml .Values.tolerations| nindent 10 }}
     {{- end }}
+{{- end }}
diff --git a/templates/puppetdb-deployment.yaml b/templates/puppetdb-deployment.yaml
index 8100d697..86981037 100644
--- a/templates/puppetdb-deployment.yaml
+++ b/templates/puppetdb-deployment.yaml
@@ -49,13 +49,13 @@ spec:
             claimName: puppetdb-claim
     {{- if .Values.nodeSelector }}
       nodeSelector:
-{{ toYaml .Values.nodeSelector | indent 8 }}
+{{ toYaml .Values.nodeSelector | nindent 10 }}
     {{- end }}
     {{- if .Values.affinity }}
       affinity:
-{{ toYaml .Values.affinity | indent 8 }}
+{{ toYaml .Values.affinity | nindent 10 }}
     {{- end }}
     {{- if .Values.tolerations }}
       tolerations:
-{{ toYaml .Values.tolerations| indent 8 }}
+{{ toYaml .Values.tolerations| nindent 10 }}
     {{- end }}
diff --git a/templates/puppetserver-deployment.yaml b/templates/puppetserver-deployment.yaml
index 7bec1223..aaf48637 100644
--- a/templates/puppetserver-deployment.yaml
+++ b/templates/puppetserver-deployment.yaml
@@ -159,13 +159,13 @@ spec:
         {{- end -}}
     {{- if .Values.nodeSelector }}
       nodeSelector:
-{{ toYaml .Values.nodeSelector | indent 8 }}
+{{ toYaml .Values.nodeSelector | nindent 10 }}
     {{- end }}
     {{- if .Values.affinity }}
       affinity:
-{{ toYaml .Values.affinity | indent 8 }}
+{{ toYaml .Values.affinity | nindent 10 }}
     {{- end }}
     {{- if .Values.tolerations }}
       tolerations:
-{{ toYaml .Values.tolerations| indent 8 }}
+{{ toYaml .Values.tolerations| nindent 10 }}
     {{- end }}
diff --git a/templates/r10k-cronjob.yaml b/templates/r10k-cronjob.yaml
index f3ed1439..64e8e284 100644
--- a/templates/r10k-cronjob.yaml
+++ b/templates/r10k-cronjob.yaml
@@ -46,16 +46,16 @@ spec:
                 secretName: {{ template "r10k.secret" . }}
                 defaultMode: 288 # = mode 0440
             {{- end -}}
-{{- end }}
         {{- if .Values.nodeSelector }}
           nodeSelector:
-{{ toYaml .Values.nodeSelector | indent 8 }}
+{{ toYaml .Values.nodeSelector | nindent 14 }}
         {{- end }}
         {{- if .Values.affinity }}
           affinity:
-{{ toYaml .Values.affinity | indent 8 }}
+{{ toYaml .Values.affinity | nindent 14 }}
         {{- end }}
         {{- if .Values.tolerations }}
           tolerations:
-{{ toYaml .Values.tolerations| indent 8 }}
+{{ toYaml .Values.tolerations| nindent 14 }}
         {{- end }}
+{{- end }}
diff --git a/values.yaml b/values.yaml
index d0573950..74a92ed5 100644
--- a/values.yaml
+++ b/values.yaml
@@ -220,9 +220,9 @@ hiera:
   eyaml:
     ## A multi-line string
     ##
-    private_key:  # |-
+    private_key:  # |
       #  PRIV_KEY CONTENTS
     ## A multi-line string
     ##
-    public_key:  # |-
+    public_key:  # |
       #  PUB_KEY CONTENTS