diff --git a/apps/iam/Makefile b/apps/iam/Makefile
index 4826c9b871f..6839689c867 100644
--- a/apps/iam/Makefile
+++ b/apps/iam/Makefile
@@ -8,5 +8,4 @@ generate: install-app-sdk update-app-sdk ## Run Grafana App SDK code generation
 		--grouping=group \
 		--defencoding=none \
 		--noschemasinmanifest \
-		--postprocess \
-		--useoldmanifestkinds
\ No newline at end of file
+		--postprocess \
\ No newline at end of file
diff --git a/apps/iam/kinds/manifest.cue b/apps/iam/kinds/manifest.cue
index 032261e9030..60a6d1f8faf 100644
--- a/apps/iam/kinds/manifest.cue
+++ b/apps/iam/kinds/manifest.cue
@@ -1,18 +1,24 @@
 package kinds
 
 manifest: {
-	appName:       "iam"
+	appName: 	   "iam"
 	groupOverride: "iam.grafana.app"
-	kinds: [
-		globalrole, 
-		globalrolebinding,
-		corerole,
-		role,
-		rolebinding,
-		resourcepermission,
-		user,
-		team,
-		teambinding,
-		serviceaccount,
-	]
+	versions: {
+	    "v0alpha1": v0alpha1
+	}
 }
+
+v0alpha1: {
+    kinds: [
+		globalrolev0alpha1, 
+		globalrolebindingv0alpha1,
+		corerolev0alpha1,
+		rolev0alpha1,
+		rolebindingv0alpha1,
+		resourcepermissionv0alpha1,
+		userv0alpha1,
+		teamv0alpha1,
+		teambindingv0alpha1,
+		serviceaccountv0alpha1,
+	]
+}
\ No newline at end of file
diff --git a/apps/iam/kinds/resourcepermission.cue b/apps/iam/kinds/resourcepermission.cue
index c40067b3e3f..42fcddfe6fc 100644
--- a/apps/iam/kinds/resourcepermission.cue
+++ b/apps/iam/kinds/resourcepermission.cue
@@ -4,20 +4,17 @@ import (
 	"github.com/grafana/grafana/apps/iam/kinds/v0alpha1"
 )
 
