diff --git a/Makefile b/Makefile
index bc20d2c3b..346b235a0 100644
--- a/Makefile
+++ b/Makefile
@@ -63,7 +63,9 @@ deploy-clean:
 
 # Generate manifests e.g. CRD, RBAC etc.
 manifests:
-	go run vendor/sigs.k8s.io/controller-tools/cmd/controller-gen/main.go all
+	# controller-gen/main.go all == [rbac, crd]
+	go run vendor/sigs.k8s.io/controller-tools/cmd/controller-gen/main.go rbac --output-dir=config/default/rbac
+	go run vendor/sigs.k8s.io/controller-tools/cmd/controller-gen/main.go crd
 
 # Run go fmt against code
 fmt:
diff --git a/config/crds/kudo_v1alpha1_instance.yaml b/config/crds/kudo_v1alpha1_instance.yaml
index 15953f7ef..3bf859d94 100644
--- a/config/crds/kudo_v1alpha1_instance.yaml
+++ b/config/crds/kudo_v1alpha1_instance.yaml
@@ -14,10 +14,8 @@ spec:
   validation:
     openAPIV3Schema:
       properties:
-        apiVersion:
-          type: string
-        kind:
-          type: string
+        inline:
+          type: object
         metadata:
           type: object
         spec:
@@ -46,6 +44,8 @@ spec:
             status:
               type: string
           type: object
+      required:
+      - inline
   version: v1alpha1
 status:
   acceptedNames:
diff --git a/config/crds/kudo_v1alpha1_planexecution.yaml b/config/crds/kudo_v1alpha1_planexecution.yaml
index b8ede5786..7278862f2 100644
--- a/config/crds/kudo_v1alpha1_planexecution.yaml
+++ b/config/crds/kudo_v1alpha1_planexecution.yaml
@@ -14,10 +14,8 @@ spec:
   validation:
     openAPIV3Schema:
       properties:
-        apiVersion:
-          type: string
-        kind:
-          type: string
+        inline:
+          type: object
         metadata:
           type: object
         spec:
@@ -65,6 +63,8 @@ spec:
             strategy:
               type: string
           type: object
+      required:
+      - inline
   version: v1alpha1
 status:
   acceptedNames: