diff --git a/docs/DESIGN.md b/docs/DESIGN.md
index 441aea272a3..87d2ef964a5 100644
--- a/docs/DESIGN.md
+++ b/docs/DESIGN.md
@@ -62,8 +62,6 @@ To deploy ODH components seamlessly, ODH operator will watch two CRDs:
               name: knative-serving
           modelmeshserving:
             managementState: Managed
-          modelregistry:
-            managementState: Managed
           ray:
             managementState: Managed
           kueue:
diff --git a/docs/upgrade-testing.md b/docs/upgrade-testing.md
index 590a2ac8cf6..8aa6d9f0a1a 100644
--- a/docs/upgrade-testing.md
+++ b/docs/upgrade-testing.md
@@ -141,10 +141,10 @@ spec:
     kueue:
       managementState: Managed
     trainingoperator:
-      managementState: Managed
+      managementState: Removed
     workbenches:
       managementState: Managed
     trustyai:
-      managementState: Managed
+      managementState: Removed
 EOF
 ```
\ No newline at end of file
diff --git a/tests/e2e/creation_test.go b/tests/e2e/creation_test.go
index 789e4b5f700..f89d0bc5ec8 100644
--- a/tests/e2e/creation_test.go
+++ b/tests/e2e/creation_test.go
@@ -217,7 +217,7 @@ func (tc *testContext) requireInstalled(t *testing.T, gvk schema.GroupVersionKin
 	list.SetGroupVersionKind(gvk)
 
 	err := tc.customClient.List(tc.ctx, list)
-	require.NotEmptyf(t, err, "Could not get %s list", gvk.Kind)
+	require.NoErrorf(t, err, "Could not get %s list", gvk.Kind)
 	require.NotEmptyf(t, list.Items, "%s has not been installed", gvk.Kind)
 }
 
@@ -383,7 +383,7 @@ func (tc *testContext) testOwnerrefrences() error {
 	// Test Dashboard component
 	if tc.testDsc.Spec.Components.Dashboard.ManagementState == operatorv1.Managed {
 		appDeployments, err := tc.kubeClient.AppsV1().Deployments(tc.applicationsNamespace).List(tc.ctx, metav1.ListOptions{
-			LabelSelector: labels.ODH.Component(tc.testDsc.Spec.Components.Dashboard.GetComponentName()),
+			LabelSelector: labels.ODH.Component("rhods-dashboard"),
 		})
 		if err != nil {
 			return fmt.Errorf("error listing component deployments %w", err)
@@ -439,8 +439,7 @@ func (tc *testContext) testDefaultCertsAvailable() error {
 func (tc *testContext) testUpdateComponentReconcile() error {
 	// Test Updating Dashboard Replicas
 	appDeployments, err := tc.kubeClient.AppsV1().Deployments(tc.applicationsNamespace).List(tc.ctx, metav1.ListOptions{
-
-		LabelSelector: labels.ODH.Component(tc.testDsc.Spec.Components.Dashboard.GetComponentName()),
+		LabelSelector: labels.ODH.Component("rhods-dashboard"),
 	})
 	if err != nil {
 		return err
@@ -491,8 +490,7 @@ func (tc *testContext) testUpdateDSCComponentEnabled() error {
 
 	if tc.testDsc.Spec.Components.Dashboard.ManagementState == operatorv1.Managed {
 		appDeployments, err := tc.kubeClient.AppsV1().Deployments(tc.applicationsNamespace).List(tc.ctx, metav1.ListOptions{
-
-			LabelSelector: labels.ODH.Component(tc.testDsc.Spec.Components.Dashboard.GetComponentName()),
+			LabelSelector: labels.ODH.Component("rhods-dashboard"),
 		})
 		if err != nil {
 			return fmt.Errorf("error getting enabled component %v", "rhods-dashboard")