diff --git a/bootstrap/applicationset/applicationset-bootstrap.yaml b/bootstrap/applicationset/applicationset-bootstrap.yaml
index bbb58d0e..e1a3efc7 100644
--- a/bootstrap/applicationset/applicationset-bootstrap.yaml
+++ b/bootstrap/applicationset/applicationset-bootstrap.yaml
@@ -5,66 +5,76 @@ metadata:
   namespace: openshift-gitops
 spec:
   generators:
-  - list:
-      elements:
-      - cluster: in-cluster
-        name: ic-shared-minio-app
-        repoURL: https://github.com/rh-aiservices-bu/parasol-insurance.git
-        targetRevision: dev
-        path: bootstrap/ic-shared-minio
-      - cluster: in-cluster
-        name: ic-shared-database-app
-        repoURL: https://github.com/rh-aiservices-bu/parasol-insurance.git
-        targetRevision: dev
-        path: bootstrap/ic-shared-database
-      - cluster: in-cluster
-        name: ic-shared-llm-app
-        repoURL: https://github.com/rh-aiservices-bu/parasol-insurance.git
-        targetRevision: dev
-        path: bootstrap/ic-shared-llm
-      - cluster: in-cluster
-        name: ic-shared-img-det
-        repoURL: https://github.com/rh-aiservices-bu/parasol-insurance.git
-        targetRevision: dev
-        path: bootstrap/ic-shared-img-det
-      - cluster: in-cluster
-        name: ic-rhoai-configuration
-        repoURL: https://github.com/rh-aiservices-bu/parasol-insurance.git
-        targetRevision: dev
-        path: bootstrap/ic-rhoai-configuration
-      - cluster: in-cluster
-        name: ic-user-projects
-        repoURL: https://github.com/rh-aiservices-bu/parasol-insurance.git
-        targetRevision: dev
-        path: bootstrap/ic-user-projects
-      - cluster: in-cluster
-        name: ic-shared-milvus
-        repoURL: https://github.com/rh-aiservices-bu/parasol-insurance.git
-        targetRevision: dev
-        path: bootstrap/ic-shared-milvus
-      - cluster: in-cluster
-        name: ic-shared-app
-        repoURL: https://github.com/rh-aiservices-bu/parasol-insurance.git
-        targetRevision: dev
-        path: bootstrap/ic-shared-app
+    - list:
+        elements:
+          - cluster: in-cluster
+            name: ic-rhoai-operator
+            repoURL: https://github.com/rh-aiservices-bu/parasol-insurance.git
+            targetRevision: dev
+            path: bootstrap/ic-rhoai-operator
+          - cluster: in-cluster
+            name: ic-rhoai-installation
+            repoURL: https://github.com/rh-aiservices-bu/parasol-insurance.git
+            targetRevision: dev
+            path: bootstrap/ic-rhoai-installation
+          - cluster: in-cluster
+            name: ic-shared-minio-app
+            repoURL: https://github.com/rh-aiservices-bu/parasol-insurance.git
+            targetRevision: dev
+            path: bootstrap/ic-shared-minio
+          - cluster: in-cluster
+            name: ic-shared-database-app
+            repoURL: https://github.com/rh-aiservices-bu/parasol-insurance.git
+            targetRevision: dev
+            path: bootstrap/ic-shared-database
+          - cluster: in-cluster
+            name: ic-shared-llm-app
+            repoURL: https://github.com/rh-aiservices-bu/parasol-insurance.git
+            targetRevision: dev
+            path: bootstrap/ic-shared-llm
+          - cluster: in-cluster
+            name: ic-shared-img-det
+            repoURL: https://github.com/rh-aiservices-bu/parasol-insurance.git
+            targetRevision: dev
+            path: bootstrap/ic-shared-img-det
+          - cluster: in-cluster
+            name: ic-rhoai-configuration
+            repoURL: https://github.com/rh-aiservices-bu/parasol-insurance.git
+            targetRevision: dev
+            path: bootstrap/ic-rhoai-configuration
+          - cluster: in-cluster
+            name: ic-user-projects
+            repoURL: https://github.com/rh-aiservices-bu/parasol-insurance.git
+            targetRevision: dev
+            path: bootstrap/ic-user-projects
+          - cluster: in-cluster
+            name: ic-shared-milvus
+            repoURL: https://github.com/rh-aiservices-bu/parasol-insurance.git
+            targetRevision: dev
+            path: bootstrap/ic-shared-milvus
+          - cluster: in-cluster
+            name: ic-shared-app
+            repoURL: https://github.com/rh-aiservices-bu/parasol-insurance.git
+            targetRevision: dev
+            path: bootstrap/ic-shared-app
   template:
     metadata:
-      name: '{{name}}'
+      name: "{{name}}"
       namespace: openshift-gitops
       labels:
         component: bootstrap
-        purpose: '{{name}}'
+        purpose: "{{name}}"
     spec:
       project: default
       source:
-        repoURL: '{{repoURL}}'
-        targetRevision: '{{targetRevision}}'
-        path: '{{path}}'
+        repoURL: "{{repoURL}}"
+        targetRevision: "{{targetRevision}}"
+        path: "{{path}}"
       destination:
-        server: 'https://kubernetes.default.svc'
+        server: "https://kubernetes.default.svc"
       syncPolicy:
         automated:
           prune: true
           selfHeal: true
         syncOptions:
-          - RespectIgnoreDifferences=true
\ No newline at end of file
+          - RespectIgnoreDifferences=true
diff --git a/bootstrap/ic-rhoai-configuration/kustomization.yaml b/bootstrap/ic-rhoai-configuration/kustomization.yaml
index 04407b77..c7799db7 100644
--- a/bootstrap/ic-rhoai-configuration/kustomization.yaml
+++ b/bootstrap/ic-rhoai-configuration/kustomization.yaml
@@ -6,16 +6,14 @@ commonLabels:
   component: ic-rhoai-configuration
 
 resources:
-# wave 0
-- gp3-remove-default.yaml
-- ceph-rbd-set-default.yaml
-# wave 1
-- workbench-imagestream.yaml
-- workbench-vscode-is.yaml
-- odhdashboardconfig.yaml
-- accelerator-profile.yaml
-# wave 2
-- images-puller.yaml
-
-
-  
+  # wave 0
+  - gp3-remove-default.yaml
+  - ceph-rbd-set-default.yaml
+  - namespace-notebooks.yaml
+  # wave 1
+  - workbench-imagestream.yaml
+  - workbench-vscode-is.yaml
+  - odhdashboardconfig.yaml
+  - accelerator-profile.yaml
+  # wave 2
+  - images-puller.yaml
diff --git a/bootstrap/ic-rhoai-configuration/namespace-notebooks.yaml b/bootstrap/ic-rhoai-configuration/namespace-notebooks.yaml
new file mode 100644
index 00000000..5d8f86f0
--- /dev/null
+++ b/bootstrap/ic-rhoai-configuration/namespace-notebooks.yaml
@@ -0,0 +1,6 @@
+apiVersion: v1
+kind: Namespace
+metadata:
+  annotations:
+    argocd.argoproj.io/sync-wave: "0"
+  name: rhods-notebooks
diff --git a/bootstrap/ic-rhoai-configuration/workbench-imagestream.yaml b/bootstrap/ic-rhoai-configuration/workbench-imagestream.yaml
index 985949ff..f39665b8 100644
--- a/bootstrap/ic-rhoai-configuration/workbench-imagestream.yaml
+++ b/bootstrap/ic-rhoai-configuration/workbench-imagestream.yaml
@@ -6,22 +6,22 @@ metadata:
     opendatahub.io/notebook-image-desc: >-
       Jupyter notebook image with all the libraries needed for the OpenShift AI Insurance Claim Lab.
     opendatahub.io/notebook-image-name: CUSTOM - Insurance Claim Processing Lab Workbench
-    opendatahub.io/notebook-image-order: '01'
+    opendatahub.io/notebook-image-order: "01"
     opendatahub.io/notebook-image-url: >-
       https://github.com/rh-aiservices-bu/parasol-insurance/tree/main/bootstrap/workbench-image
