diff --git a/ci/check-params-env.sh b/ci/check-params-env.sh
index 640ab2863..b3391eb42 100755
--- a/ci/check-params-env.sh
+++ b/ci/check-params-env.sh
@@ -25,7 +25,7 @@ PARAMS_ENV_PATH="manifests/base/params.env"
 
 # This value needs to be updated everytime we deliberately change number of the
 # images we want to have in the `params.env` file.
-EXPECTED_NUM_RECORDS=27
+EXPECTED_NUM_RECORDS=30
 
 # ---------------------------- DEFINED FUNCTIONS ----------------------------- #
 
@@ -225,6 +225,21 @@ function check_image_variable_matches_name_and_commitref() {
             expected_commitref="release-2023b"
             expected_build_name="codeserver-ubi9-python-3.9-amd64"
             ;;
+        odh-rocm-minimal-notebook-image-n)
+            expected_name="odh-notebook-jupyter-minimal-ubi9-python-3.9"
+            expected_commitref="2024a"
+            expected_build_name="rocm-jupyter-minimal-ubi9-python-3.9-amd64"
+            ;;
+        odh-rocm-pytorch-notebook-image-n)
+            expected_name="odh-notebook-jupyter-rocm-pytorch-ubi9-python-3.9"
+            expected_commitref="2024a"
+            expected_build_name="rocm-jupyter-pytorch-ubi9-python-3.9-amd64"
+            ;;
+        odh-rocm-tensorflow-notebook-image-n)
+            expected_name="odh-notebook-jupyter-rocm-tensorflow-ubi9-python-3.9"
+            expected_commitref="2024a"
+            expected_build_name="rocm-jupyter-tensorflow-ubi9-python-3.9-amd64"
+            ;;
         *)
             echo "Unimplemented variable name: '${image_variable}'"
             return 1
diff --git a/manifests/base/commit.env b/manifests/base/commit.env
index e50618cf7..0f648dcdf 100644
--- a/manifests/base/commit.env
+++ b/manifests/base/commit.env
@@ -21,7 +21,10 @@ odh-tensorflow-gpu-notebook-image-commit-n-3=3e71410
 odh-trustyai-notebook-image-commit-n=b5a8318
 odh-trustyai-notebook-image-commit-n-1=76a016f
 odh-trustyai-notebook-image-commit-n-2=07015ec
-odh-codeserver-notebook-image-commit-n=b5a8318
-odh-codeserver-notebook-image-commit-n-1=76a016f
-odh-habana-notebook-image-commit-n=b5a8318
-odh-habana-notebook-image-commit-n-1=76a016f
+odh-codeserver-notebook-image-commit-n=bcbb42a
+odh-codeserver-notebook-image-commit-n-1=92a1241
+odh-habana-notebook-image-commit-n=bcbb42a
+odh-habana-notebook-image-commit-n-1=92a1241
+odh-rocm-minimal-notebook-image-commit-n=6be50fc
+odh-rocm-pytorch-notebook-image-commit-n=6be50fc
+odh-rocm-tensorflow-notebook-image-commit-n=6be50fc
diff --git a/manifests/base/commit.yaml b/manifests/base/commit.yaml
index fb38043ed..27e57e943 100644
--- a/manifests/base/commit.yaml
+++ b/manifests/base/commit.yaml
@@ -108,3 +108,15 @@ varReference:
     kind: ImageStream
     apiGroup: image.openshift.io/v1
     name: odh-codeserver-notebook-image-commit-n-1
