diff --git a/bundle/manifests/kuadrant-operator.clusterserviceversion.yaml b/bundle/manifests/kuadrant-operator.clusterserviceversion.yaml
index fba60bec9..f6291aa09 100644
--- a/bundle/manifests/kuadrant-operator.clusterserviceversion.yaml
+++ b/bundle/manifests/kuadrant-operator.clusterserviceversion.yaml
@@ -8,7 +8,7 @@ metadata:
           "apiVersion": "kuadrant.io/v1",
           "kind": "AuthPolicy",
           "metadata": {
-            "name": "toystore"
+            "name": "authpolicy-sample"
           },
           "spec": {
             "rules": {
@@ -16,11 +16,11 @@ metadata:
                 "apikey": {
                   "apiKey": {
                     "selector": {}
-                  }
-                },
-                "credentials": {
-                  "authorizationHeader": {
-                    "prefix": "APIKEY"
+                  },
+                  "credentials": {
+                    "authorizationHeader": {
+                      "prefix": "APIKEY"
+                    }
                   }
                 }
               }
@@ -40,9 +40,13 @@ metadata:
           },
           "spec": {
             "healthCheck": {
-              "endpoint": "/",
               "protocol": "HTTP"
             },
+            "providerRefs": [
+              {
+                "name": "provider-ref"
+              }
+            ],
             "targetRef": {
               "group": "gateway.networking.k8s.io",
               "kind": "Gateway",
@@ -54,7 +58,7 @@ metadata:
           "apiVersion": "kuadrant.io/v1",
           "kind": "RateLimitPolicy",
           "metadata": {
-            "name": "toystore"
+            "name": "ratelimitpolicy-sample"
           },
           "spec": {
             "limits": {
diff --git a/config/samples/kuadrant_v1_authpolicy.yaml b/config/samples/kuadrant_v1_authpolicy.yaml
index 669ed20a0..483113058 100644
--- a/config/samples/kuadrant_v1_authpolicy.yaml
+++ b/config/samples/kuadrant_v1_authpolicy.yaml
@@ -2,7 +2,7 @@
 apiVersion: kuadrant.io/v1
 kind: AuthPolicy
 metadata:
-  name: toystore
+  name: authpolicy-sample
 spec:
   targetRef:
     group: gateway.networking.k8s.io
@@ -13,6 +13,6 @@ spec:
       "apikey":
         apiKey:
           selector: {}
-      credentials:
-        authorizationHeader:
-          prefix: APIKEY
+        credentials:
+          authorizationHeader:
+            prefix: APIKEY
diff --git a/config/samples/kuadrant_v1_dnspolicy.yaml b/config/samples/kuadrant_v1_dnspolicy.yaml
index c1c59c5f4..0f669a71d 100644
--- a/config/samples/kuadrant_v1_dnspolicy.yaml
+++ b/config/samples/kuadrant_v1_dnspolicy.yaml
@@ -9,5 +9,6 @@ spec:
     group: gateway.networking.k8s.io
     kind: Gateway
   healthCheck:
-    endpoint: /
     protocol: HTTP
+  providerRefs:
+   - name: "provider-ref"
diff --git a/config/samples/kuadrant_v1_ratelimitpolicy.yaml b/config/samples/kuadrant_v1_ratelimitpolicy.yaml
index 3df46583a..f5f6e3825 100644
--- a/config/samples/kuadrant_v1_ratelimitpolicy.yaml
+++ b/config/samples/kuadrant_v1_ratelimitpolicy.yaml
@@ -2,7 +2,7 @@
 apiVersion: kuadrant.io/v1
 kind: RateLimitPolicy
 metadata:
-  name: toystore
+  name: ratelimitpolicy-sample
 spec:
   targetRef:
     group: gateway.networking.k8s.io