diff --git a/library/common/1.0.0/templates/lib/chart/_names.tpl b/library/common/1.0.0/templates/lib/chart/_names.tpl
index 5e37851f56..3e5b31cded 100644
--- a/library/common/1.0.0/templates/lib/chart/_names.tpl
+++ b/library/common/1.0.0/templates/lib/chart/_names.tpl
@@ -1,16 +1,16 @@
 {{/* Contains functions for generating names */}}
 
 {{/* Returns the name of the Chart */}}
-{{- define "ix.common.lib.chart.names.name" -}}
+{{- define "ix.v1.common.lib.chart.names.name" -}}
 
   {{- .Chart.Name | lower | trunc 63 | trimSuffix "-" -}}
 
 {{- end -}}
 
 {{/* Returns the fullname of the Chart */}}
-{{- define "ix.common.lib.chart.names.fullname" -}}
+{{- define "ix.v1.common.lib.chart.names.fullname" -}}
 
-  {{- $name := include "ix.common.lib.chart.names.name" . -}}
+  {{- $name := include "ix.v1.common.lib.chart.names.name" . -}}
 
   {{- if contains $name .Release.Name -}}
     {{- $name = .Release.Name -}}
diff --git a/library/common/1.0.0/templates/spawner/_configmap.tpl b/library/common/1.0.0/templates/spawner/_configmap.tpl
index aa1c7ca511..bf79e6e25d 100644
--- a/library/common/1.0.0/templates/spawner/_configmap.tpl
+++ b/library/common/1.0.0/templates/spawner/_configmap.tpl
@@ -12,7 +12,7 @@
       {{/* Create a copy of the configmap */}}
       {{- $objectData := (mustDeepCopy $configmap) -}}
 
-      {{- $objectName := (printf "%s-%s" (include "ix.common.lib.chart.names.fullname" $) $name) -}}
+      {{- $objectName := (printf "%s-%s" (include "ix.v1.common.lib.chart.names.fullname" $) $name) -}}
       {{/* Perform validations */}}
       {{- include "ix.v1.common.lib.chart.names.validation" (dict "name" $objectName) -}}
       {{- include "ix.v1.common.lib.configmap.validation" (dict "objectData" $objectData) -}}
diff --git a/library/common/1.0.0/templates/spawner/_controller.tpl b/library/common/1.0.0/templates/spawner/_controller.tpl
index 3381423d2b..7b1862b329 100644
--- a/library/common/1.0.0/templates/spawner/_controller.tpl
+++ b/library/common/1.0.0/templates/spawner/_controller.tpl
@@ -16,9 +16,9 @@
       {{- $objectData := (mustDeepCopy $controller) -}}
 
       {{/* Generate the name of the controller */}}
-      {{- $objectName := include "ix.common.lib.chart.names.fullname" $ -}}
+      {{- $objectName := include "ix.v1.common.lib.chart.names.fullname" $ -}}
       {{- if not $objectData.primary -}}
-        {{- $objectName = printf "%s-%s" (include "ix.common.lib.chart.names.fullname" $) $name -}}
+        {{- $objectName = printf "%s-%s" (include "ix.v1.common.lib.chart.names.fullname" $) $name -}}
       {{- end -}}
 
       {{/* Perform validations */}}
diff --git a/library/common/1.0.0/templates/spawner/_imagePullSecret.tpl b/library/common/1.0.0/templates/spawner/_imagePullSecret.tpl
index 3d450609b9..aeafb4e70a 100644
--- a/library/common/1.0.0/templates/spawner/_imagePullSecret.tpl
+++ b/library/common/1.0.0/templates/spawner/_imagePullSecret.tpl
@@ -12,7 +12,7 @@
       {{/* Create a copy of the configmap */}}
       {{- $objectData := (mustDeepCopy $imgPullSecret) -}}
 
-      {{- $objectName := (printf "%s-%s" (include "ix.common.lib.chart.names.fullname" $) $name) -}}
+      {{- $objectName := (printf "%s-%s" (include "ix.v1.common.lib.chart.names.fullname" $) $name) -}}
       {{/* Perform validations */}}
       {{- include "ix.v1.common.lib.chart.names.validation" (dict "name" $objectName) -}}
       {{- include "ix.v1.common.lib.imagePullSecret.validation" (dict "objectData" $objectData) -}}
diff --git a/library/common/1.0.0/templates/spawner/_secret.tpl b/library/common/1.0.0/templates/spawner/_secret.tpl
index 384ae618ce..888f41414d 100644
--- a/library/common/1.0.0/templates/spawner/_secret.tpl
+++ b/library/common/1.0.0/templates/spawner/_secret.tpl
@@ -12,7 +12,7 @@
       {{/* Create a copy of the secret */}}
       {{- $objectData := (mustDeepCopy $secret) -}}
 
-      {{- $objectName := (printf "%s-%s" (include "ix.common.lib.chart.names.fullname" $) $name) -}}
+      {{- $objectName := (printf "%s-%s" (include "ix.v1.common.lib.chart.names.fullname" $) $name) -}}
       {{/* Perform validations */}}
       {{- include "ix.v1.common.lib.chart.names.validation" (dict "name" $objectName) -}}
       {{- include "ix.v1.common.lib.secret.validation" (dict "objectData" $objectData) -}}
diff --git a/library/common/1.0.0/values.yaml b/library/common/1.0.0/values.yaml
index 75a82929a7..e2be37b932 100644
--- a/library/common/1.0.0/values.yaml
+++ b/library/common/1.0.0/values.yaml
@@ -375,7 +375,7 @@ controllers:
     # -- Primary controller
     primary: true
     # -- Controller type
-    type: CronJob
+    type: Deployment
     # -- Controller labels
     labels: {}
     # -- Controller annotations
@@ -426,6 +426,10 @@ controllers:
 
     # -- Pod Spec
     podSpec:
+      # -- Pod labels
+      labels: {}
+      # -- Pod annotations
+      annotations: {}
       # -- hostNetwork
       hostNetwork: false
       # -- enableServiceLinks