diff --git a/manifests/base/cuda-rstudio-buildconfig.yaml b/manifests/base/cuda-rstudio-buildconfig.yaml
deleted file mode 100644
index 86e1b0ebe1..0000000000
--- a/manifests/base/cuda-rstudio-buildconfig.yaml
+++ /dev/null
@@ -1,79 +0,0 @@
----
-kind: ImageStream
-apiVersion: image.openshift.io/v1
-metadata:
-  annotations:
-    opendatahub.io/notebook-image-creator: RHOAI
-    opendatahub.io/notebook-image-url: "https://github.com/red-hat-data-services/notebooks/tree/main/rstudio"
-    opendatahub.io/notebook-image-name: "RStudio | Minimal | CUDA | R 4.5"
-    opendatahub.io/notebook-image-desc: "RStudio Server Workbench image with an integrated development environment for R, a programming language designed for statistical computing and graphics."
-    opendatahub.io/recommended-accelerators: '["nvidia.com/gpu"]'
-  name: cuda-rstudio-rhel9
-spec:
-  lookupPolicy:
-    local: true
-  tags:
-    - name: latest
-      annotations:
-        # language=json
-        opendatahub.io/notebook-software: |
-          [
-            {"name":"CUDA","version":"12.8"},
-            {"name":"R","version":"v4.5"},
-            {"name":"Python","version":"v3.12"}
-          ]
-        # language=json
-        opendatahub.io/notebook-python-dependencies: |
-          [
-            {"name":"rstudio-server","version":"2025.09"}
-          ]
-      referencePolicy:
-        type: Source
----
-kind: BuildConfig
-apiVersion: build.openshift.io/v1
-metadata:
-  name: cuda-rstudio-server-rhel9
-  labels:
-    app: buildchain
-    component: cuda-rstudio-server-image
-spec:
-  source:
-    type: Git
-    git:
-      uri: "https://github.com/red-hat-data-services/notebooks"
-      ref: rhoai-3.0
-  strategy:
-    type: Docker
-    dockerStrategy:
-      dockerfilePath: "rstudio/rhel9-python-3.12/Dockerfile.cuda"
-      buildArgs:
-        - name: BASE_IMAGE
-          value: quay.io/opendatahub/odh-base-image-cuda-py312-ubi9:v12.8
-      noCache: true
-      volumes:
-        - name: secret-mvn
-          source:
-            type: Secret
-            secret:
-              secretName: rhel-subscription-secret
-              defaultMode: 420
-          mounts:
-            - destinationPath: /opt/app-root/src/.sec
-  output:
-    to:
-      kind: ImageStreamTag
-      name: "cuda-rstudio-rhel9:latest"
-  resources:
-    limits:
-      cpu: "1500m"
-      memory: 8Gi
-    requests:
-      cpu: "1500m"
-      memory: 8Gi
-  successfulBuildsHistoryLimit: 2
-  failedBuildsHistoryLimit: 2
-  runPolicy: Serial
-  triggers:
-    - imageChange: {}
-      type: ImageChange
diff --git a/manifests/base/cuda-rstudio-imagestream.yaml b/manifests/base/cuda-rstudio-imagestream.yaml
new file mode 100644
index 0000000000..4ca223e78e
--- /dev/null
+++ b/manifests/base/cuda-rstudio-imagestream.yaml
@@ -0,0 +1,39 @@
+---
+apiVersion: image.openshift.io/v1
+kind: ImageStream
+metadata:
+  labels:
+    opendatahub.io/notebook-image: "true"
+  annotations:
+    opendatahub.io/notebook-image-creator: RHOAI
+    opendatahub.io/notebook-image-url: "https://github.com/red-hat-data-services/notebooks/tree/main/rstudio"
+    opendatahub.io/notebook-image-name: "RStudio | Minimal | CUDA | R 4.5"
+    opendatahub.io/notebook-image-desc: "RStudio Server Workbench image with an integrated development environment for R, a programming language designed for statistical computing and graphics."
+    opendatahub.io/notebook-image-order: "22"
+    opendatahub.io/recommended-accelerators: '["nvidia.com/gpu"]'
+  name: cuda-rstudio-rhel9
+spec:
+  lookupPolicy:
+    local: true
+  tags:
+    # N Version of the image
+    - annotations:
+        # language=json
+        opendatahub.io/notebook-software: |
+          [
+            {"name":"CUDA","version":"12.8"},
+            {"name":"R","version":"v4.5"},
+            {"name":"Python","version":"v3.12"}
+          ]
+        # language=json
+        opendatahub.io/notebook-python-dependencies: |
+          [
+            {"name":"rstudio-server","version":"2025.09"}
+          ]
+        openshift.io/imported-from: quay.io/modh/cuda-rstudio
+      from:
+        kind: DockerImage
+        name: odh-workbench-rstudio-cuda-r45-py312-ubi9-n_PLACEHOLDER
+      name: "2025.2"
+      referencePolicy:
+        type: Source
diff --git a/manifests/base/kustomization.yaml b/manifests/base/kustomization.yaml
index 90dc5e0dc0..d7fdcabb71 100644
--- a/manifests/base/kustomization.yaml
+++ b/manifests/base/kustomization.yaml
@@ -9,8 +9,8 @@ resources:
   - jupyter-tensorflow-notebook-imagestream.yaml
   - jupyter-trustyai-notebook-imagestream.yaml
   - code-server-notebook-imagestream.yaml
-  - rstudio-buildconfig.yaml
-  - cuda-rstudio-buildconfig.yaml
+  - rstudio-imagestream.yaml
+  - cuda-rstudio-imagestream.yaml
   - jupyter-rocm-minimal-notebook-imagestream.yaml
   - jupyter-rocm-pytorch-notebook-imagestream.yaml
   - jupyter-rocm-tensorflow-notebook-imagestream.yaml
@@ -639,6 +639,32 @@ replacements:
           kind: ImageStream
           name: code-server-notebook
           version: v1
+  - source:
+      fieldPath: data.odh-workbench-rstudio-cpu-r45-py312-ubi9-n
+      kind: ConfigMap
+      name: notebook-image-params
+      version: v1
+    targets:
+      - fieldPaths:
+          - spec.tags.0.from.name
+        select:
+          group: image.openshift.io
+          kind: ImageStream
+          name: rstudio-rhel9
+          version: v1
+  - source:
+      fieldPath: data.odh-workbench-rstudio-cuda-r45-py312-ubi9-n
+      kind: ConfigMap
+      name: notebook-image-params
+      version: v1
+    targets:
+      - fieldPaths:
+          - spec.tags.0.from.name
+        select:
+          group: image.openshift.io
+          kind: ImageStream
+          name: cuda-rstudio-rhel9
+          version: v1
   - source:
       fieldPath: data.odh-workbench-jupyter-minimal-rocm-py312-ubi9-n
       kind: ConfigMap
@@ -1367,6 +1393,32 @@ replacements:
           kind: ImageStream
           name: code-server-notebook
           version: v1
+  - source:
+      fieldPath: data.odh-workbench-rstudio-cpu-r45-py312-ubi9-commit-n
+      kind: ConfigMap
+      name: notebook-image-commithash
+      version: v1
+    targets:
+      - fieldPaths:
+          - spec.tags.0.annotations.[opendatahub.io/notebook-build-commit]
+        select:
+          group: image.openshift.io
+          kind: ImageStream
+          name: rstudio-rhel9
+          version: v1
+  - source:
+      fieldPath: data.odh-workbench-rstudio-cuda-r45-py312-ubi9-commit-n
+      kind: ConfigMap
+      name: notebook-image-commithash
+      version: v1
+    targets:
+      - fieldPaths:
+          - spec.tags.0.annotations.[opendatahub.io/notebook-build-commit]
+        select:
+          group: image.openshift.io
+          kind: ImageStream
+          name: cuda-rstudio-rhel9
+          version: v1
   - source:
       fieldPath: data.odh-workbench-jupyter-minimal-rocm-py312-ubi9-commit-n
       kind: ConfigMap
