diff --git a/apis/project.cattle.io/v3/schema/schema.go b/apis/project.cattle.io/v3/schema/schema.go
index e1d6b6dd..3f8a3744 100644
--- a/apis/project.cattle.io/v3/schema/schema.go
+++ b/apis/project.cattle.io/v3/schema/schema.go
@@ -106,16 +106,10 @@ func workloadTypes(schemas *types.Schemas) *types.Schemas {
 					continue
 				}
 				for name, field := range baseSchema.ResourceFields {
-					if name == "template" {
-						templateSchema := schemas.Schema(&Version, field.Type)
-						for name, field := range templateSchema.ResourceFields {
-							schema.ResourceFields[name] = field
-						}
-					} else {
+					if name != "template" {
 						schema.ResourceFields[name] = field
 					}
 				}
-
 			}
 		})
 }
@@ -159,6 +153,7 @@ func statefulSetTypes(schemas *types.Schemas) *types.Schemas {
 				From: "status",
 				To:   "statefulSetStatus",
 			},
+			NewWorkloadTypeMapper(),
 		).
 		MustImport(&Version, v1beta2.StatefulSetSpec{}, statefulSetConfigOverride{}).
 		MustImport(&Version, v1beta2.StatefulSet{}, projectOverride{})
@@ -183,6 +178,7 @@ func replicaSetTypes(schemas *types.Schemas) *types.Schemas {
 				To:   "replicaSetStatus",
 			},
 			&m.Embed{Field: "template"},
+			NewWorkloadTypeMapper(),
 		).
 		MustImport(&Version, v1beta1.ReplicaSetSpec{}, replicaSetConfigOverride{}).
 		MustImportAndCustomize(&Version, v1beta1.ReplicaSet{}, func(schema *types.Schema) {
@@ -209,6 +205,7 @@ func replicationControllerTypes(schemas *types.Schemas) *types.Schemas {
 				From: "status",
 				To:   "replicationControllerStatus",
 			},
+			NewWorkloadTypeMapper(),
 		).
 		MustImport(&Version, v1.ReplicationControllerSpec{}, replicationControllerConfigOverride{}).
 		MustImportAndCustomize(&Version, v1.ReplicationController{}, func(schema *types.Schema) {
@@ -238,6 +235,7 @@ func daemonSetTypes(schemas *types.Schemas) *types.Schemas {
 				From: "status",
 				To:   "daemonSetStatus",
 			},
+			NewWorkloadTypeMapper(),
 		).
 		MustImport(&Version, v1beta2.DaemonSetSpec{}, daemonSetOverride{}).
 		MustImportAndCustomize(&Version, v1beta2.DaemonSet{}, func(schema *types.Schema) {
@@ -345,6 +343,7 @@ func cronJobTypes(schemas *types.Schemas) *types.Schemas {
 				From: "status",
 				To:   "cronJobStatus",
 			},
+			NewWorkloadTypeMapper(),
 		).
 		MustImport(&Version, batchv1beta1.CronJobSpec{}, cronJobOverride{}).
 		MustImportAndCustomize(&Version, batchv1beta1.CronJob{}, func(schema *types.Schema) {
@@ -386,6 +385,7 @@ func deploymentTypes(schemas *types.Schemas) *types.Schemas {
 				From: "status",
 				To:   "deploymentStatus",
 			},
+			NewWorkloadTypeMapper(),
 		).
 		MustImport(&Version, v1beta2.DeploymentSpec{}, deploymentConfigOverride{}).
 		MustImportAndCustomize(&Version, v1beta2.Deployment{}, func(schema *types.Schema) {
@@ -617,3 +617,13 @@ func podTemplateSpecTypes(schemas *types.Schemas) *types.Schemas {
 	return schemas.
 		MustImport(&Version, v1.PodTemplateSpec{})
 }
+
+func NewWorkloadTypeMapper() types.Mapper {
+	return &types.Mappers{
+		&m.Move{From: "labels", To: "workloadLabels"},
+		&m.Move{From: "annotations", To: "workloadAnnotations"},
+		&m.Move{From: "metadata/labels", To: "labels", NoDeleteFromField: true},
+		&m.Move{From: "metadata/annotations", To: "annotations", NoDeleteFromField: true},
+		&m.Drop{Field: "metadata"},
+	}
+}
diff --git a/config/context.go b/config/context.go
index affb65c5..fb1cbf8b 100644
--- a/config/context.go
+++ b/config/context.go
@@ -48,15 +48,17 @@ type ManagementContext struct {
 	Schemas           *types.Schemas
 	Scheme            *runtime.Scheme
 	AccessControl     types.AccessControl
-	Project           projectv3.Interface
-	Management        managementv3.Interface
-	RBAC              rbacv1.Interface
-	Core              corev1.Interface
+
+	Management managementv3.Interface
+	Project    projectv3.Interface
+	RBAC       rbacv1.Interface
+	Core       corev1.Interface
 }
 
 func (c *ManagementContext) controllers() []controller.Starter {
 	return []controller.Starter{
 		c.Management,
+		c.Project,
 		c.RBAC,
 		c.Core,
 		c.Project,
@@ -140,6 +142,11 @@ func NewManagementContext(config rest.Config) (*ManagementContext, error) {
 		return nil, err
 	}
 
+	context.Project, err = projectv3.NewForConfig(config)
+	if err != nil {
+		return nil, err
+	}
+
 	context.K8sClient, err = kubernetes.NewForConfig(&config)
 	if err != nil {
 		return nil, err