+  - path: spec/tags[]/annotations/opendatahub.io\/notebook-build-commit
+    kind: ImageStream
+    apiGroup: image.openshift.io/v1
+    name: odh-rocm-minimal-notebook-image-commit-n
+  - path: spec/tags[]/annotations/opendatahub.io\/notebook-build-commit
+    kind: ImageStream
+    apiGroup: image.openshift.io/v1
+    name: odh-rocm-pytorch-notebook-image-commit-n
+  - path: spec/tags[]/annotations/opendatahub.io\/notebook-build-commit
+    kind: ImageStream
+    apiGroup: image.openshift.io/v1
+    name: odh-rocm-tensorflow-notebook-image-commit-n
diff --git a/manifests/base/jupyter-rocm-minimal-notebook-imagestream.yaml b/manifests/base/jupyter-rocm-minimal-notebook-imagestream.yaml
new file mode 100644
index 000000000..d705f2445
--- /dev/null
+++ b/manifests/base/jupyter-rocm-minimal-notebook-imagestream.yaml
@@ -0,0 +1,30 @@
+---
+apiVersion: image.openshift.io/v1
+kind: ImageStream
+metadata:
+  labels:
+    opendatahub.io/notebook-image: "true"
+  annotations:
+    opendatahub.io/notebook-image-url: "https://github.com/red-hat-data-services/notebooks/blob/main/rocm"
+    opendatahub.io/notebook-image-name: "ROCm"
+    opendatahub.io/notebook-image-desc: "Jupyter ROCm notebook image for ODH notebooks."
+    opendatahub.io/notebook-image-order: "10"
+    opendatahub.io/recommended-accelerators: '["amd.com/gpu"]'
+  name: jupyter-rocm-minimal
+spec:
+  lookupPolicy:
+    local: true
+  tags:
+    # N Version of the image
+    - annotations:
+        opendatahub.io/notebook-software: '[{"name":"ROCm","version":"6.1"},{"name":"Python","version":"v3.9"}]'
+        opendatahub.io/notebook-python-dependencies: '[{"name":"JupyterLab","version":"3.6"},{"name": "Notebook","version": "6.5"}]'
+        openshift.io/imported-from: quay.io/modh/rocm-notebooks
+        opendatahub.io/workbench-image-recommended: 'true'
+        opendatahub.io/notebook-build-commit: $(jupyter-rocm-minimal-notebook-image-commit-n)
+      from:
+        kind: DockerImage
+        name: $(jupyter-rocm-minimal-notebook-image-n)
+      name: "2024.1"
+      referencePolicy:
+        type: Source
diff --git a/manifests/base/jupyter-rocm-pytorch-notebook-imagestream.yaml b/manifests/base/jupyter-rocm-pytorch-notebook-imagestream.yaml
new file mode 100644
index 000000000..4b5924ec7
--- /dev/null
+++ b/manifests/base/jupyter-rocm-pytorch-notebook-imagestream.yaml
@@ -0,0 +1,30 @@
+---
+apiVersion: image.openshift.io/v1
+kind: ImageStream
+metadata:
+  labels:
+    opendatahub.io/notebook-image: "true"
+  annotations:
+    opendatahub.io/notebook-image-url: "https://github.com/red-hat-data-services/notebooks/blob/main/jupyter/rocm/pytorch"
+    opendatahub.io/notebook-image-name: "ROCm-PyTorch"
+    opendatahub.io/notebook-image-desc: "Jupyter ROCm optimized PyTorch notebook image for ODH notebooks."
+    opendatahub.io/notebook-image-order: "14"
+    opendatahub.io/recommended-accelerators: '["amd.com/gpu"]'
+  name: jupyter-rocm-pytorch
+spec:
+  lookupPolicy:
+    local: true
+  tags:
+    # N Version of the image
+    - annotations:
+        opendatahub.io/notebook-software: '[{"name":"Python","version":"v3.9"},{"name":"ROCm-PyTorch","version":"2.3"}]'
+        opendatahub.io/notebook-python-dependencies: '[{"name":"ROCm-PyTorch","version":"2.3"},{"name":"Tensorboard","version":"2.16"},{"name":"Kafka-Python","version":"2.0"},{"name":"Matplotlib","version":"3.8"},{"name":"Numpy","version":"1.26"},{"name":"Pandas","version":"2.2"},{"name":"Scikit-learn","version":"1.4"},{"name":"Scipy","version":"1.12"},{"name":"Elyra","version":"3.16"},{"name":"PyMongo","version":"4.6"},{"name":"Pyodbc","version":"5.1"}, {"name":"Codeflare-SDK","version":"0.19"}, {"name":"Sklearn-onnx","version":"1.16"}, {"name":"Psycopg","version":"3.1"}, {"name":"MySQL Connector/Python","version":"8.3"}]'
+        openshift.io/imported-from: quay.io/modh/rocm-notebooks
+        opendatahub.io/workbench-image-recommended: 'true'
+        opendatahub.io/notebook-build-commit: $(odh-rocm-pytorch-notebook-image-commit-n)
+      from:
+        kind: DockerImage
+        name: $(odh-rocm-pytorch-notebook-image-n)
+      name: "2024.1"
+      referencePolicy:
+        type: Source
diff --git a/manifests/base/jupyter-rocm-tensorflow-notebook-imagestream.yaml b/manifests/base/jupyter-rocm-tensorflow-notebook-imagestream.yaml
new file mode 100644
index 000000000..bfe1128a9
--- /dev/null
+++ b/manifests/base/jupyter-rocm-tensorflow-notebook-imagestream.yaml
@@ -0,0 +1,30 @@
+---
+apiVersion: image.openshift.io/v1
+kind: ImageStream
+metadata:
+  labels:
+    opendatahub.io/notebook-image: "true"
+  annotations:
+    opendatahub.io/notebook-image-url: "https://github.com/red-hat-data-services/notebooks/blob/main/jupyter/rocm/tensorflow"
+    opendatahub.io/notebook-image-name: "ROCm-TensorFlow"
+    opendatahub.io/notebook-image-desc: "Jupyter ROCm optimized TensorFlow notebook image for ODH notebooks."
+    opendatahub.io/notebook-image-order: "15"
+    opendatahub.io/recommended-accelerators: '[amd.com/gpu"]'
+  name: jupyter-rocm-tensorflow
+spec:
+  lookupPolicy:
+    local: true
+  tags:
+    # N Version of the image
+    - annotations:
+        opendatahub.io/notebook-software: '[{"name":"Python","version":"v3.9"},{"name":"ROCm-TensorFlow","version":"2.15"}]'
+        opendatahub.io/notebook-python-dependencies: '[{"name":"ROCm-TensorFlow","version":"2.15"},{"name":"Tensorboard","version":"2.15"},{"name":"Kafka-Python","version":"2.0"},{"name":"Matplotlib","version":"3.8"},{"name":"Numpy","version":"1.26"},{"name":"Pandas","version":"2.2"},{"name":"Scikit-learn","version":"1.4"},{"name":"Scipy","version":"1.12"},{"name":"Elyra","version":"3.16"},{"name":"PyMongo","version":"4.6"},{"name":"Pyodbc","version":"5.1"}, {"name":"Codeflare-SDK","version":"0.19"}, {"name":"Sklearn-onnx","version":"1.16"}, {"name":"Psycopg","version":"3.1"}, {"name":"MySQL Connector/Python","version":"8.3"}]'
+        openshift.io/imported-from: quay.io/modh/rocm-notebooks
+        opendatahub.io/workbench-image-recommended: 'true'
+        opendatahub.io/notebook-build-commit: $(odh-rocm-tensorflow-notebook-image-commit-n)
+      from:
+        kind: DockerImage
+        name: $(odh-rocm-tensorflow-notebook-image-n)
+      name: "2024.1"
+      referencePolicy:
+        type: Source
diff --git a/manifests/base/kustomization.yaml b/manifests/base/kustomization.yaml
index e527b191a..c7f9c1e32 100644
--- a/manifests/base/kustomization.yaml
+++ b/manifests/base/kustomization.yaml
@@ -12,6 +12,9 @@ resources:
   - code-server-notebook-imagestream.yaml
   - rstudio-buildconfig.yaml
   - cuda-rstudio-buildconfig.yaml
