diff --git a/deployment/kubernetes/templates/backend/ConfigMap.yml b/deployment/kubernetes/templates/backend/ConfigMap.yml
index a8c480abf..ec7a56658 100644
--- a/deployment/kubernetes/templates/backend/ConfigMap.yml
+++ b/deployment/kubernetes/templates/backend/ConfigMap.yml
@@ -6,7 +6,7 @@ metadata:
     app.kubernetes.io/name:	"{{ .Chart.Name }}"
     app.kubernetes.io/instance:	"{{ .Release.Name }}"
     app.kubernetes.io/version: "{{ .Chart.AppVersion }}"
-    app.kubernetes.io/component: "configmap backend"
+    app.kubernetes.io/component: "configmap-backend"
     app.kubernetes.io/part-of:	"{{ .Chart.Name }}"
     app.kubernetes.io/managed-by: "{{ .Release.Service }}"
     helm.sh/chart: "{{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }}"
diff --git a/deployment/kubernetes/templates/backend/Deployment.yaml b/deployment/kubernetes/templates/backend/Deployment.yaml
index 108a5d10a..3c606fa85 100644
--- a/deployment/kubernetes/templates/backend/Deployment.yaml
+++ b/deployment/kubernetes/templates/backend/Deployment.yaml
@@ -6,7 +6,7 @@ metadata:
     app.kubernetes.io/name:	"{{ .Chart.Name }}"
     app.kubernetes.io/instance:	"{{ .Release.Name }}"
     app.kubernetes.io/version: "{{ .Chart.AppVersion }}"
-    app.kubernetes.io/component: "deployment backend"
+    app.kubernetes.io/component: "deployment-backend"
     app.kubernetes.io/part-of:	"{{ .Chart.Name }}"
     app.kubernetes.io/managed-by: "{{ .Release.Service }}"
     helm.sh/chart: "{{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }}"
diff --git a/deployment/kubernetes/templates/backend/PersistentVolumeClaim.yaml b/deployment/kubernetes/templates/backend/PersistentVolumeClaim.yaml
index d75b2f252..758e9e18c 100644
--- a/deployment/kubernetes/templates/backend/PersistentVolumeClaim.yaml
+++ b/deployment/kubernetes/templates/backend/PersistentVolumeClaim.yaml
@@ -6,7 +6,7 @@ metadata:
     app.kubernetes.io/name:	"{{ .Chart.Name }}"
     app.kubernetes.io/instance:	"{{ .Release.Name }}"
     app.kubernetes.io/version: "{{ .Chart.AppVersion }}"
-    app.kubernetes.io/component: "volume-claim backend"
+    app.kubernetes.io/component: "volume-claim-backend"
     app.kubernetes.io/part-of:	"{{ .Chart.Name }}"
     app.kubernetes.io/managed-by: "{{ .Release.Service }}"
     helm.sh/chart: "{{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }}"
diff --git a/deployment/kubernetes/templates/backend/Secret.yaml b/deployment/kubernetes/templates/backend/Secret.yaml
index a24941ebe..51e5516c2 100644
--- a/deployment/kubernetes/templates/backend/Secret.yaml
+++ b/deployment/kubernetes/templates/backend/Secret.yaml
@@ -6,7 +6,7 @@ metadata:
     app.kubernetes.io/name:	"{{ .Chart.Name }}"
     app.kubernetes.io/instance:	"{{ .Release.Name }}"
     app.kubernetes.io/version: "{{ .Chart.AppVersion }}"
-    app.kubernetes.io/component: "secret backend"
+    app.kubernetes.io/component: "secret-backend"
     app.kubernetes.io/part-of:	"{{ .Chart.Name }}"
     app.kubernetes.io/managed-by: "{{ .Release.Service }}"
     helm.sh/chart: "{{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }}"
diff --git a/deployment/kubernetes/templates/backend/Service.yaml b/deployment/kubernetes/templates/backend/Service.yaml
index 0098589fd..9029be586 100644
--- a/deployment/kubernetes/templates/backend/Service.yaml
+++ b/deployment/kubernetes/templates/backend/Service.yaml
@@ -6,7 +6,7 @@ metadata:
     app.kubernetes.io/name:	"{{ .Chart.Name }}"
     app.kubernetes.io/instance:	"{{ .Release.Name }}"
     app.kubernetes.io/version: "{{ .Chart.AppVersion }}"
-    app.kubernetes.io/component: "service backend"
+    app.kubernetes.io/component: "service-backend"
     app.kubernetes.io/part-of:	"{{ .Chart.Name }}"
     app.kubernetes.io/managed-by: "{{ .Release.Service }}"
     helm.sh/chart: "{{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }}"
diff --git a/deployment/kubernetes/templates/jobs/job-db-init.yaml b/deployment/kubernetes/templates/jobs/job-db-init.yaml
index 6536d3ac7..f207bd8c1 100644
--- a/deployment/kubernetes/templates/jobs/job-db-init.yaml
+++ b/deployment/kubernetes/templates/jobs/job-db-init.yaml
@@ -6,7 +6,7 @@ metadata:
     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/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 "+" "_" }}"
diff --git a/deployment/kubernetes/templates/maintenance/ConfigMap.yml b/deployment/kubernetes/templates/maintenance/ConfigMap.yml
index 91d50e60f..fe29afbfe 100644
--- a/deployment/kubernetes/templates/maintenance/ConfigMap.yml
+++ b/deployment/kubernetes/templates/maintenance/ConfigMap.yml
@@ -6,7 +6,7 @@ metadata:
     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/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 "+" "_" }}"
diff --git a/deployment/kubernetes/templates/maintenance/Secret.yaml b/deployment/kubernetes/templates/maintenance/Secret.yaml
index fa8129915..b4752e552 100644
--- a/deployment/kubernetes/templates/maintenance/Secret.yaml
+++ b/deployment/kubernetes/templates/maintenance/Secret.yaml
@@ -6,7 +6,7 @@ metadata:
     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/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 "+" "_" }}"
diff --git a/deployment/kubernetes/templates/maintenance/Service.yaml b/deployment/kubernetes/templates/maintenance/Service.yaml
index f924bafe6..95f042df5 100644
--- a/deployment/kubernetes/templates/maintenance/Service.yaml
+++ b/deployment/kubernetes/templates/maintenance/Service.yaml
@@ -6,7 +6,7 @@ metadata:
     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/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 "+" "_" }}"
diff --git a/deployment/kubernetes/templates/neo4j/ConfigMap.yml b/deployment/kubernetes/templates/neo4j/ConfigMap.yml
index e4371f035..9f0aa4bee 100644
--- a/deployment/kubernetes/templates/neo4j/ConfigMap.yml
+++ b/deployment/kubernetes/templates/neo4j/ConfigMap.yml
@@ -6,7 +6,7 @@ metadata:
     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/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 "+" "_" }}"
diff --git a/deployment/kubernetes/templates/neo4j/Deployment.yaml b/deployment/kubernetes/templates/neo4j/Deployment.yaml
index 23ae8d8d7..dc3ec902d 100644
--- a/deployment/kubernetes/templates/neo4j/Deployment.yaml
+++ b/deployment/kubernetes/templates/neo4j/Deployment.yaml
@@ -6,7 +6,7 @@ metadata:
     app.kubernetes.io/name:	"{{ .Chart.Name }}"
     app.kubernetes.io/instance:	"{{ .Release.Name }}"
     app.kubernetes.io/version: "{{ .Chart.AppVersion }}"
-    app.kubernetes.io/component: "deployment neo4j"
+    app.kubernetes.io/component: "deployment-neo4j"
     app.kubernetes.io/part-of:	"{{ .Chart.Name }}"
     app.kubernetes.io/managed-by: "{{ .Release.Service }}"
     helm.sh/chart: "{{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }}"
diff --git a/deployment/kubernetes/templates/neo4j/PersistentVolumeClaim.yaml b/deployment/kubernetes/templates/neo4j/PersistentVolumeClaim.yaml
index e946f2610..3aab02d9f 100644
--- a/deployment/kubernetes/templates/neo4j/PersistentVolumeClaim.yaml
+++ b/deployment/kubernetes/templates/neo4j/PersistentVolumeClaim.yaml
@@ -6,7 +6,7 @@ metadata:
     app.kubernetes.io/name:	"{{ .Chart.Name }}"
     app.kubernetes.io/instance:	"{{ .Release.Name }}"
     app.kubernetes.io/version: "{{ .Chart.AppVersion }}"
-    app.kubernetes.io/component: "volume-claim neo4j"
+    app.kubernetes.io/component: "volume-claim-neo4j"
     app.kubernetes.io/part-of:	"{{ .Chart.Name }}"
     app.kubernetes.io/managed-by: "{{ .Release.Service }}"
     helm.sh/chart: "{{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }}"
diff --git a/deployment/kubernetes/templates/neo4j/Secret.yaml b/deployment/kubernetes/templates/neo4j/Secret.yaml
index 68abd52d2..d8b1c17db 100644
--- a/deployment/kubernetes/templates/neo4j/Secret.yaml
+++ b/deployment/kubernetes/templates/neo4j/Secret.yaml
@@ -6,7 +6,7 @@ metadata:
     app.kubernetes.io/name:	"{{ .Chart.Name }}"
     app.kubernetes.io/instance:	"{{ .Release.Name }}"
     app.kubernetes.io/version: "{{ .Chart.AppVersion }}"