-    opendatahub.io/recommended-accelerators: '[]'
+    opendatahub.io/recommended-accelerators: "[]"
     argocd.argoproj.io/sync-wave: "1"
   name: ic-workbench
   namespace: redhat-ods-applications
   labels:
     app.kubernetes.io/created-by: byon
-    opendatahub.io/dashboard: 'true'
-    opendatahub.io/notebook-image: 'true'
+    opendatahub.io/dashboard: "true"
+    opendatahub.io/notebook-image: "true"
 spec:
   lookupPolicy:
     local: true
   tags:
-    - name: '2.1.2'
+    - name: "2.1.2"
       annotations:
         opendatahub.io/notebook-python-dependencies: >-
           [{"name":"PyTorch","version":"2.2.2"},{"name":"Langchain","version":"0.1.12"},{"name":"Ultralytics","version":"8.1.47"},]
diff --git a/bootstrap/ic-rhoai-installation/dsci.yaml b/bootstrap/ic-rhoai-installation/dsci.yaml
new file mode 100644
index 00000000..0f4131de
--- /dev/null
+++ b/bootstrap/ic-rhoai-installation/dsci.yaml
@@ -0,0 +1,37 @@
+kind: DataScienceCluster
+apiVersion: datasciencecluster.opendatahub.io/v1
+metadata:
+  name: default
+  annotations:
+    argocd.argoproj.io/sync-wave: "1"
+spec:
+  components:
+    codeflare:
+      devFlags: {}
+      managementState: Managed
+    dashboard:
+      devFlags: {}
+      managementState: Managed
+    datasciencepipelines:
+      devFlags: {}
+      managementState: Managed
+    kserve:
+      devFlags: {}
+      managementState: Managed
+      serving:
+        ingressGateway:
+          certificate:
+            type: OpenshiftDefaultIngress
+        managementState: Managed
+        name: knative-serving
+    modelmeshserving:
+      devFlags: {}
+      managementState: Managed
+    ray:
+      devFlags: {}
+      managementState: Managed
+    trustyai:
+      devFlags: {}
+      managementState: Removed
+    workbenches:
+      managementState: Managed
diff --git a/bootstrap/ic-rhoai-installation/kustomization.yaml b/bootstrap/ic-rhoai-installation/kustomization.yaml
new file mode 100644
index 00000000..fdd4ff05
--- /dev/null
+++ b/bootstrap/ic-rhoai-installation/kustomization.yaml
@@ -0,0 +1,6 @@
+apiVersion: kustomize.config.k8s.io/v1beta1
+kind: Kustomization
+
+resources:
+  # wave 1
+  - dsci.yaml
diff --git a/bootstrap/ic-rhoai-operator/kustomization.yaml b/bootstrap/ic-rhoai-operator/kustomization.yaml
new file mode 100644
index 00000000..b4624623
--- /dev/null
+++ b/bootstrap/ic-rhoai-operator/kustomization.yaml
@@ -0,0 +1,8 @@
+apiVersion: kustomize.config.k8s.io/v1beta1
+kind: Kustomization
+
+resources:
+  # wave 0
+  - namespace.yaml
+  - operator-group.yaml
+  - subscription.yaml
diff --git a/bootstrap/ic-rhoai-operator/namespace.yaml b/bootstrap/ic-rhoai-operator/namespace.yaml
new file mode 100644
index 00000000..72890502
--- /dev/null
+++ b/bootstrap/ic-rhoai-operator/namespace.yaml
@@ -0,0 +1,9 @@
+apiVersion: v1
+kind: Namespace
+metadata:
+  annotations:
+    openshift.io/display-name: "Red Hat OpenShift AI"
+    argocd.argoproj.io/sync-wave: "0"
+  labels:
+    openshift.io/cluster-monitoring: "true"
+  name: redhat-ods-operator
diff --git a/bootstrap/ic-rhoai-operator/operator-group.yaml b/bootstrap/ic-rhoai-operator/operator-group.yaml
new file mode 100644
index 00000000..6dd0b0b8
--- /dev/null
+++ b/bootstrap/ic-rhoai-operator/operator-group.yaml
@@ -0,0 +1,7 @@
+apiVersion: operators.coreos.com/v1
+kind: OperatorGroup
+metadata:
+  name: rhods-operator-group
+  namespace: redhat-ods-operator
+  annotations:
+    argocd.argoproj.io/sync-wave: "0"
diff --git a/bootstrap/ic-rhoai-operator/subscription.yaml b/bootstrap/ic-rhoai-operator/subscription.yaml
new file mode 100644
index 00000000..c00ca4dd
--- /dev/null
+++ b/bootstrap/ic-rhoai-operator/subscription.yaml
@@ -0,0 +1,13 @@
+apiVersion: operators.coreos.com/v1alpha1
+kind: Subscription
+metadata:
+  name: rhods-operator
+  namespace: redhat-ods-operator
+  annotations:
+    argocd.argoproj.io/sync-wave: "0"
+spec:
+  channel: stable-2.13
+  installPlanApproval: Automatic
+  name: rhods-operator
+  source: redhat-operators
+  sourceNamespace: openshift-marketplace
diff --git a/bootstrap/ic-shared-img-det/add-model-job.yaml b/bootstrap/ic-shared-img-det/add-model-job.yaml
index 81e9d381..8a452a76 100644
--- a/bootstrap/ic-shared-img-det/add-model-job.yaml
+++ b/bootstrap/ic-shared-img-det/add-model-job.yaml
@@ -4,7 +4,7 @@ kind: Job
 metadata:
   name: add-model-job
   annotations:
-    argocd.argoproj.io/sync-wave: "2"
+    argocd.argoproj.io/sync-wave: "3"
 spec:
   backoffLimit: 4
   template:
diff --git a/bootstrap/ic-shared-img-det/create-data-connection.yaml b/bootstrap/ic-shared-img-det/create-data-connection.yaml
index cdb01dfa..67342862 100644
--- a/bootstrap/ic-shared-img-det/create-data-connection.yaml
+++ b/bootstrap/ic-shared-img-det/create-data-connection.yaml
@@ -5,8 +5,6 @@ metadata:
   name: create-data-connection
   annotations:
     argocd.argoproj.io/sync-wave: "1"
-    argocd.argoproj.io/hook: Sync
-    argocd.argoproj.io/hook-delete-policy: BeforeHookCreation
 spec:
   backoffLimit: 4
   template:
diff --git a/bootstrap/ic-shared-img-det/kustomization.yaml b/bootstrap/ic-shared-img-det/kustomization.yaml
index e82ccc3b..688a655f 100644
--- a/bootstrap/ic-shared-img-det/kustomization.yaml
+++ b/bootstrap/ic-shared-img-det/kustomization.yaml
@@ -8,11 +8,16 @@ commonLabels:
 namespace: ic-shared-img-det
 
 resources:
+# wave 0
 - project.yaml
+# wave 1
 - setup-serviceaccount.yaml
+# wave 2
 - create-data-connection.yaml
+# wave 3
 - add-model-job.yaml
 - runtime.yaml
+# wave 4
 - model.yaml
 # pinger is not ready yet
 # - pinger.yaml
diff --git a/bootstrap/ic-shared-img-det/model.yaml b/bootstrap/ic-shared-img-det/model.yaml
index e3a8df64..bcd258a4 100644
--- a/bootstrap/ic-shared-img-det/model.yaml
+++ b/bootstrap/ic-shared-img-det/model.yaml
@@ -1,31 +1,9 @@
-# ---
-# apiVersion: serving.kserve.io/v1beta1
-# kind: InferenceService
-# metadata:
-#   annotations:
-#     openshift.io/display-name: accident
-#     serving.kserve.io/deploymentMode: ModelMesh
-#     argocd.argoproj.io/sync-wave: "3"
-#     argocd.argoproj.io/sync-options: SkipDryRunOnMissingResource=true
-#   labels:
-#     name: accident
-#     opendatahub.io/dashboard: "true"
-#   name: accident
-# spec:
-#   predictor:
-#     model:
-#       modelFormat:
-#         name: onnx
-#         version: "1"
-#       runtime: triton
-#       storage:
-#         key: aws-connection-minio
-#         path: accident/
 ---
 apiVersion: serving.kserve.io/v1beta1
 kind: InferenceService
 metadata:
   annotations:
+    argocd.argoproj.io/sync-wave: "4"
     openshift.io/display-name: img-det
     serving.kserve.io/deploymentMode: ModelMesh
   labels:
diff --git a/bootstrap/ic-shared-img-det/runtime.yaml b/bootstrap/ic-shared-img-det/runtime.yaml
index 4753e594..173185ff 100644
--- a/bootstrap/ic-shared-img-det/runtime.yaml
+++ b/bootstrap/ic-shared-img-det/runtime.yaml
@@ -1,87 +1,9 @@
-# ---
-# apiVersion: serving.kserve.io/v1alpha1
-# kind: ServingRuntime
-# metadata:
-#   annotations:
-#     enable-auth: "false"
-#     enable-route: "false"
-#     maxLoadingConcurrency: "2"
-#     opendatahub.io/template-display-name: Triton runtime 23.11
-#     opendatahub.io/template-name: triton-23.11-20231217
-#     openshift.io/display-name: "Triton 23.11 - added on 20231217"
-#     argocd.argoproj.io/sync-wave: "3"
-#     argocd.argoproj.io/sync-options: SkipDryRunOnMissingResource=true
-#   labels:
-#     name: triton
-#     opendatahub.io/dashboard: "true"
-#   name: triton
-# spec:
-#   builtInAdapter:
-#     memBufferBytes: 134217728
-#     modelLoadingTimeoutMillis: 90000
-#     runtimeManagementPort: 8001
-#     serverType: triton
-#   containers:
-#   - args:
-#     - -c
-#     - 'mkdir -p /models/_triton_models; chmod 777 /models/_triton_models; exec tritonserver
-#       "--model-repository=/models/_triton_models" "--model-control-mode=explicit"
-#       "--strict-model-config=false" "--strict-readiness=false" "--allow-http=true"
-#       "--allow-sagemaker=false" '
-#     command:
-#     - /bin/sh
-#     image: nvcr.io/nvidia/tritonserver:23.11-py3
-#     livenessProbe:
-#       exec:
-#         command:
-#         - curl
-#         - --fail
-#         - --silent
-#         - --show-error
-#         - --max-time
-#         - "9"
-#         - http://localhost:8000/v2/health/live
-#       initialDelaySeconds: 5
-#       periodSeconds: 30
-#       timeoutSeconds: 10
-#     name: triton
-#     resources:
-#       limits:
-#         cpu: "1"
-#         memory: 8Gi
-#       requests:
-#         cpu: "1"
-#         memory: 2Gi
-#   grpcDataEndpoint: port:8001
-#   grpcEndpoint: port:8085
-#   multiModel: true
-#   protocolVersions:
-#   - grpc-v2
-#   replicas: 1
-#   supportedModelFormats:
-#   - autoSelect: true
-#     name: keras
-#     version: "2"
-#   - autoSelect: true
-#     name: onnx
-#     version: "1"
-#   - autoSelect: true
-#     name: pytorch
-#     version: "1"
-#   - autoSelect: true
-#     name: tensorflow
-#     version: "1"
-#   - autoSelect: true
-#     name: tensorflow
-#     version: "2"
-#   - autoSelect: true
-#     name: tensorrt
-#     version: "7"
 ---
 apiVersion: serving.kserve.io/v1alpha1
 kind: ServingRuntime
 metadata:
   annotations:
+    argocd.argoproj.io/sync-wave: "3"
     enable-route: 'true'
     opendatahub.io/accelerator-name: ''
     opendatahub.io/template-display-name: OpenVINO Model Server
diff --git a/bootstrap/ic-shared-milvus/kustomization.yml b/bootstrap/ic-shared-milvus/kustomization.yml
index ccc74c21..65b5fbd2 100644
--- a/bootstrap/ic-shared-milvus/kustomization.yml
+++ b/bootstrap/ic-shared-milvus/kustomization.yml
@@ -13,8 +13,8 @@ resources:
 # wave 1
 - milvus-backup-config.yaml
 - milvus-config.yaml
-- milvus-pvc.yaml
 # wave 2
+- milvus-pvc.yaml
 - milvus-deployment.yaml
 - milvus-services.yaml
 - milvus-backup-deployment.yaml