diff --git a/charts/generic/Chart.yaml b/charts/generic/Chart.yaml
index 2cb6650..a93006e 100644
--- a/charts/generic/Chart.yaml
+++ b/charts/generic/Chart.yaml
@@ -1,4 +1,4 @@
 apiVersion: v2
 name: generic
 description: Generic Chart
-version: 1.6.0
+version: 1.6.1
diff --git a/charts/generic/templates/cronjobs.yaml b/charts/generic/templates/cronjobs.yaml
index 66fafda..ed9acbc 100644
--- a/charts/generic/templates/cronjobs.yaml
+++ b/charts/generic/templates/cronjobs.yaml
@@ -12,7 +12,7 @@ metadata:
   {{- end }}
   labels:
     {{ include "generic.labels" $ | indent 4 }}
-    {{- with .labels }}
+    {{- with $cronjob.labels }}
     {{ toYaml . | indent 4 }}
     {{- end }}
   {{- with .annotations }}
diff --git a/charts/generic/templates/deployment.yaml b/charts/generic/templates/deployment.yaml
index 6e315f3..a80cfc8 100644
--- a/charts/generic/templates/deployment.yaml
+++ b/charts/generic/templates/deployment.yaml
@@ -3,11 +3,7 @@ apiVersion: apps/v1
 kind: Deployment
 metadata:
   name: {{ $fullName }}
-  labels:
-    {{ include "generic.labels" $ | indent 4 }}
-    {{- with .labels }}
-    {{ toYaml . | indent 4 }}
-    {{- end }}
+  labels: {{ include "generic.labels" $ | nindent 4 }}
   {{- with .annotations }}
   annotations: {{ toYaml . | nindent 4 }}
   {{- end }}
diff --git a/charts/generic/templates/jobs.yaml b/charts/generic/templates/jobs.yaml
index 7de5469..024a03a 100644
--- a/charts/generic/templates/jobs.yaml
+++ b/charts/generic/templates/jobs.yaml
@@ -12,7 +12,7 @@ metadata:
   {{- end }}
   labels:
     {{ include "generic.labels" $ | indent 4 }}
-    {{- with .labels }}
+    {{- with $job.labels }}
     {{ toYaml . | indent 4 }}
     {{- end }}
   annotations: