diff --git a/.yamllint.yaml b/.yamllint.yaml
index fff66c5d..5b315dc4 100644
--- a/.yamllint.yaml
+++ b/.yamllint.yaml
@@ -13,6 +13,7 @@ rules:
     check-keys: false
   comments:
     min-spaces-from-content: 1  # Needed due to https://github.com/adrienverge/yamllint/issues/443
+  comments-indentation: disable # This is generally useless and interferes with commented example values
 
 yaml-files:
   - '*.yaml'
diff --git a/template/.yamllint.yaml b/template/.yamllint.yaml
index 769cda16..08bf167f 100644
--- a/template/.yamllint.yaml
+++ b/template/.yamllint.yaml
@@ -12,3 +12,4 @@ rules:
     min-spaces-from-content: 1  # Needed due to https://github.com/adrienverge/yamllint/issues/443
   indentation:
     indent-sequences: consistent
+  comments-indentation: disable # This is generally useless and interferes with commented example values
diff --git a/template/deploy/helm/[[operator]]/templates/deployment.yaml.j2 b/template/deploy/helm/[[operator]]/templates/deployment.yaml.j2
index 06bfbe78..1654f9b5 100644
--- a/template/deploy/helm/[[operator]]/templates/deployment.yaml.j2
+++ b/template/deploy/helm/[[operator]]/templates/deployment.yaml.j2
@@ -104,6 +104,9 @@ spec:
       tolerations:
         {{- toYaml . | nindent 8 }}
       {{- end }}
+      {{- with .Values.priorityClassName }}
+      priorityClassName: {{ . }}
+      {{- end }}
 {[% else %}]
 # Templated Deployment disabled for this operator
 {[% endif %}]