diff --git a/get_all_manifests.sh b/get_all_manifests.sh
index 58ba4f032cf..6ff480c5d25 100755
--- a/get_all_manifests.sh
+++ b/get_all_manifests.sh
@@ -6,19 +6,19 @@ GITHUB_URL="https://github.com/"
 # component: notebook, dsp, kserve, dashbaord, cf/ray/kueue, trustyai, modelmesh, modelregistry.
 # in the format of "repo-org:repo-name:branch-name:source-folder:target-folder".
 declare -A COMPONENT_MANIFESTS=(
-    ["codeflare"]="opendatahub-io:codeflare-operator:main:config:codeflare"
-    ["ray"]="opendatahub-io:kuberay:master:ray-operator/config:ray"
-    ["kueue"]="opendatahub-io:kueue:dev:config:kueue"
-    ["data-science-pipelines-operator"]="opendatahub-io:data-science-pipelines-operator:main:config:data-science-pipelines-operator"
-    ["odh-dashboard"]="opendatahub-io:odh-dashboard:incubation:manifests:dashboard"
-    ["kf-notebook-controller"]="opendatahub-io:kubeflow:v1.7-branch:components/notebook-controller/config:odh-notebook-controller/kf-notebook-controller"
-    ["odh-notebook-controller"]="opendatahub-io:kubeflow:v1.7-branch:components/odh-notebook-controller/config:odh-notebook-controller/odh-notebook-controller"
-    ["notebooks"]="opendatahub-io:notebooks:main:manifests:notebooks"
-    ["trustyai"]="trustyai-explainability:trustyai-service-operator:release/1.10.2:config:trustyai-service-operator"
-    ["model-mesh"]="opendatahub-io:modelmesh-serving:release-0.11.1:config:model-mesh"
-    ["odh-model-controller"]="opendatahub-io:odh-model-controller:release-0.11.1:config:odh-model-controller"
-    ["kserve"]="opendatahub-io:kserve:release-v0.11.1:config:kserve"
-    ["modelregistry"]="opendatahub-io:model-registry-operator:main:config:model-registry-operator"
+    ["codeflare"]="opendatahub-io:codeflare-operator:v1.2.0:config:codeflare"
+    ["ray"]="opendatahub-io:kuberay:v1.0.0-rhoai:ray-operator/config:ray"
+    ["kueue"]="opendatahub-io:kueue:v0.6.0-rhoai-2.9:config:kueue"
+    ["data-science-pipelines-operator"]="opendatahub-io:data-science-pipelines-operator:v2.0.1:config:data-science-pipelines-operator"
+    ["odh-dashboard"]="opendatahub-io:odh-dashboard:v2.21.1-incubation-release:manifests:dashboard"
+    ["kf-notebook-controller"]="opendatahub-io:kubeflow:v1.7.0-7:components/notebook-controller/config:odh-notebook-controller/kf-notebook-controller"
+    ["odh-notebook-controller"]="opendatahub-io:kubeflow:v1.7.0-7:components/odh-notebook-controller/config:odh-notebook-controller/odh-notebook-controller"
+    ["notebooks"]="opendatahub-io:notebooks:v1.15.0:manifests:notebooks"
+    ["trustyai"]="trustyai-explainability:trustyai-service-operator:release/1.17.0:config:trustyai-service-operator"
+    ["model-mesh"]="opendatahub-io:modelmesh-serving:v0.11.1.3:config:model-mesh"
+    ["odh-model-controller"]="opendatahub-io:odh-model-controller:v0.11.1.3:config:odh-model-controller"
+    ["kserve"]="opendatahub-io:kserve:v0.11.1.3:config:kserve"
+    ["modelregistry"]="opendatahub-io:model-registry-operator:v0.1.2:config:model-registry-operator"
 )
 
 # Allow overwriting repo using flags component=repo
diff --git a/pkg/upgrade/upgrade.go b/pkg/upgrade/upgrade.go
index 0962b997ff3..2675fa29c37 100644
--- a/pkg/upgrade/upgrade.go
+++ b/pkg/upgrade/upgrade.go
@@ -383,7 +383,7 @@ func CleanupExistingResource(ctx context.Context, cli client.Client, platform de
 	JupyterhubApp := schema.GroupVersionKind{
 		Group:   "dashboard.opendatahub.io",
 		Version: "v1",
-		Kind:    "odhapplications",
+		Kind:    "OdhApplication",
 	}
 	multiErr = multierror.Append(multiErr, removOdhApplicationsCR(ctx, cli, JupyterhubApp, "jupyterhub", dscApplicationsNamespace))
 	return multiErr.ErrorOrNil()
@@ -541,7 +541,7 @@ func deleteDeprecatedServiceMonitors(ctx context.Context, cli client.Client, nam
 func removOdhApplicationsCR(ctx context.Context, cli client.Client, gvk schema.GroupVersionKind, instanceName string, applicationNS string) error {
 	// first check if CRD in cluster
 	crd := &apiextv1.CustomResourceDefinition{}
-	if err := cli.Get(ctx, client.ObjectKey{Name: fmt.Sprintf("%s.%s", gvk.Kind, gvk.Group)}, crd); err != nil {
+	if err := cli.Get(ctx, client.ObjectKey{Name: "odhapplications.dashboard.opendatahub.io"}, crd); err != nil {
 		return client.IgnoreNotFound(err)
 	}