diff --git a/manifests/base/rstudio-buildconfig.yaml b/manifests/base/rstudio-buildconfig.yaml
deleted file mode 100644
index 8143b27547..0000000000
--- a/manifests/base/rstudio-buildconfig.yaml
+++ /dev/null
@@ -1,76 +0,0 @@
----
-kind: ImageStream
-apiVersion: image.openshift.io/v1
-metadata:
-  annotations:
-    opendatahub.io/notebook-image-creator: RHOAI
-    opendatahub.io/notebook-image-url: "https://github.com/red-hat-data-services/notebooks/tree/main/rstudio"
-    opendatahub.io/notebook-image-name: "RStudio | Minimal | CPU | R 4.5"
-    opendatahub.io/notebook-image-desc: "RStudio Server Workbench image with an integrated development environment for R, a programming language designed for statistical computing and graphics."
-  name: rstudio-rhel9
-spec:
-  lookupPolicy:
-    local: true
-  tags:
-    - name: latest
-      annotations:
-        # language=json
-        opendatahub.io/notebook-software: |
-          [
-            {"name":"R","version":"v4.5"},
-            {"name":"Python","version":"v3.12"}
-          ]
-        # language=json
-        opendatahub.io/notebook-python-dependencies: |
-          [
-            {"name":"rstudio-server","version":"2025.09"}
-          ]
-      referencePolicy:
-        type: Source
----
-kind: BuildConfig
-apiVersion: build.openshift.io/v1
-metadata:
-  name: rstudio-server-rhel9
-  labels:
-    component: rstudio-server-rhel9-image
-spec:
-  source:
-    type: Git
-    git:
-      uri: "https://github.com/red-hat-data-services/notebooks"
-      ref: rhoai-3.0
-  strategy:
-    type: Docker
-    dockerStrategy:
-      dockerfilePath: "rstudio/rhel9-python-3.12/Dockerfile.cpu"
-      buildArgs:
-        - name: BASE_IMAGE
-          value: registry.redhat.io/rhel9/python-312:latest
-      volumes:
-        - name: secret-mvn
-          source:
-            type: Secret
-            secret:
-              secretName: rhel-subscription-secret
-              defaultMode: 420
-          mounts:
-            - destinationPath: /opt/app-root/src/.sec
-      noCache: true
-  output:
-    to:
-      kind: ImageStreamTag
-      name: "rstudio-rhel9:latest"
-  runPolicy: Serial
-  resources:
-    limits:
-      cpu: "1"
-      memory: 2Gi
-    requests:
-      cpu: "1"
-      memory: 2Gi
-  successfulBuildsHistoryLimit: 2
-  failedBuildsHistoryLimit: 2
-  triggers:
-    - imageChange: {}
-      type: ImageChange
diff --git a/manifests/base/rstudio-imagestream.yaml b/manifests/base/rstudio-imagestream.yaml
new file mode 100644
index 0000000000..0eb6bc0f95
--- /dev/null
+++ b/manifests/base/rstudio-imagestream.yaml
@@ -0,0 +1,37 @@
+---
+apiVersion: image.openshift.io/v1
+kind: ImageStream
+metadata:
+  labels:
+    opendatahub.io/notebook-image: "true"
+  annotations:
+    opendatahub.io/notebook-image-creator: RHOAI
+    opendatahub.io/notebook-image-url: "https://github.com/red-hat-data-services/notebooks/tree/main/rstudio"
+    opendatahub.io/notebook-image-name: "RStudio | Minimal | CPU | R 4.5"
+    opendatahub.io/notebook-image-order: "22"
+    opendatahub.io/notebook-image-desc: "RStudio Server Workbench image with an integrated development environment for R, a programming language designed for statistical computing and graphics."
+  name: rstudio-rhel9
+spec:
+  lookupPolicy:
+    local: true
+  tags:
+    # N Version of the image
+    - annotations:
+        # language=json
+        opendatahub.io/notebook-software: |
+          [
+            {"name":"R","version":"v4.5"},
+            {"name":"Python","version":"v3.12"}
+          ]
+        # language=json
+        opendatahub.io/notebook-python-dependencies: |
+          [
+            {"name":"rstudio-server","version":"2025.09"}
+          ]
+        openshift.io/imported-from: quay.io/modh/rstudio
+      from:
+        kind: DockerImage
+        name: odh-workbench-rstudio-cpu-r45-py312-ubi9-n_PLACEHOLDER
+      name: "2025.2"
+      referencePolicy:
+        type: Source