diff --git a/library/common-test/values.yaml b/library/common-test/values.yaml
index 2f91c7228a..120c72590d 100644
--- a/library/common-test/values.yaml
+++ b/library/common-test/values.yaml
@@ -4,4 +4,4 @@
 # controllers (Tests use a different named controller)
 controllers:
   main:
-    enabled: false
+    enabled: true
diff --git a/library/common/1.0.0/templates/classes/_cronjob.tpl b/library/common/1.0.0/templates/classes/_cronjob.tpl
index 0b1c719d85..4944c55f65 100644
--- a/library/common/1.0.0/templates/classes/_cronjob.tpl
+++ b/library/common/1.0.0/templates/classes/_cronjob.tpl
@@ -46,5 +46,5 @@ spec:
             {{- . | nindent 12 }}
             {{- end }}
         spec:
-          {{/* pod */}}
+          {{- include "ix.v1.common.lib.controller.pod" (dict "rootCtx" $rootCtx "objectData" $objectData) | nindent 10 }}
 {{- end -}}
diff --git a/library/common/1.0.0/templates/classes/_daemonset.tpl b/library/common/1.0.0/templates/classes/_daemonset.tpl
index 47d42b84b3..6ff6249c10 100644
--- a/library/common/1.0.0/templates/classes/_daemonset.tpl
+++ b/library/common/1.0.0/templates/classes/_daemonset.tpl
@@ -48,5 +48,6 @@ spec:
       annotations:
         {{- . | nindent 8 }}
         {{- end }}
-  spec:
+    spec:
+      {{- include "ix.v1.common.lib.controller.pod" (dict "rootCtx" $rootCtx "objectData" $objectData) | nindent 6 }}
 {{- end -}}
diff --git a/library/common/1.0.0/templates/classes/_deployment.tpl b/library/common/1.0.0/templates/classes/_deployment.tpl
index b8d354054c..75ee7f7015 100644
--- a/library/common/1.0.0/templates/classes/_deployment.tpl
+++ b/library/common/1.0.0/templates/classes/_deployment.tpl
@@ -48,5 +48,6 @@ spec:
       annotations:
         {{- . | nindent 8 }}
         {{- end }}
-  spec:
+    spec:
+      {{- include "ix.v1.common.lib.controller.pod" (dict "rootCtx" $rootCtx "objectData" $objectData) | nindent 6 }}
 {{- end -}}
diff --git a/library/common/1.0.0/templates/classes/_job.tpl b/library/common/1.0.0/templates/classes/_job.tpl
index 015afd9cce..a73d7dc5c0 100644
--- a/library/common/1.0.0/templates/classes/_job.tpl
+++ b/library/common/1.0.0/templates/classes/_job.tpl
@@ -46,5 +46,5 @@ spec:
         {{- . | nindent 8 }}
         {{- end }}
     spec:
-      {{/* pod */}}
+      {{- include "ix.v1.common.lib.controller.pod" (dict "rootCtx" $rootCtx "objectData" $objectData) | nindent 6 }}
 {{- end -}}
diff --git a/library/common/1.0.0/templates/classes/_statefulset.tpl b/library/common/1.0.0/templates/classes/_statefulset.tpl
index afff9fe46b..955e46c42f 100644
--- a/library/common/1.0.0/templates/classes/_statefulset.tpl
+++ b/library/common/1.0.0/templates/classes/_statefulset.tpl
@@ -48,6 +48,6 @@ spec:
       annotations:
         {{- . | nindent 8 }}
         {{- end }}
-  spec:
-    {{- include "ix.v1.common.lib.controller.pod" (dict "rootCtx" $rootCtx "objectData" $objectData.podSpec) -}}
+    spec:
+      {{- include "ix.v1.common.lib.controller.pod" (dict "rootCtx" $rootCtx "objectData" $objectData) | nindent 6 }}
 {{- end -}}
diff --git a/library/common/1.0.0/templates/lib/controller/_pod.tpl b/library/common/1.0.0/templates/lib/controller/_pod.tpl
index 6d6dc1dc0c..8aa9cccc9c 100644
--- a/library/common/1.0.0/templates/lib/controller/_pod.tpl
+++ b/library/common/1.0.0/templates/lib/controller/_pod.tpl
@@ -5,4 +5,7 @@ rootCtx: The root context of the template. It is used to access the global conte
 objectData: The object data to be used to render the Pod.
 */}}
 {{- define "ix.v1.common.lib.controller.pod" -}}
+  {{- $rootCtx := .rootCtx -}}
+  {{- $objectData := .objectData -}}
+
 {{- end -}}
diff --git a/library/common/1.0.0/values.yaml b/library/common/1.0.0/values.yaml
index e2be37b932..3e48090ee9 100644
--- a/library/common/1.0.0/values.yaml
+++ b/library/common/1.0.0/values.yaml
@@ -377,17 +377,17 @@ controllers:
     # -- Controller type
     type: Deployment
     # -- Controller labels
-    labels: {}
-    # -- Controller annotations
-    annotations: {}
-    # -- Controller replicas (Deployment and StatefulSet only)
-    replicas: 1
-    # -- Controller revision history limit
-    revisionHistoryLimit: 3
-    # Strategy
-    # -- Controller strategy type
-    strategy: Recreate
-    # -- Controller strategy rolling update
+    # labels: {}
+    # # -- Controller annotations
+    # annotations: {}
+    # # -- Controller replicas (Deployment and StatefulSet only)
+    # replicas: 1
+    # # -- Controller revision history limit
+    # revisionHistoryLimit: 3
+    # # Strategy
+    # # -- Controller strategy type
+    # strategy: Recreate
+    # # -- Controller strategy rolling update
     # rollingUpdate:
     #   # -- Controller strategy rolling update max unavailable
     #   maxUnavailable: 1
@@ -396,19 +396,19 @@ controllers:
     #   # -- Controller strategy rolling update partition (StatefulSet only)
     #   partition: 0
 
-    # -- CronJob
-    # - CronJob schedule
-    schedule: "5"
-    # - CronJob concurrency policy
-    concurrencyPolicy: ""
-    # - CronJob timezone
-    timezone: ""
-    # - CronJob failed jobs history limit
-    failedJobsHistoryLimit: 1
-    # - CronJob successful jobs history limit
-    successfulJobsHistoryLimit: 3
-    # - CronJob starting deadline seconds
-    startingDeadlineSeconds: 0
+    # # -- CronJob
+    # # - CronJob schedule
+    # schedule: "5"
+    # # - CronJob concurrency policy
+    # concurrencyPolicy: ""
+    # # - CronJob timezone
+    # timezone: ""
+    # # - CronJob failed jobs history limit
+    # failedJobsHistoryLimit: 1
+    # # - CronJob successful jobs history limit
+    # successfulJobsHistoryLimit: 3
+    # # - CronJob starting deadline seconds
+    # startingDeadlineSeconds: 0
 
     # # -- Job
     # # - Job active deadline seconds
@@ -426,10 +426,10 @@ controllers:
 
     # -- Pod Spec
     podSpec:
-      # -- Pod labels
-      labels: {}
-      # -- Pod annotations
-      annotations: {}
+      # # -- Pod labels
+      # labels: {}
+      # # -- Pod annotations
+      # annotations: {}
       # -- hostNetwork
       hostNetwork: false
       # -- enableServiceLinks