+  - jupyter-rocm-minimal-notebook-imagestream.yaml
+  - jupyter-rocm-pytorch-notebook-imagestream.yaml
+  - jupyter-rocm-tensorflow-notebook-imagestream.yaml
 
 commonLabels:
   opendatahub.io/component: "true"
@@ -403,6 +406,27 @@ vars:
       apiVersion: v1
     fieldref:
       fieldpath: data.odh-codeserver-notebook-image-commit-n-1
+  - name: jupyter-rocm-minimal-notebook-image-commit-n
+    objref:
+      kind: ConfigMap
+      name: notebook
+      apiVersion: v1
+    fieldref:
+      fieldpath: data.jupyter-rocm-minimal-notebook-image-commit-n
+  - name: odh-rocm-pytorch-notebook-image-commit-n
+    objref:
+      kind: ConfigMap
+      name: notebook
+      apiVersion: v1
+    fieldref:
+      fieldpath: data.odh-rocm-pytorch-notebook-image-commit-n
+  - name: odh-rocm-tensorflow-notebook-image-commit-n
+    objref:
+      kind: ConfigMap
+      name: notebook
+      apiVersion: v1
+    fieldref:
+      fieldpath: data.odh-rocm-tensorflow-notebook-image-commit-n
 configurations:
   - params.yaml
   - commit.yaml
