diff --git a/docs/draft/howto/enable-webhook-support.md b/docs/draft/howto/enable-webhook-support.md
index b21290a57..2ab856bf0 100644
--- a/docs/draft/howto/enable-webhook-support.md
+++ b/docs/draft/howto/enable-webhook-support.md
@@ -15,17 +15,13 @@ certificate provider. Currently, two certificate providers are supported: CertMa
 
 As CertManager is already installed with OLMv1, we suggest using `WebhookProviderCertManager`.
 
-### Update OLM to enable Feature
+### Run OLM v1with Experimental Features Enabled
 
-```terminal title=Enable WebhookProviderCertManager feature
-kubectl kustomize config/overlays/featuregate/webhook-provider-certmanager | kubectl apply -f -
+```terminal title=Enable Experimental Features in a New Kind Cluster
+make run-experimental
 ```
 
-Or,
-
-```terminal title=Enable WebhookProviderOpenshiftServiceCA feature
-kubectl kustomize config/overlays/featuregate/webhook-provider-openshift-serviceca | kubectl apply -f -
-```
+This will enable only the `WebhookProviderCertManager` feature-gate, which works with cert-manager.
 
 Then,
 
diff --git a/docs/draft/howto/use-synthetic-permissions.md b/docs/draft/howto/use-synthetic-permissions.md
index 15f9c2c20..9820ad2b6 100644
--- a/docs/draft/howto/use-synthetic-permissions.md
+++ b/docs/draft/howto/use-synthetic-permissions.md
@@ -8,10 +8,10 @@ Synthetic user permissions enables fine-grained configuration of ClusterExtensio
 User can not only configure RBAC permissions governing the management across all ClusterExtensions, but also on a 
 case-by-case basis.
 
-### Update OLM to enable Feature
+### Run OLM v1with Experimental Features Enabled
 
-```terminal title=Enable SyntheticPermissions feature
-kubectl kustomize config/overlays/featuregate/synthetic-user-permissions | kubectl apply -f -
+```terminal title=Enable Experimental Features in a New Kind Cluster
+make run-experimental
 ```
 
 ```terminal title=Wait for rollout to complete
diff --git a/test/e2e/cluster_extension_install_test.go b/test/e2e/cluster_extension_install_test.go
index 3129a5a33..bc82512b9 100644
--- a/test/e2e/cluster_extension_install_test.go
+++ b/test/e2e/cluster_extension_install_test.go
@@ -317,7 +317,7 @@ func TestClusterExtensionInstallRegistry(t *testing.T) {
 		},
 		{
 			// NOTE: This test requires an extra configuration in /etc/containers/registries.conf, which is mounted
-			// for this e2e via the ./config/components/registries-conf kustomize component as part of the e2e overlay.
+			// for this e2e via the ./config/components/e2e/registries-conf kustomize component as part of the e2e component.
 			// The goal here is to prove that "mirrored-registry.operator-controller-e2e.svc.cluster.local:5000" is
 			// mapped to the "real" registry hostname ("docker-registry.operator-controller-e2e.svc.cluster.local:5000").
 			name:        "package requires mirror registry configuration in /etc/containers/registries.conf",