diff --git a/Makefile b/Makefile
index 122c7d3470d..7247c7dd11a 100644
--- a/Makefile
+++ b/Makefile
@@ -292,11 +292,12 @@ $(CRD_REF_DOCS): $(LOCALBIN)
 	)
 
 BUNDLE_DIR ?= "bundle"
+WARNINGMSG = "provided API should have an example annotation"
 .PHONY: bundle
 bundle: prepare operator-sdk ## Generate bundle manifests and metadata, then validate generated files.
 	$(OPERATOR_SDK) generate kustomize manifests -q
-	$(KUSTOMIZE) build config/manifests | $(OPERATOR_SDK) generate bundle $(BUNDLE_GEN_FLAGS)
-	$(OPERATOR_SDK) bundle validate ./$(BUNDLE_DIR)
+	$(KUSTOMIZE) build config/manifests | $(OPERATOR_SDK) generate bundle $(BUNDLE_GEN_FLAGS) 2>&1 | grep -v $(WARNINGMSG)
+	$(OPERATOR_SDK) bundle validate ./$(BUNDLE_DIR) 2>&1 | grep -v $(WARNINGMSG)
 	mv bundle.Dockerfile Dockerfiles/
 	rm -f bundle/manifests/opendatahub-operator-webhook-service_v1_service.yaml
 