diff --git a/manifests/base/params.env b/manifests/base/params.env
index 2db0a6683..5cb0d5978 100644
--- a/manifests/base/params.env
+++ b/manifests/base/params.env
@@ -21,7 +21,10 @@ odh-tensorflow-gpu-notebook-image-n-3=quay.io/modh/cuda-notebooks@sha256:6fadedc
 odh-trustyai-notebook-image-n=quay.io/modh/odh-trustyai-notebook@sha256:09082398dabbb9ba675f5245866b8a91025a74a75321609379def2c3007baaf7
 odh-trustyai-notebook-image-n-1=quay.io/modh/odh-trustyai-notebook@sha256:fe883d8513c5d133af1ee3f7bb0b7b37d3bada8ae73fc7209052591d4be681c0
 odh-trustyai-notebook-image-n-2=quay.io/modh/odh-trustyai-notebook@sha256:8c5e653f6bc6a2050565cf92f397991fbec952dc05cdfea74b65b8fd3047c9d4
-odh-codeserver-notebook-image-n=quay.io/modh/codeserver@sha256:4b6b563e75f9e642bac9f21c4a2d8d72d77923fc391dd5dc985d4489c7258ef5
-odh-codeserver-notebook-image-n-1=quay.io/modh/codeserver@sha256:b1a048f3711149e36a89e0eda1a5601130fb536ecc0aabae42ab6e4d26977354
-odh-habana-notebook-image-n=quay.io/modh/odh-habana-notebooks@sha256:4317c67037e1150fc62f8c688696d3210e4151d6ed4415dd969e60850e871c64
-odh-habana-notebook-image-n-1=quay.io/modh/odh-habana-notebooks@sha256:6923f084d66bf6b9b2bf87edfb9b3c1f8f9a5f2005482fbcc060c9872db8d28a
+odh-codeserver-notebook-image-n=quay.io/modh/codeserver@sha256:4dbd8a4fe853337cf35409da59f18b025e6edb52f65c254f2c8e64a311132006
+odh-codeserver-notebook-image-n-1=quay.io/modh/codeserver@sha256:b0619026944c42c99617e1816f04a6d2407c5fae7ddb405332d549cdce69d469
+odh-habana-notebook-image-n=quay.io/modh/odh-habana-notebooks@sha256:8974095cf74fc4612eb62b2f72127154f741ec0c35cca8cce9383fff12de6dcc
+odh-habana-notebook-image-n-1=quay.io/modh/odh-habana-notebooks@sha256:118d762d68701260d4b0d3a55b687c292d694da0db1e38ab2f9e8b848f61c9a7
+odh-rocm-minimal-notebook-image-n=quay.io/modh/rocm-notebooks@sha256:807fb7cfc41aaeb3a81bea658fd429604b23582b6b4793c567b2b6f9f9ebbcf6
+odh-rocm-pytorch-notebook-image-n=quay.io/modh/rocm-notebooks@sha256:4f9694eeda941989d30bf8d59c056c73ed9ed4f4a623a578d48ac5ad0a4d9d14
+odh-rocm-tensorflow-notebook-image-n=quay.io/modh/rocm-notebooks@sha256:41983cdadfb53478115d1e80bafc8489adb4a94ef794b6823b7a30f6aa1809b9
diff --git a/manifests/base/params.yaml b/manifests/base/params.yaml
index 99f6722bd..e64b04593 100644
--- a/manifests/base/params.yaml
+++ b/manifests/base/params.yaml
@@ -108,3 +108,15 @@ varReference:
     kind: ImageStream
     apiGroup: image.openshift.io/v1
     name: odh-codeserver-notebook-image-n-1
+  - path: spec/tags[]/from/name
+    kind: ImageStream
+    apiGroup: image.openshift.io/v1
+    name: odh-rocm-minimal-notebook-image-n
+  - path: spec/tags[]/from/name
+    kind: ImageStream
+    apiGroup: image.openshift.io/v1
+    name: odh-rocm-pytorch-notebook-image-n
+  - path: spec/tags[]/from/name
+    kind: ImageStream
+    apiGroup: image.openshift.io/v1
+    name: odh-rocm-tensorflow-notebook-image-n