diff --git a/library/common/1.0.0/templates/class/_cronjob.tpl b/library/common/1.0.0/templates/class/_cronjob.tpl
index 82f1e3f8bf..74147b73cb 100644
--- a/library/common/1.0.0/templates/class/_cronjob.tpl
+++ b/library/common/1.0.0/templates/class/_cronjob.tpl
@@ -30,7 +30,7 @@ spec:
   {{- include "ix.v1.common.lib.workload.cronjobSpec" (dict "rootCtx" $rootCtx "objectData" $objectData) | nindent 2 }}
       selector:
         matchLabels:
-          {{- include "ix.v1.common.lib.metadata.selectorLabels" (dict "rootCtx" $rootCtx "objectType" "pod" "objectName" $objectData.shortName) | nindent 10 }}
+          {{- include "ix.v1.common.lib.metadata.selectorLabels" (dict "rootCtx" $rootCtx "objectType" "pod" "objectName" $objectData.shortName) | trim | nindent 10 }}
       template:
         metadata:
             {{- $labels := (mustMerge ($objectData.podSpec.labels | default dict)
diff --git a/library/common/1.0.0/templates/class/_daemonset.tpl b/library/common/1.0.0/templates/class/_daemonset.tpl
index 611affd140..35b8b29168 100644
--- a/library/common/1.0.0/templates/class/_daemonset.tpl
+++ b/library/common/1.0.0/templates/class/_daemonset.tpl
@@ -30,7 +30,7 @@ spec:
   {{- include "ix.v1.common.lib.workload.daemonsetSpec" (dict "rootCtx" $rootCtx "objectData" $objectData) | nindent 2 }}
   selector:
     matchLabels:
-      {{- include "ix.v1.common.lib.metadata.selectorLabels" (dict "rootCtx" $rootCtx "objectType" "pod" "objectName" $objectData.shortName) | nindent 6 }}
+      {{- include "ix.v1.common.lib.metadata.selectorLabels" (dict "rootCtx" $rootCtx "objectType" "pod" "objectName" $objectData.shortName) | trim | nindent 6 }}
   template:
     metadata:
         {{- $labels := (mustMerge ($objectData.podSpec.labels | default dict)
diff --git a/library/common/1.0.0/templates/class/_deployment.tpl b/library/common/1.0.0/templates/class/_deployment.tpl
index 630ef659f1..c707acaef9 100644
--- a/library/common/1.0.0/templates/class/_deployment.tpl
+++ b/library/common/1.0.0/templates/class/_deployment.tpl
@@ -30,7 +30,7 @@ spec:
   {{- include "ix.v1.common.lib.workload.deploymentSpec" (dict "rootCtx" $rootCtx "objectData" $objectData) | nindent 2 }}
   selector:
     matchLabels:
-      {{- include "ix.v1.common.lib.metadata.selectorLabels" (dict "rootCtx" $rootCtx "objectType" "pod" "objectName" $objectData.shortName) | nindent 6 }}
+      {{- include "ix.v1.common.lib.metadata.selectorLabels" (dict "rootCtx" $rootCtx "objectType" "pod" "objectName" $objectData.shortName) | trim | nindent 6 }}
   template:
     metadata:
         {{- $labels := (mustMerge ($objectData.podSpec.labels | default dict)
diff --git a/library/common/1.0.0/templates/class/_job.tpl b/library/common/1.0.0/templates/class/_job.tpl
index 41b8e835e3..ac4c479d85 100644
--- a/library/common/1.0.0/templates/class/_job.tpl
+++ b/library/common/1.0.0/templates/class/_job.tpl
@@ -30,7 +30,7 @@ spec:
   {{- include "ix.v1.common.lib.workload.jobSpec" (dict "rootCtx" $rootCtx "objectData" $objectData) | nindent 2 }}
   selector:
     matchLabels:
-      {{- include "ix.v1.common.lib.metadata.selectorLabels" (dict "rootCtx" $rootCtx "objectType" "pod" "objectName" $objectData.shortName) | nindent 6 }}
+      {{- include "ix.v1.common.lib.metadata.selectorLabels" (dict "rootCtx" $rootCtx "objectType" "pod" "objectName" $objectData.shortName) | trim | nindent 6 }}
   template:
     metadata:
         {{- $labels := (mustMerge ($objectData.podSpec.labels | default dict)
diff --git a/library/common/1.0.0/templates/class/_statefulset.tpl b/library/common/1.0.0/templates/class/_statefulset.tpl
index ca54e45973..2e53d80cbf 100644
--- a/library/common/1.0.0/templates/class/_statefulset.tpl
+++ b/library/common/1.0.0/templates/class/_statefulset.tpl
@@ -30,7 +30,7 @@ spec:
   {{- include "ix.v1.common.lib.workload.statefulsetSpec" (dict "rootCtx" $rootCtx "objectData" $objectData) | nindent 2 }}
   selector:
     matchLabels:
-      {{- include "ix.v1.common.lib.metadata.selectorLabels" (dict "rootCtx" $rootCtx "objectType" "pod" "objectName" $objectData.shortName) | nindent 6 }}
+      {{- include "ix.v1.common.lib.metadata.selectorLabels" (dict "rootCtx" $rootCtx "objectType" "pod" "objectName" $objectData.shortName) | trim | nindent 6 }}
   template:
     metadata:
         {{- $labels := (mustMerge ($objectData.podSpec.labels | default dict)