diff --git a/apps/secret/Makefile b/apps/secret/Makefile
index 4826c9b871f..144971a66d9 100644
--- a/apps/secret/Makefile
+++ b/apps/secret/Makefile
@@ -1,12 +1,11 @@
 include ../sdk.mk
 
-.PHONY: generate
-generate: install-app-sdk update-app-sdk ## Run Grafana App SDK code generation
+.PHONY: generate # Run Grafana App SDK code generation
+generate: install-app-sdk update-app-sdk
 	@$(APP_SDK_BIN) generate \
 		--source=./kinds/ \
 		--gogenpath=./pkg/apis \
 		--grouping=group \
 		--defencoding=none \
 		--noschemasinmanifest \
-		--postprocess \
-		--useoldmanifestkinds
\ No newline at end of file
+		--postprocess
diff --git a/apps/secret/kinds/keeper.cue b/apps/secret/kinds/keeper.cue
deleted file mode 100644
index 65eab07afc0..00000000000
--- a/apps/secret/kinds/keeper.cue
+++ /dev/null
@@ -1,25 +0,0 @@
-package secret
-
-import "github.com/grafana/grafana/apps/secret/kinds/v1beta1"
-
-keeper: {
-	kind:       "Keeper"
-	pluralName: "Keepers"
-	current:    "v1beta1"
-	scope:      "Namespaced"
-	codegen: {
-		ts: {
-			enabled: false
-		}
-		go: {
-			enabled: true
-		}
-	}
-	versions: {
-		"v1beta1": {
-			schema: {
-				spec: v1beta1.KeeperSpec
-			}
-		}
-	}
-}
diff --git a/apps/secret/kinds/manifest.cue b/apps/secret/kinds/manifest.cue
index 1f288bcd328..19eeffb662e 100644
--- a/apps/secret/kinds/manifest.cue
+++ b/apps/secret/kinds/manifest.cue
@@ -1,10 +1,11 @@
-package secret
+package kinds
+
+import "github.com/grafana/grafana/apps/secret/kinds/v1beta1"
 
 manifest: {
 	appName:       "secret"
 	groupOverride: "secret.grafana.app"
-	kinds: [
-		securevalue,
-		keeper,
-	]
+	versions: {
+		"v1beta1": v1beta1.manifest
+	}
 }
diff --git a/apps/secret/kinds/securevalue.cue b/apps/secret/kinds/securevalue.cue
deleted file mode 100644
index d37a88fce52..00000000000
--- a/apps/secret/kinds/securevalue.cue
+++ /dev/null
@@ -1,26 +0,0 @@
-package secret
-
-import "github.com/grafana/grafana/apps/secret/kinds/v1beta1"
-
-securevalue: {
-	kind:       "SecureValue"
-	pluralName: "SecureValues"
-	current:    "v1beta1"
-	scope:      "Namespaced"
-	codegen: {
-		ts: {
-			enabled: false
-		}
-		go: {
-			enabled: true
-		}
-	}
-	versions: {
-		"v1beta1": {
-			schema: {
-				spec:   v1beta1.SecureValueSpec
-				status: v1beta1.SecureValueStatus
-			}
-		}
-	}
-}
diff --git a/apps/secret/kinds/v1beta1/manifest.cue b/apps/secret/kinds/v1beta1/manifest.cue
new file mode 100644
index 00000000000..b28eebecbc2
--- /dev/null
+++ b/apps/secret/kinds/v1beta1/manifest.cue
@@ -0,0 +1,32 @@
+package v1beta1
+
+keeper: {
+	kind:       "Keeper"
+	pluralName: "Keepers"
+	scope:      "Namespaced"
+	schema: {
+		spec: KeeperSpec
+	}
+}
+
+securevalue: {
+	kind:       "SecureValue"
+	pluralName: "SecureValues"
+	scope:      "Namespaced"
+	schema: {
+		spec:   SecureValueSpec
+		status: SecureValueStatus
+	}
+}
+
+manifest: {
+	kinds: [securevalue, keeper]
+	codegen: {
+		ts: {
+			enabled: false
+		}
+		go: {
+			enabled: true
+		}
+	}
+}