-resourcepermission: {
+resourcepermissionKind: {
 	kind:       "ResourcePermission"
 	pluralName: "ResourcePermissions"
-	current:    "v0alpha1"
-
-	versions: {
-		"v0alpha1": {
-			codegen: {
-				ts: { enabled: false }
-				go: { enabled: true }
-			}
-			schema: {
-				spec:   v0alpha1.ResourcePermission
-			}
-		}
+	codegen: {
+		ts: { enabled: false }
+		go: { enabled: true }
+	}
+}
+
+resourcepermissionv0alpha1: resourcepermissionKind & {
+	schema: {
+		spec:   v0alpha1.ResourcePermission
 	}
 }
diff --git a/apps/iam/kinds/role.cue b/apps/iam/kinds/role.cue
index 8ba1955ce89..1911fe83616 100644
--- a/apps/iam/kinds/role.cue
+++ b/apps/iam/kinds/role.cue
@@ -4,56 +4,47 @@ import (
 	"github.com/grafana/grafana/apps/iam/kinds/v0alpha1"
 )
 
-role: {
+roleKind: {
 	kind:       "Role"
 	pluralName: "Roles"
-	current:    "v0alpha1"
-
-	versions: {
-		"v0alpha1": {
-			codegen: {
-				ts: { enabled: false }
-				go: { enabled: true }
-			}
-			schema: {
-				spec:   v0alpha1.RoleSpec
-			}
-		}
+	codegen: {
+		ts: { enabled: false }
+		go: { enabled: true }
 	}
 }
 
-corerole: {
+coreroleKind: {
 	kind:       "CoreRole"
 	pluralName: "CoreRoles"
-	current:    "v0alpha1"
-
-	versions: {
-		"v0alpha1": {
-			codegen: {
-				ts: { enabled: false }
-				go: { enabled: true }
-			}
-			schema: {
-				spec:   v0alpha1.RoleSpec
-			}
-		}
+	codegen: {
+		ts: { enabled: false }
+		go: { enabled: true }
 	}
 }
 
-globalrole: {
+globalroleKind: {
 	kind:       "GlobalRole"
 	pluralName: "GlobalRoles"
-	current:    "v0alpha1"
+	codegen: {
+		ts: { enabled: false }
+		go: { enabled: true }
+	}
+}
 
-	versions: {
-		"v0alpha1": {
-			codegen: {
-				ts: { enabled: false }
-				go: { enabled: true }
-			}
-			schema: {
-				spec:   v0alpha1.RoleSpec
-			}
-		}
+rolev0alpha1: roleKind & {
+	schema: {
+		spec:   v0alpha1.RoleSpec
+	}
+}
+
+corerolev0alpha1: coreroleKind & {
+	schema: {
+		spec:   v0alpha1.RoleSpec
+	}
+}
+
+globalrolev0alpha1: globalroleKind & {
+	schema: {
+		spec:   v0alpha1.RoleSpec
 	}
 }
\ No newline at end of file
diff --git a/apps/iam/kinds/rolebinding.cue b/apps/iam/kinds/rolebinding.cue
index 2cc0b955272..119b958970c 100644
--- a/apps/iam/kinds/rolebinding.cue
+++ b/apps/iam/kinds/rolebinding.cue
@@ -4,38 +4,32 @@ import (
 	"github.com/grafana/grafana/apps/iam/kinds/v0alpha1"
 )
 
-rolebinding: {
+rolebindingKind: {
 	kind:       "RoleBinding"
 	pluralName: "RoleBindings"
-	current:    "v0alpha1"
-
-	versions: {
-		"v0alpha1": {
-			codegen: {
-				ts: { enabled: false }
-				go: { enabled: true }
-			}
-			schema: {
-				spec:   v0alpha1.RoleBindingSpec
-			}
-		}
+	codegen: {
+		ts: { enabled: false }
+		go: { enabled: true }
 	}
 }
 
-globalrolebinding: {
+globalrolebindingKind: {
 	kind:       "GlobalRoleBinding"
 	pluralName: "GlobalRoleBindings"
-	current:    "v0alpha1"
-
-	versions: {
-		"v0alpha1": {
-			codegen: {
-				ts: { enabled: false }
-				go: { enabled: true }
-			}
-			schema: {
-				spec:   v0alpha1.GlobalRoleBindingSpec
-			}
-		}
+	codegen: {
+		ts: { enabled: false }
+		go: { enabled: true }
+	}
+}
+
+rolebindingv0alpha1: rolebindingKind & {
+	schema: {
+		spec:   v0alpha1.RoleBindingSpec
+	}
+}
+
+globalrolebindingv0alpha1: globalrolebindingKind & {
+	schema: {
+		spec:   v0alpha1.GlobalRoleBindingSpec
 	}
 }
diff --git a/apps/iam/kinds/serviceaccount.cue b/apps/iam/kinds/serviceaccount.cue
index e84b4ab0a0f..72b5c10025b 100644
--- a/apps/iam/kinds/serviceaccount.cue
+++ b/apps/iam/kinds/serviceaccount.cue
@@ -4,20 +4,17 @@ import (
 	"github.com/grafana/grafana/apps/iam/kinds/v0alpha1"
 )
 
-serviceaccount: {
+serviceaccountKind: {
 	kind:       "ServiceAccount"
 	pluralName: "ServiceAccounts"
-	current:    "v0alpha1"
-
-	versions: {
-		"v0alpha1": {
-			codegen: {
-				ts: { enabled: false }
-				go: { enabled: true }
-			}
-			schema: {
-				spec: v0alpha1.ServiceAccountSpec
-			}
-		}
+	codegen: {
+		ts: { enabled: false }
+		go: { enabled: true }
 	}
 }
+
+serviceaccountv0alpha1: serviceaccountKind & {
+	schema: {
+		spec: v0alpha1.ServiceAccountSpec
+	}
+}
\ No newline at end of file
diff --git a/apps/iam/kinds/team.cue b/apps/iam/kinds/team.cue
index 0a8e980f4c0..9acf9d60c01 100644
--- a/apps/iam/kinds/team.cue
+++ b/apps/iam/kinds/team.cue
@@ -4,20 +4,18 @@ import (
 	"github.com/grafana/grafana/apps/iam/kinds/v0alpha1"
 )
 
-team: {
+teamKind: {
 	kind:       "Team"
 	pluralName: "Teams"
 	current:    "v0alpha1"
-
-	versions: {
-		"v0alpha1": {
-			codegen: {
-				ts: { enabled: false }
-				go: { enabled: true }
-			}
-			schema: {
-				spec: v0alpha1.TeamSpec
-			}
-		}
+	codegen: {
+		ts: { enabled: false }
+		go: { enabled: true }
+	}
+}
+
+teamv0alpha1: teamKind & {
+	schema: {
+		spec: v0alpha1.TeamSpec
 	}
 }
diff --git a/apps/iam/kinds/teambinding.cue b/apps/iam/kinds/teambinding.cue
index 522a27b1880..60870b58853 100644
--- a/apps/iam/kinds/teambinding.cue
+++ b/apps/iam/kinds/teambinding.cue
@@ -4,20 +4,17 @@ import (
 	"github.com/grafana/grafana/apps/iam/kinds/v0alpha1"
 )
 
-teambinding: {
+teambindingKind: {
 	kind:       "TeamBinding"
 	pluralName: "TeamBindings"
-	current:    "v0alpha1"
-
-	versions: {
-		"v0alpha1": {
-			codegen: {
-				ts: { enabled: false }
-				go: { enabled: true }
-			}
-			schema: {
-				spec: v0alpha1.TeamBindingSpec
-			}
-		}
+	codegen: {
+		ts: { enabled: false }
+		go: { enabled: true }
+	}
+}
+
+teambindingv0alpha1: teambindingKind & {
+	schema: {
+		spec: v0alpha1.TeamBindingSpec
 	}
 }
diff --git a/apps/iam/kinds/user.cue b/apps/iam/kinds/user.cue
index 4fe087701bf..480391dfa2e 100644
--- a/apps/iam/kinds/user.cue
+++ b/apps/iam/kinds/user.cue
@@ -4,26 +4,17 @@ import (
 	"github.com/grafana/grafana/apps/iam/kinds/v0alpha1"
 )
 
-user: {
+userKind: {
 	kind:       "User"
 	pluralName: "Users"
-	current:    "v0alpha1"
-    
-	versions: {
-		"v0alpha1": {
-			codegen: {
-				ts: { enabled: false }
-				go: { enabled: true }
-			}
-			validation: {
-				operations: [
-					"CREATE",
-					"UPDATE",
-				]
-			}
-			schema: {
-				spec: v0alpha1.UserSpec
-			}
-		}
+	codegen: {
+		ts: { enabled: false }
+		go: { enabled: true }
+	}
+}
+
+userv0alpha1: userKind & {
+	schema: {
+		spec: v0alpha1.UserSpec
 	}
 }