diff --git a/deployment/kubernetes/templates/jobs/job-db-init.yaml b/deployment/kubernetes/templates/jobs/job-db-init.yaml
index 6f2966edd..6536d3ac7 100644
--- a/deployment/kubernetes/templates/jobs/job-db-init.yaml
+++ b/deployment/kubernetes/templates/jobs/job-db-init.yaml
@@ -3,13 +3,13 @@ apiVersion: batch/v1
 metadata:
   name: job-{{ .Release.Name }}-db-init
   labels:
-    app.kubernetes.io/name:	"{{ .Chart.Name }}"
-    app.kubernetes.io/instance:	"{{ .Release.Name }}"
-    app.kubernetes.io/version: "{{ .Chart.AppVersion }}"
-    app.kubernetes.io/component: "job db-init"
-    app.kubernetes.io/part-of:	"{{ .Chart.Name }}"
+    app.kubernetes.io/name:       "{{ .Chart.Name }}"
+    app.kubernetes.io/instance:   "{{ .Release.Name }}"
+    app.kubernetes.io/version:    "{{ .Chart.AppVersion }}"
+    app.kubernetes.io/component:  "job db-init"
+    app.kubernetes.io/part-of:    "{{ .Chart.Name }}"
     app.kubernetes.io/managed-by: "{{ .Release.Service }}"
-    helm.sh/chart: "{{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }}"
+    helm.sh/chart:                "{{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }}"
   annotations:
     "helm.sh/hook": post-install
     "helm.sh/hook-delete-policy": hook-succeeded, hook-failed
diff --git a/deployment/kubernetes/templates/maintenance/ConfigMap.yml b/deployment/kubernetes/templates/maintenance/ConfigMap.yml
index 9d845c066..91d50e60f 100644
--- a/deployment/kubernetes/templates/maintenance/ConfigMap.yml
+++ b/deployment/kubernetes/templates/maintenance/ConfigMap.yml
@@ -3,12 +3,12 @@ apiVersion: v1
 metadata:
   name: configmap-{{ .Release.Name }}-maintenance
   labels:
-    app.kubernetes.io/name:	"{{ .Chart.Name }}"
-    app.kubernetes.io/instance:	"{{ .Release.Name }}"
-    app.kubernetes.io/version: "{{ .Chart.AppVersion }}"
-    app.kubernetes.io/component: "configmap maintenance"
-    app.kubernetes.io/part-of:	"{{ .Chart.Name }}"
+    app.kubernetes.io/name:       "{{ .Chart.Name }}"
+    app.kubernetes.io/instance:   "{{ .Release.Name }}"
+    app.kubernetes.io/version:    "{{ .Chart.AppVersion }}"
+    app.kubernetes.io/component:  "configmap maintenance"
+    app.kubernetes.io/part-of:    "{{ .Chart.Name }}"
     app.kubernetes.io/managed-by: "{{ .Release.Service }}"
-    helm.sh/chart: "{{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }}"
+    helm.sh/chart:                "{{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }}"
 data:
   HOST: "0.0.0.0"
\ No newline at end of file
diff --git a/deployment/kubernetes/templates/maintenance/Secret.yaml b/deployment/kubernetes/templates/maintenance/Secret.yaml
index 420330c69..fa8129915 100644
--- a/deployment/kubernetes/templates/maintenance/Secret.yaml
+++ b/deployment/kubernetes/templates/maintenance/Secret.yaml
@@ -3,11 +3,11 @@ apiVersion: v1
 metadata:
   name: secret-{{ .Release.Name }}-maintenance
   labels:
-    app.kubernetes.io/name:	"{{ .Chart.Name }}"
-    app.kubernetes.io/instance:	"{{ .Release.Name }}"
-    app.kubernetes.io/version: "{{ .Chart.AppVersion }}"
-    app.kubernetes.io/component: "secret maintenance"
-    app.kubernetes.io/part-of:	"{{ .Chart.Name }}"
+    app.kubernetes.io/name:       "{{ .Chart.Name }}"
+    app.kubernetes.io/instance:   "{{ .Release.Name }}"
+    app.kubernetes.io/version:    "{{ .Chart.AppVersion }}"
+    app.kubernetes.io/component:  "secret maintenance"
+    app.kubernetes.io/part-of:    "{{ .Chart.Name }}"
     app.kubernetes.io/managed-by: "{{ .Release.Service }}"
-    helm.sh/chart: "{{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }}"
+    helm.sh/chart:                "{{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }}"
 stringData:
diff --git a/deployment/kubernetes/templates/maintenance/Service.yaml b/deployment/kubernetes/templates/maintenance/Service.yaml
index 40a96f663..f924bafe6 100644
--- a/deployment/kubernetes/templates/maintenance/Service.yaml
+++ b/deployment/kubernetes/templates/maintenance/Service.yaml
@@ -3,13 +3,13 @@ apiVersion: v1
 metadata:
   name: {{ .Release.Name }}-maintenance
   labels:
-    app.kubernetes.io/name:	"{{ .Chart.Name }}"
-    app.kubernetes.io/instance:	"{{ .Release.Name }}"
-    app.kubernetes.io/version: "{{ .Chart.AppVersion }}"
-    app.kubernetes.io/component: "service maintenance"
-    app.kubernetes.io/part-of:	"{{ .Chart.Name }}"
+    app.kubernetes.io/name:       "{{ .Chart.Name }}"
+    app.kubernetes.io/instance:   "{{ .Release.Name }}"
+    app.kubernetes.io/version:    "{{ .Chart.AppVersion }}"
+    app.kubernetes.io/component:  "service maintenance"
+    app.kubernetes.io/part-of:    "{{ .Chart.Name }}"
     app.kubernetes.io/managed-by: "{{ .Release.Service }}"
-    helm.sh/chart: "{{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }}"
+    helm.sh/chart:                "{{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }}"
 spec:
   ports:
     - name: {{ .Release.Name }}-http
diff --git a/deployment/kubernetes/templates/neo4j/ConfigMap.yml b/deployment/kubernetes/templates/neo4j/ConfigMap.yml
index 3a14b8c73..e4371f035 100644
--- a/deployment/kubernetes/templates/neo4j/ConfigMap.yml
+++ b/deployment/kubernetes/templates/neo4j/ConfigMap.yml
@@ -3,13 +3,13 @@ apiVersion: v1
 metadata:
   name: configmap-{{ .Release.Name }}-neo4j
   labels:
-    app.kubernetes.io/name:	"{{ .Chart.Name }}"
-    app.kubernetes.io/instance:	"{{ .Release.Name }}"
-    app.kubernetes.io/version: "{{ .Chart.AppVersion }}"
-    app.kubernetes.io/component: "configmap neo4j"
-    app.kubernetes.io/part-of:	"{{ .Chart.Name }}"
+    app.kubernetes.io/name:       "{{ .Chart.Name }}"
+    app.kubernetes.io/instance:   "{{ .Release.Name }}"
+    app.kubernetes.io/version:    "{{ .Chart.AppVersion }}"
+    app.kubernetes.io/component:  "configmap neo4j"
+    app.kubernetes.io/part-of:    "{{ .Chart.Name }}"
     app.kubernetes.io/managed-by: "{{ .Release.Service }}"
-    helm.sh/chart: "{{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }}"
+    helm.sh/chart:                "{{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }}"
 data:
   NEO4J_ACCEPT_LICENSE_AGREEMENT: "{{ .Values.NEO4J.ACCEPT_LICENSE_AGREEMENT }}"
   NEO4J_AUTH: "{{ .Values.NEO4J.AUTH }}"
diff --git a/deployment/kubernetes/templates/webapp/ConfigMap.yml b/deployment/kubernetes/templates/webapp/ConfigMap.yml
index 491b7d1b1..ba955ef6d 100644
--- a/deployment/kubernetes/templates/webapp/ConfigMap.yml
+++ b/deployment/kubernetes/templates/webapp/ConfigMap.yml
@@ -3,13 +3,13 @@ apiVersion: v1
 metadata:
   name: configmap-{{ .Release.Name }}-webapp
   labels:
-    app.kubernetes.io/name:	"{{ .Chart.Name }}"
-    app.kubernetes.io/instance:	"{{ .Release.Name }}"
-    app.kubernetes.io/version: "{{ .Chart.AppVersion }}"
-    app.kubernetes.io/component: "configmap webapp"
-    app.kubernetes.io/part-of:	"{{ .Chart.Name }}"
+    app.kubernetes.io/name:       "{{ .Chart.Name }}"
+    app.kubernetes.io/instance:   "{{ .Release.Name }}"
+    app.kubernetes.io/version:    "{{ .Chart.AppVersion }}"
+    app.kubernetes.io/component:  "configmap webapp"
+    app.kubernetes.io/part-of:    "{{ .Chart.Name }}"
     app.kubernetes.io/managed-by: "{{ .Release.Service }}"
-    helm.sh/chart: "{{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }}"
+    helm.sh/chart:                "{{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }}"
 data:
   HOST: "0.0.0.0"
   PUBLIC_REGISTRATION: "{{ .Values.PUBLIC_REGISTRATION }}"
diff --git a/deployment/kubernetes/templates/webapp/Deployment.yaml b/deployment/kubernetes/templates/webapp/Deployment.yaml
index a5b2fcfb5..c12b08e8d 100644
--- a/deployment/kubernetes/templates/webapp/Deployment.yaml
+++ b/deployment/kubernetes/templates/webapp/Deployment.yaml
@@ -3,13 +3,13 @@ apiVersion: apps/v1
 metadata:
   name:  {{ .Release.Name }}-webapp
   labels:
-    app.kubernetes.io/name:	"{{ .Chart.Name }}"
-    app.kubernetes.io/instance:	"{{ .Release.Name }}"
-    app.kubernetes.io/version: "{{ .Chart.AppVersion }}"
-    app.kubernetes.io/component: "deployment webapp"
-    app.kubernetes.io/part-of:	"{{ .Chart.Name }}"
+    app.kubernetes.io/name:       "{{ .Chart.Name }}"
+    app.kubernetes.io/instance:   "{{ .Release.Name }}"
+    app.kubernetes.io/version:    "{{ .Chart.AppVersion }}"
+    app.kubernetes.io/component:  "deployment webapp"
+    app.kubernetes.io/part-of:    "{{ .Chart.Name }}"
     app.kubernetes.io/managed-by: "{{ .Release.Service }}"
-    helm.sh/chart: "{{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }}"
+    helm.sh/chart:                "{{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }}"
 spec:
   replicas: {{ .Values.WEBAPP.REPLICAS }}
   minReadySeconds: {{ .Values.WEBAPP.MIN_READY_SECONDS }}
diff --git a/deployment/kubernetes/templates/webapp/Ingress.yaml b/deployment/kubernetes/templates/webapp/Ingress.yaml
index ec0621027..12957443c 100644
--- a/deployment/kubernetes/templates/webapp/Ingress.yaml
+++ b/deployment/kubernetes/templates/webapp/Ingress.yaml
@@ -3,13 +3,13 @@ apiVersion: networking.k8s.io/v1
 metadata:
   name:  ingress-{{ .Release.Name }}-webapp
   labels:
-    app.kubernetes.io/name:	"{{ .Chart.Name }}"
-    app.kubernetes.io/instance:	"{{ .Release.Name }}"
-    app.kubernetes.io/version: "{{ .Chart.AppVersion }}"
-    app.kubernetes.io/component: "ingress webapp"
-    app.kubernetes.io/part-of:	"{{ .Chart.Name }}"
+    app.kubernetes.io/name:       "{{ .Chart.Name }}"
+    app.kubernetes.io/instance:   "{{ .Release.Name }}"
+    app.kubernetes.io/version:    "{{ .Chart.AppVersion }}"
+    app.kubernetes.io/component:  "ingress webapp"
+    app.kubernetes.io/part-of:    "{{ .Chart.Name }}"
     app.kubernetes.io/managed-by: "{{ .Release.Service }}"
-    helm.sh/chart: "{{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }}"
+    helm.sh/chart:                "{{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }}"
   annotations:
     kubernetes.io/ingress.class: "nginx"
     cert-manager.io/cluster-issuer: {{ .Values.LETSENCRYPT.ISSUER }}
diff --git a/deployment/kubernetes/templates/webapp/Secret.yaml b/deployment/kubernetes/templates/webapp/Secret.yaml
index a2e22563c..8cf937ce6 100644
--- a/deployment/kubernetes/templates/webapp/Secret.yaml
+++ b/deployment/kubernetes/templates/webapp/Secret.yaml
@@ -3,11 +3,11 @@ apiVersion: v1
 metadata:
   name: secret-{{ .Release.Name }}-webapp
   labels:
-    app.kubernetes.io/name:	"{{ .Chart.Name }}"
-    app.kubernetes.io/instance:	"{{ .Release.Name }}"
-    app.kubernetes.io/version: "{{ .Chart.AppVersion }}"
-    app.kubernetes.io/component: "secret webapp"
-    app.kubernetes.io/part-of:	"{{ .Chart.Name }}"
+    app.kubernetes.io/name:       "{{ .Chart.Name }}"
+    app.kubernetes.io/instance:   "{{ .Release.Name }}"
+    app.kubernetes.io/version:    "{{ .Chart.AppVersion }}"
+    app.kubernetes.io/component:  "secret webapp"
+    app.kubernetes.io/part-of:    "{{ .Chart.Name }}"
     app.kubernetes.io/managed-by: "{{ .Release.Service }}"
-    helm.sh/chart: "{{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }}"
+    helm.sh/chart:                "{{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }}"
 stringData:
diff --git a/deployment/kubernetes/templates/webapp/Service.yaml b/deployment/kubernetes/templates/webapp/Service.yaml
index 563a59693..832ec757d 100644
--- a/deployment/kubernetes/templates/webapp/Service.yaml
+++ b/deployment/kubernetes/templates/webapp/Service.yaml
@@ -3,13 +3,13 @@ apiVersion: v1
 metadata:
   name: {{ .Release.Name }}-webapp
   labels:
-    app.kubernetes.io/name:	"{{ .Chart.Name }}"
-    app.kubernetes.io/instance:	"{{ .Release.Name }}"
-    app.kubernetes.io/version: "{{ .Chart.AppVersion }}"
-    app.kubernetes.io/component: "service webapp"
-    app.kubernetes.io/part-of:	"{{ .Chart.Name }}"
+    app.kubernetes.io/name:       "{{ .Chart.Name }}"
+    app.kubernetes.io/instance:   "{{ .Release.Name }}"
+    app.kubernetes.io/version:    "{{ .Chart.AppVersion }}"
+    app.kubernetes.io/component:  "service webapp"
+    app.kubernetes.io/part-of:    "{{ .Chart.Name }}"
     app.kubernetes.io/managed-by: "{{ .Release.Service }}"
-    helm.sh/chart: "{{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }}"
+    helm.sh/chart:                "{{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }}"
 spec:
   ports:
     - name: {{ .Release.Name }}-http