diff --git a/components/configs/kustomized/minio/base/data-connector-rb.yaml b/components/configs/kustomized/minio/base/data-connector-rb.yaml
index bc61694a..398ff7c3 100644
--- a/components/configs/kustomized/minio/base/data-connector-rb.yaml
+++ b/components/configs/kustomized/minio/base/data-connector-rb.yaml
@@ -15,7 +15,10 @@ subjects:
   namespace: ds-group
 - kind: ServiceAccount
   name: data-connection-setup
-  namespace: ds-kserve-project
+  namespace: ds-kserve
+- kind: ServiceAccount
+  name: data-connection-setup
+  namespace: ds-modelmesh
 - kind: ServiceAccount
   name: data-connection-setup
   namespace: openshift-adp
diff --git a/components/configs/kustomized/rhoai-data-connector/overlays/kserve-project/kustomization.yaml b/components/configs/kustomized/rhoai-data-connector/overlays/kserve-project/kustomization.yaml
index 216b6425..b48c9b6e 100644
--- a/components/configs/kustomized/rhoai-data-connector/overlays/kserve-project/kustomization.yaml
+++ b/components/configs/kustomized/rhoai-data-connector/overlays/kserve-project/kustomization.yaml
@@ -1,7 +1,7 @@
 apiVersion: kustomize.config.k8s.io/v1beta1
 kind: Kustomization
 
-namespace: ds-kserve-project
+namespace: ds-kserve
 
 resources:
   - ../../base
@@ -14,4 +14,4 @@ patches:
     patch: |-
       - op: add
         path: /subjects/0/namespace
-        value: ds-kserve-project
+        value: ds-kserve
diff --git a/components/configs/kustomized/rhoai-data-connector/overlays/modelmesh-project/kustomization.yaml b/components/configs/kustomized/rhoai-data-connector/overlays/modelmesh-project/kustomization.yaml
new file mode 100644
index 00000000..65edb045
--- /dev/null
+++ b/components/configs/kustomized/rhoai-data-connector/overlays/modelmesh-project/kustomization.yaml
@@ -0,0 +1,17 @@
+apiVersion: kustomize.config.k8s.io/v1beta1
+kind: Kustomization
+
+namespace: ds-modelmesh
+
+resources:
+  - ../../base
+
+patches:
+  - target:
+      group: rbac.authorization.k8s.io
+      version: v1
+      kind: RoleBinding
+    patch: |-
+      - op: add
+        path: /subjects/0/namespace
+        value: ds-modelmesh
diff --git a/components/configs/kustomized/rhoai-kserve-instances/kustomization.yaml b/components/configs/kustomized/rhoai-kserve-instances/kustomization.yaml
index c3e8e44c..688a4693 100644
--- a/components/configs/kustomized/rhoai-kserve-instances/kustomization.yaml
+++ b/components/configs/kustomized/rhoai-kserve-instances/kustomization.yaml
@@ -1,7 +1,7 @@
 apiVersion: kustomize.config.k8s.io/v1beta1
 kind: Kustomization
 
-namespace: ds-kserve-project
+namespace: ds-kserve
 
 resources:
 - caikit-tgis
diff --git a/components/configs/kustomized/rhoai-modelmesh-instances/upload-model-fraud-job.yaml b/components/configs/kustomized/rhoai-modelmesh-instances/base/job-upload-model.yaml
similarity index 98%
rename from components/configs/kustomized/rhoai-modelmesh-instances/upload-model-fraud-job.yaml
rename to components/configs/kustomized/rhoai-modelmesh-instances/base/job-upload-model.yaml
index 67108a02..657aae28 100644
--- a/components/configs/kustomized/rhoai-modelmesh-instances/upload-model-fraud-job.yaml
+++ b/components/configs/kustomized/rhoai-modelmesh-instances/base/job-upload-model.yaml
@@ -23,7 +23,7 @@ subjects:
 apiVersion: batch/v1
 kind: Job
 metadata:
-  name: add-model-job
+  name: job-upload-model
   annotations:
     argocd.argoproj.io/sync-wave: "2"
 spec:
diff --git a/components/configs/kustomized/rhoai-modelmesh-instances/base/kustomization.yaml b/components/configs/kustomized/rhoai-modelmesh-instances/base/kustomization.yaml
new file mode 100644
index 00000000..4ff7ec02
--- /dev/null
+++ b/components/configs/kustomized/rhoai-modelmesh-instances/base/kustomization.yaml
@@ -0,0 +1,7 @@
+apiVersion: kustomize.config.k8s.io/v1beta1
+kind: Kustomization
+
+resources:
+- openvino
+- triton
+- job-upload-model.yaml
diff --git a/components/configs/kustomized/rhoai-modelmesh-instances/openvino/kustomization.yaml b/components/configs/kustomized/rhoai-modelmesh-instances/base/openvino/kustomization.yaml
similarity index 100%
rename from components/configs/kustomized/rhoai-modelmesh-instances/openvino/kustomization.yaml
rename to components/configs/kustomized/rhoai-modelmesh-instances/base/openvino/kustomization.yaml
diff --git a/components/configs/kustomized/rhoai-modelmesh-instances/openvino/model.yaml b/components/configs/kustomized/rhoai-modelmesh-instances/base/openvino/model.yaml
similarity index 100%
rename from components/configs/kustomized/rhoai-modelmesh-instances/openvino/model.yaml
rename to components/configs/kustomized/rhoai-modelmesh-instances/base/openvino/model.yaml
diff --git a/components/configs/kustomized/rhoai-modelmesh-instances/openvino/server.yaml b/components/configs/kustomized/rhoai-modelmesh-instances/base/openvino/server.yaml
similarity index 100%
rename from components/configs/kustomized/rhoai-modelmesh-instances/openvino/server.yaml
rename to components/configs/kustomized/rhoai-modelmesh-instances/base/openvino/server.yaml
diff --git a/components/configs/kustomized/rhoai-modelmesh-instances/triton/kustomization.yaml b/components/configs/kustomized/rhoai-modelmesh-instances/base/triton/kustomization.yaml
similarity index 100%
rename from components/configs/kustomized/rhoai-modelmesh-instances/triton/kustomization.yaml
rename to components/configs/kustomized/rhoai-modelmesh-instances/base/triton/kustomization.yaml
diff --git a/components/configs/kustomized/rhoai-modelmesh-instances/triton/model-onnx.yaml b/components/configs/kustomized/rhoai-modelmesh-instances/base/triton/model-onnx.yaml
similarity index 100%
rename from components/configs/kustomized/rhoai-modelmesh-instances/triton/model-onnx.yaml
rename to components/configs/kustomized/rhoai-modelmesh-instances/base/triton/model-onnx.yaml
diff --git a/components/configs/kustomized/rhoai-modelmesh-instances/triton/model-tf.yaml b/components/configs/kustomized/rhoai-modelmesh-instances/base/triton/model-tf.yaml
similarity index 100%
rename from components/configs/kustomized/rhoai-modelmesh-instances/triton/model-tf.yaml
rename to components/configs/kustomized/rhoai-modelmesh-instances/base/triton/model-tf.yaml
diff --git a/components/configs/kustomized/rhoai-modelmesh-instances/triton/server.yaml b/components/configs/kustomized/rhoai-modelmesh-instances/base/triton/server.yaml
similarity index 100%
rename from components/configs/kustomized/rhoai-modelmesh-instances/triton/server.yaml
rename to components/configs/kustomized/rhoai-modelmesh-instances/base/triton/server.yaml
diff --git a/components/configs/kustomized/rhoai-modelmesh-instances/kustomization.yaml b/components/configs/kustomized/rhoai-modelmesh-instances/overlays/group-project/kustomization.yaml
similarity index 65%
rename from components/configs/kustomized/rhoai-modelmesh-instances/kustomization.yaml
rename to components/configs/kustomized/rhoai-modelmesh-instances/overlays/group-project/kustomization.yaml
index 96ac5dd6..f1296fe5 100644
--- a/components/configs/kustomized/rhoai-modelmesh-instances/kustomization.yaml
+++ b/components/configs/kustomized/rhoai-modelmesh-instances/overlays/group-project/kustomization.yaml
@@ -4,6 +4,4 @@ kind: Kustomization
 namespace: ds-group
 
 resources:
-- openvino
-- triton
-- upload-model-fraud-job.yaml
+- ../../base
diff --git a/components/configs/kustomized/rhoai-modelmesh-instances/overlays/modelmesh-project/kustomization.yaml b/components/configs/kustomized/rhoai-modelmesh-instances/overlays/modelmesh-project/kustomization.yaml
new file mode 100644
index 00000000..164d02b5
--- /dev/null
+++ b/components/configs/kustomized/rhoai-modelmesh-instances/overlays/modelmesh-project/kustomization.yaml
@@ -0,0 +1,7 @@
+apiVersion: kustomize.config.k8s.io/v1beta1
+kind: Kustomization
+
+namespace: ds-modelmesh
+
+resources:
+- ../../base
diff --git a/demos/rhoai-extended/kustomization.yaml b/demos/rhoai-extended/kustomization.yaml
index c20c8767..fcf00cc3 100644
--- a/demos/rhoai-extended/kustomization.yaml
+++ b/demos/rhoai-extended/kustomization.yaml
@@ -8,8 +8,9 @@ resources:
   - ../../components/configs/kustomized/minio/overlays/with-namespace
   - ../../components/configs/kustomized/rhoai-config
   - ../../components/configs/kustomized/rhoai-data-connector/overlays/group-project
-  # - ../../components/configs/kustomized/rhoai-data-connector/overlays/kserve-project
-  # - ../../components/configs/kustomized/rhoai-modelmesh-instances
+  - ../../components/configs/kustomized/rhoai-data-connector/overlays/kserve-project
+  - ../../components/configs/kustomized/rhoai-data-connector/overlays/modelmesh-project
+  - ../../components/configs/kustomized/rhoai-modelmesh-instances/overlays/modelmesh-project
   # - ../../components/configs/kustomized/rhoai-modelmesh-runtimes
   # - ../../components/configs/kustomized/rhoai-kserve-instances
   - ../../components/configs/kustomized/rhoai-notebook/overlays/group-project