diff --git a/config/samples/components_v1_codeflare.yaml b/config/samples/components_v1_codeflare.yaml
deleted file mode 100644
index 0a80790af5c..00000000000
--- a/config/samples/components_v1_codeflare.yaml
+++ /dev/null
@@ -1,6 +0,0 @@
-apiVersion: components.platform.opendatahub.io/v1
-kind: CodeFlare
-metadata:
-  name: codeflare-sample
-spec:
-  # TODO(user): Add fields here
diff --git a/config/samples/components_v1_dashboard.yaml b/config/samples/components_v1_dashboard.yaml
deleted file mode 100644
index a8cd990c49a..00000000000
--- a/config/samples/components_v1_dashboard.yaml
+++ /dev/null
@@ -1,6 +0,0 @@
-apiVersion: components.platform.opendatahub.io/v1
-kind: Dashboard
-metadata:
-  name: dashboard-sample
-spec:
-  # TODO(user): Add fields here
diff --git a/config/samples/components_v1_datasciencepipelines.yaml b/config/samples/components_v1_datasciencepipelines.yaml
deleted file mode 100644
index 7a1d88d8e03..00000000000
--- a/config/samples/components_v1_datasciencepipelines.yaml
+++ /dev/null
@@ -1,6 +0,0 @@
-apiVersion: components.platform.opendatahub.io/v1
-kind: DataSciencePipelines
-metadata:
-  name: datasciencepipelines-sample
-spec:
-  # TODO(user): Add fields here
diff --git a/config/samples/components_v1_kserve.yaml b/config/samples/components_v1_kserve.yaml
deleted file mode 100644
index cad5c2698c1..00000000000
--- a/config/samples/components_v1_kserve.yaml
+++ /dev/null
@@ -1,6 +0,0 @@
-apiVersion: components.platform.opendatahub.io/v1
-kind: Kserve
-metadata:
-  name: kserve-sample
-spec:
-  # TODO(user): Add fields here
diff --git a/config/samples/components_v1_kueue.yaml b/config/samples/components_v1_kueue.yaml
deleted file mode 100644
index add77909808..00000000000
--- a/config/samples/components_v1_kueue.yaml
+++ /dev/null
@@ -1,6 +0,0 @@
-apiVersion: components.platform.opendatahub.io/v1
-kind: Kueue
-metadata:
-  name: kueue-sample
-spec:
-  # TODO(user): Add fields here
diff --git a/config/samples/components_v1_modelmeshserving.yaml b/config/samples/components_v1_modelmeshserving.yaml
deleted file mode 100644
index ac829f52746..00000000000
--- a/config/samples/components_v1_modelmeshserving.yaml
+++ /dev/null
@@ -1,6 +0,0 @@
-apiVersion: components.platform.opendatahub.io/v1
-kind: ModelMeshServing
-metadata:
-  name: modelmeshserving-sample
-spec:
-  # TODO(user): Add fields here
diff --git a/config/samples/components_v1_modelregistry.yaml b/config/samples/components_v1_modelregistry.yaml
deleted file mode 100644
index 6465009094f..00000000000
--- a/config/samples/components_v1_modelregistry.yaml
+++ /dev/null
@@ -1,6 +0,0 @@
-apiVersion: components.platform.opendatahub.io/v1
-kind: ModelRegistry
-metadata:
-  name: modelregistry-sample
-spec:
-  # TODO(user): Add fields here
diff --git a/config/samples/components_v1_ray.yaml b/config/samples/components_v1_ray.yaml
deleted file mode 100644
index 7c36f927e58..00000000000
--- a/config/samples/components_v1_ray.yaml
+++ /dev/null
@@ -1,6 +0,0 @@
-apiVersion: components.platform.opendatahub.io/v1
-kind: Ray
-metadata:
-  name: ray-sample
-spec:
-  # TODO(user): Add fields here
diff --git a/config/samples/components_v1_trainingoperator.yaml b/config/samples/components_v1_trainingoperator.yaml
deleted file mode 100644
index c50f580a9a1..00000000000
--- a/config/samples/components_v1_trainingoperator.yaml
+++ /dev/null
@@ -1,6 +0,0 @@
-apiVersion: components.platform.opendatahub.io/v1
-kind: TrainingOperator
-metadata:
-  name: trainingoperator-sample
-spec:
-  # TODO(user): Add fields here
diff --git a/config/samples/components_v1_trustyai.yaml b/config/samples/components_v1_trustyai.yaml
deleted file mode 100644
index 1228a1cda6c..00000000000
--- a/config/samples/components_v1_trustyai.yaml
+++ /dev/null
@@ -1,6 +0,0 @@
-apiVersion: components.platform.opendatahub.io/v1
-kind: TrustyAI
-metadata:
-  name: trustyai-sample
-spec:
-  # TODO(user): Add fields here
diff --git a/config/samples/components_v1_workbenches.yaml b/config/samples/components_v1_workbenches.yaml
deleted file mode 100644
index 1565728cdfa..00000000000
--- a/config/samples/components_v1_workbenches.yaml
+++ /dev/null
@@ -1,6 +0,0 @@
-apiVersion: components.platform.opendatahub.io/v1
-kind: Workbenches
-metadata:
-  name: workbenches-sample
-spec:
-  # TODO(user): Add fields here
diff --git a/config/samples/kustomization.yaml b/config/samples/kustomization.yaml
index 0e5e1ae1dda..4da6a9add39 100644
--- a/config/samples/kustomization.yaml
+++ b/config/samples/kustomization.yaml
@@ -5,18 +5,4 @@ kind: Kustomization
 resources:
 - datasciencecluster_v1_datasciencecluster.yaml
 - dscinitialization_v1_dscinitialization.yaml
-#- components_v1_dashboard.yaml
-#- components_v1_workbenches.yaml
-#- components_v1_modelmeshserving.yaml
-#- components_v1_datasciencepipelines.yaml
-#- components_v1_kserve.yaml
-#- components_v1_kueue.yaml
-#- components_v1_codeflare.yaml
-#- components_v1_ray.yaml
-#- components_v1_trustyai.yaml
-#- components_v1_modelregistry.yaml
-#- components_v1_trainingoperator.yaml
-#- services_v1_dscmonitoring.yaml
-- services_v1_monitoring.yaml
-- services_v1alpha1_auth.yaml
-#+kubebuilder:scaffold:manifestskustomizesamples
+- services_v1alpha1_auth.yaml
\ No newline at end of file
diff --git a/config/samples/services_v1_monitoring.yaml b/config/samples/services_v1_monitoring.yaml
deleted file mode 100644
index edffaa50e33..00000000000
--- a/config/samples/services_v1_monitoring.yaml
+++ /dev/null
@@ -1,6 +0,0 @@
-apiVersion: services.platform.opendatahub.io/v1
-kind: Monitoring
-metadata:
-  name: monitoring-sample
-spec:
-  # TODO(user): Add fields here