-    app.kubernetes.io/component: "secret neo4j"
+    app.kubernetes.io/component: "secret-neo4j"
     app.kubernetes.io/part-of:	"{{ .Chart.Name }}"
     app.kubernetes.io/managed-by: "{{ .Release.Service }}"
     helm.sh/chart: "{{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }}"
diff --git a/deployment/kubernetes/templates/neo4j/Service.yaml b/deployment/kubernetes/templates/neo4j/Service.yaml
index d6bef364a..4ed56bd3f 100644
--- a/deployment/kubernetes/templates/neo4j/Service.yaml
+++ b/deployment/kubernetes/templates/neo4j/Service.yaml
@@ -6,7 +6,7 @@ metadata:
     app.kubernetes.io/name:	"{{ .Chart.Name }}"
     app.kubernetes.io/instance:	"{{ .Release.Name }}"
     app.kubernetes.io/version: "{{ .Chart.AppVersion }}"
-    app.kubernetes.io/component: "service neo4j"
+    app.kubernetes.io/component: "service-neo4j"
     app.kubernetes.io/part-of:	"{{ .Chart.Name }}"
     app.kubernetes.io/managed-by: "{{ .Release.Service }}"
     helm.sh/chart: "{{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }}"
diff --git a/deployment/kubernetes/templates/storage/persistent.yml b/deployment/kubernetes/templates/storage/persistent.yml
index d067dd3ad..2ac07c5de 100644
--- a/deployment/kubernetes/templates/storage/persistent.yml
+++ b/deployment/kubernetes/templates/storage/persistent.yml
@@ -6,7 +6,7 @@ metadata:
     app.kubernetes.io/name:       "{{ .Chart.Name }}"
     app.kubernetes.io/instance:   "{{ .Release.Name }}"
     app.kubernetes.io/version:    "{{ .Chart.AppVersion }}"
-    app.kubernetes.io/component:  "persistent storage"
+    app.kubernetes.io/component:  "storage-persistent"
     app.kubernetes.io/part-of:    "{{ .Chart.Name }}"
     app.kubernetes.io/managed-by: "{{ .Release.Service }}"
     helm.sh/chart:                "{{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }}"
diff --git a/deployment/kubernetes/templates/webapp/ConfigMap.yml b/deployment/kubernetes/templates/webapp/ConfigMap.yml
index ba955ef6d..e7093e680 100644
--- a/deployment/kubernetes/templates/webapp/ConfigMap.yml
+++ b/deployment/kubernetes/templates/webapp/ConfigMap.yml
@@ -6,7 +6,7 @@ metadata:
     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/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 "+" "_" }}"
diff --git a/deployment/kubernetes/templates/webapp/Deployment.yaml b/deployment/kubernetes/templates/webapp/Deployment.yaml
index c12b08e8d..e418343ed 100644
--- a/deployment/kubernetes/templates/webapp/Deployment.yaml
+++ b/deployment/kubernetes/templates/webapp/Deployment.yaml
@@ -6,7 +6,7 @@ metadata:
     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/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 "+" "_" }}"
diff --git a/deployment/kubernetes/templates/webapp/Ingress.yaml b/deployment/kubernetes/templates/webapp/Ingress.yaml
index 12957443c..00c8f94ed 100644
--- a/deployment/kubernetes/templates/webapp/Ingress.yaml
+++ b/deployment/kubernetes/templates/webapp/Ingress.yaml
@@ -6,7 +6,7 @@ metadata:
     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/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 "+" "_" }}"
diff --git a/deployment/kubernetes/templates/webapp/Secret.yaml b/deployment/kubernetes/templates/webapp/Secret.yaml
index 8cf937ce6..15b1db4f6 100644
--- a/deployment/kubernetes/templates/webapp/Secret.yaml
+++ b/deployment/kubernetes/templates/webapp/Secret.yaml
@@ -6,7 +6,7 @@ metadata:
     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/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 "+" "_" }}"
diff --git a/deployment/kubernetes/templates/webapp/Service.yaml b/deployment/kubernetes/templates/webapp/Service.yaml
index 832ec757d..0c3112e77 100644
--- a/deployment/kubernetes/templates/webapp/Service.yaml
+++ b/deployment/kubernetes/templates/webapp/Service.yaml
@@ -6,7 +6,7 @@ metadata:
     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/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 "+" "_" }}"