diff --git a/manifests/base/commit.env b/manifests/base/commit.env
index d7b5bc836..7e550ebaf 100644
--- a/manifests/base/commit.env
+++ b/manifests/base/commit.env
@@ -1,20 +1,23 @@
-odh-minimal-notebook-image-commit-n=81acd47
-odh-minimal-notebook-image-commit-n-1=5ad18c6
-odh-minimal-gpu-notebook-image-commit-n=81acd47
-odh-minimal-gpu-notebook-image-commit-n-1=5ad18c6
-odh-pytorch-gpu-notebook-image-commit-n=81acd47
-odh-pytorch-gpu-notebook-image-commit-n-1=5ad18c6
-odh-generic-data-science-notebook-image-commit-n=81acd47
-odh-generic-data-science-notebook-image-commit-n-1=5ad18c6
-odh-tensorflow-gpu-notebook-image-commit-n=81acd47
-odh-tensorflow-gpu-notebook-image-commit-n-1=5ad18c6
-odh-trustyai-notebook-image-commit-n=81acd47
-odh-trustyai-notebook-image-commit-n-1=5ad18c6
-odh-habana-notebook-image-commit-n=81acd47
-odh-habana-notebook-image-commit-n-1=5ad18c6
-odh-codeserver-notebook-image-commit-n=81acd47
-odh-codeserver-notebook-image-commit-n-1=5ad18c6
-odh-rstudio-notebook-image-commit-n=81acd47
-odh-rstudio-notebook-image-commit-n-1=5ad18c6
-odh-rstudio-gpu-notebook-image-commit-n=81acd47
-odh-rstudio-gpu-notebook-image-commit-n-1=5ad18c6
+odh-minimal-notebook-image-commit-n=af2a765
+odh-minimal-notebook-image-commit-n-1=9fe149c
+odh-minimal-gpu-notebook-image-commit-n=d9ffb60
+odh-minimal-gpu-notebook-image-commit-n-1=9fe149c
+odh-pytorch-gpu-notebook-image-commit-n=af2a765
+odh-pytorch-gpu-notebook-image-commit-n-1=9fe149c
+odh-generic-data-science-notebook-image-commit-n=af2a765
+odh-generic-data-science-notebook-image-commit-n-1=9fe149c
+odh-tensorflow-gpu-notebook-image-commit-n=af2a765
+odh-tensorflow-gpu-notebook-image-commit-n-1=9fe149c
+odh-trustyai-notebook-image-commit-n=af2a765
+odh-trustyai-notebook-image-commit-n-1=9fe149c
+odh-habana-notebook-image-commit-n=d9ffb60
+odh-habana-notebook-image-commit-n-1=6a6f888
+odh-codeserver-notebook-image-commit-n=af2a765
+odh-codeserver-notebook-image-commit-n-1=9fe149c
+odh-rstudio-notebook-image-commit-n=af2a765
+odh-rstudio-notebook-image-commit-n-1=9fe149c
+odh-rstudio-gpu-notebook-image-commit-n=af2a765
+odh-rstudio-gpu-notebook-image-commit-n-1=9fe149c
+odh-rocm-minimal-notebook-image-commit-n= 89da2fc
+odh-rocm-pytorch-notebook-image-commit-n= 89da2fc
+odh-rocm-tensorflow-notebook-image-commit-n= 89da2fc
\ No newline at end of file
diff --git a/manifests/base/commit.yaml b/manifests/base/commit.yaml
index ebf4b92ba..5d3e16053 100644
--- a/manifests/base/commit.yaml
+++ b/manifests/base/commit.yaml
@@ -80,3 +80,15 @@ varReference:
     kind: ImageStream
     apiGroup: image.openshift.io/v1
     name: odh-rstudio-gpu-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 b/manifests/base/jupyter-rocm-minimal-notebook-imagestream
new file mode 100644
index 000000000..7c02d652e
--- /dev/null
+++ b/manifests/base/jupyter-rocm-minimal-notebook-imagestream
@@ -0,0 +1,29 @@
+---
+apiVersion: image.openshift.io/v1
+kind: ImageStream
+metadata:
+  labels:
+    opendatahub.io/notebook-image: "true"
+  annotations:
+    opendatahub.io/notebook-image-url: "https://github.com/opendatahub-io/notebooks/blob/main/jupyter/rocm/tensorflow"
+    opendatahub.io/notebook-image-name: "ROCM"
+    opendatahub.io/notebook-image-desc: "Jupyter ROCM notebook image for ODH notebooks."
+    opendatahub.io/notebook-image-order: "9"
+  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/opendatahub/workbench-images
+        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..157bcec22
--- /dev/null
+++ b/manifests/base/jupyter-rocm-pytorch-notebook-imagestream.yaml
@@ -0,0 +1,29 @@
+---
+apiVersion: image.openshift.io/v1
+kind: ImageStream
+metadata:
+  labels:
+    opendatahub.io/notebook-image: "true"
+  annotations:
+    opendatahub.io/notebook-image-url: "https://github.com/opendatahub-io/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"
+  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.15"}, {"name":"Sklearn-onnx","version":"1.16"}, {"name":"Psycopg","version":"3.1"}, {"name":"MySQL Connector/Python","version":"8.3"}]'
+        openshift.io/imported-from: quay.io/opendatahub/workbench-images
+        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-commit-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..629d1cdb4
--- /dev/null
+++ b/manifests/base/jupyter-rocm-tensorflow-notebook-imagestream.yaml
@@ -0,0 +1,29 @@
+---
+apiVersion: image.openshift.io/v1
+kind: ImageStream
+metadata:
+  labels:
+    opendatahub.io/notebook-image: "true"
+  annotations:
+    opendatahub.io/notebook-image-url: "https://github.com/opendatahub-io/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"
+  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.15"}, {"name":"Sklearn-onnx","version":"1.16"}, {"name":"Psycopg","version":"3.1"}, {"name":"MySQL Connector/Python","version":"8.3"}]'
+        openshift.io/imported-from: quay.io/opendatahub/workbench-images
+        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-commit-n)
+      name: "2024.1"
+      referencePolicy:
+        type: Source
diff --git a/manifests/base/params.env b/manifests/base/params.env
index a2b3dbc25..039fbd189 100644
--- a/manifests/base/params.env
+++ b/manifests/base/params.env
@@ -1,20 +1,23 @@
-odh-minimal-notebook-image-n=quay.io/opendatahub/workbench-images@sha256:539118186b320f553b87f515ce2cb9d8b01cdc3d9d68d2bb87b81e5dd749e28b
-odh-minimal-notebook-image-n-1=quay.io/opendatahub/workbench-images@sha256:71038823fe8312e3fb653f3e64e8b1c85c4505df5c7ecc152c3010526c0e2a6f
-odh-minimal-gpu-notebook-image-n=quay.io/opendatahub/workbench-images@sha256:459941129368a1f2a2e684f7d1f4c031ff19381553f6d6554db548ec589488e0
-odh-minimal-gpu-notebook-image-n-1=quay.io/opendatahub/workbench-images@sha256:3de7a8c248e16a6314f6eefefe7bcf7f631f441f1018a5576609308aeadc2a98
-odh-pytorch-gpu-notebook-image-n=quay.io/opendatahub/workbench-images@sha256:f068d383fc5bfdc9d5ecdd731c0d991d6fc4159530aaefaf0dbd361e53e68abe
-odh-pytorch-gpu-notebook-image-n-1=quay.io/opendatahub/workbench-images@sha256:5df5314740762e09ca0b184adb0bd2ba3d063bc2b0fa0e69ddc47d40b637a0cc
-odh-generic-data-science-notebook-image-n=quay.io/opendatahub/workbench-images@sha256:883740cc9f95fdb1e4576448f7a142c2fb824e16a520a986c0807d9f937447eb
-odh-generic-data-science-notebook-image-n-1=quay.io/opendatahub/workbench-images@sha256:8aff77e70e9e325180867bde04c921dcd3881c96e4557509dff4396c9fa72ecd
-odh-tensorflow-gpu-notebook-image-n=quay.io/opendatahub/workbench-images@sha256:2fe3e75ddf410c0c7d18f58bb848c84ee854082bf1a52217c42f86984feae6ed
-odh-tensorflow-gpu-notebook-image-n-1=quay.io/opendatahub/workbench-images@sha256:776ec504ce33d353ff034d39d3cc7a1981f2cfb2bef700df9d3da74dd167ccdf
-odh-trustyai-notebook-image-n=quay.io/opendatahub/workbench-images@sha256:88f59beb62eb038444294c67d04a412db2a0a350043633c60a062a80cde593a3
-odh-trustyai-notebook-image-n-1=quay.io/opendatahub/workbench-images@sha256:54aceffbfe1d1afafe8d4b3b39538c5be4798535c2af9126ce8a63136f18d4e2
-odh-habana-notebook-image-n=quay.io/opendatahub/workbench-images@sha256:91ad4358463f09ff2ac1093b077cde330a1d2adc9549f0b9ecb06517c3daee80
-odh-habana-notebook-image-n-1=quay.io/opendatahub/workbench-images@sha256:b351f29da1d83c7886eee44fd3599ccc523178230b70c6b927085936506987ea
-odh-codeserver-notebook-image-n=quay.io/opendatahub/workbench-images@sha256:96f2f135ae62dbfb8d11c0aab3e4a7dc8f1699b98508301f2107397db22e87dc
-odh-codeserver-notebook-image-n-1=quay.io/opendatahub/workbench-images@sha256:8a9adf9dc4058092955e5c2a9bdd12fadff4bcdc9c7316f967fd3a74650567ac
-odh-rstudio-notebook-image-n=quay.io/opendatahub/workbench-images@sha256:0221e88a9d891cfd7819d0628a3232d37829c4739b482f6846c4e0dd1a0f7b91
-odh-rstudio-notebook-image-n-1=quay.io/opendatahub/workbench-images@sha256:06c39f6bfe37df62d5964da786c23c8cef0218c9c1835c2299e6d8575cfab630
-odh-rstudio-gpu-notebook-image-n=quay.io/opendatahub/workbench-images@sha256:0851ca8b5d00414d73c6a0f8628b777f4dbfeed4f6d394b03771e6bd70988b30
-odh-rstudio-gpu-notebook-image-n-1=quay.io/opendatahub/workbench-images@sha256:1466ee1ad83c3a99b64d6635f8e57fc92658723650399c2a743195fca41cfb65
+odh-minimal-notebook-image-n=quay.io/opendatahub/workbench-images@sha256:1d21774969df3a777a9ea9609c525544a863935194243e51e3d0db5e7723f323
+odh-minimal-notebook-image-n-1=quay.io/opendatahub/workbench-images@sha256:e56a6251dc5cb7249e7d652368b14e2c77a7dcc8877d21c04ad4f30d15e4b575
+odh-minimal-gpu-notebook-image-n=quay.io/opendatahub/workbench-images@sha256:531eeebf6893b6d1d84fe0a06544a1addd583c01d0daed9e8d255489106c6576
+odh-minimal-gpu-notebook-image-n-1=quay.io/opendatahub/workbench-images@sha256:5200abdd6180708640b83ac13159af3b39ea72c0dbbfbaa12f6dc7bae43b325d
+odh-pytorch-gpu-notebook-image-n=quay.io/opendatahub/workbench-images@sha256:7fc66703964258a423e06c384ac7beb5b6e9fb8c386f0b6ac6683b129635b361
+odh-pytorch-gpu-notebook-image-n-1=quay.io/opendatahub/workbench-images@sha256:f275d1238f087c5f8f2daa89b01cdcf64aab9dad8003965239c9a8810fafc683
+odh-generic-data-science-notebook-image-n=quay.io/opendatahub/workbench-images@sha256:406fde083c926df5a0f19ece89402c772e832a7463348dbe37c732ed9616250f
+odh-generic-data-science-notebook-image-n-1=quay.io/opendatahub/workbench-images@sha256:0b840a4ee92858f4a1ff38c95a0723cd5665b3184aa0dc4acaabcb40df169252
+odh-tensorflow-gpu-notebook-image-n=quay.io/opendatahub/workbench-images@sha256:761f4029cbefbc00e2888abba17a4bc4ddd29ee8ded6a78d6e02cd96df08728f
+odh-tensorflow-gpu-notebook-image-n-1=quay.io/opendatahub/workbench-images@sha256:b18449db82529b4a32748e6f02de15bbb0537004e8cd7aaee5c5dece62f8dc4d
+odh-trustyai-notebook-image-n=quay.io/opendatahub/workbench-images@sha256:20ee2d529dc5c55ac855613690448bc9efceed43c02d7e5e6bcd06efb7b43066
+odh-trustyai-notebook-image-n-1=quay.io/opendatahub/workbench-images@sha256:fa06b8b27edcff21f4057c6618e8f55abe62cef6a6e1df2ed186fbe233b6fc3d
+odh-habana-notebook-image-n=quay.io/opendatahub/workbench-images@sha256:b00237d91ba53cd331cbffa935ba5b8f71ca36ddd0f63373e387de915eedd845
+odh-habana-notebook-image-n-1=quay.io/opendatahub/workbench-images@sha256:296cc2bad79a03fbd69108adbe2853f5adeceeca703ea76411c453a17489a648
+odh-codeserver-notebook-image-n=quay.io/opendatahub/workbench-images@sha256:7b1e15cac7e5d7a55bd6fb006edffb5fdba5888912e01a79124b04b67f605cfa
+odh-codeserver-notebook-image-n-1=quay.io/opendatahub/workbench-images@sha256:780ac58724f7f3fc20226130d4eeab57818bfbed946148330b327a24eeef22ce
+odh-rstudio-notebook-image-n=quay.io/opendatahub/workbench-images@sha256:2bbeb2b000ee7c5c17beb821b68d63f641833ffd8270712e925652bcec8b7d58
+odh-rstudio-notebook-image-n-1=quay.io/opendatahub/workbench-images@sha256:c932fbc3f2d226eac8ab5caa47ef025de5c41ae801bcfef3f1e98f1be1d5ef5c
+odh-rstudio-gpu-notebook-image-n=quay.io/opendatahub/workbench-images@sha256:9f0e57a7a4f2269a50c41f3b41ac5c3434e48d287b902eb1c6956846e1baeaf4
+odh-rstudio-gpu-notebook-image-n-1=quay.io/opendatahub/workbench-images@sha256:1384495fe8fffb48a91a496a9d50a1f3d11de03c9c680553c0c332f07371e3a0
+odh-rocm-minimal-notebook-image-n= quay.io/opendatahub/workbench-images@sha256:cd5237a06edf83773e16e76550619d095f9199f9a212443ca46bf829304375d2
+odh-rocm-pytorch-notebook-image-n=quay.io/opendatahub/workbench-images@sha256:a259f8072f21a97c5cec0ef1b9e50bd37aebea1686550bdc0cebdc21c2d4c8c7
+odh-rocm-tensorflow-notebook-image-n=quay.io/opendatahub/workbench-images@/sha256:39ccee3c69aa1f49e8ca6ae7b7f437e0106646c046034a00e05257671d40fe2c
\ No newline at end of file
diff --git a/manifests/base/params.yaml b/manifests/base/params.yaml
index e1bafc7a4..a7755920f 100644
--- a/manifests/base/params.yaml
+++ b/manifests/base/params.yaml
@@ -80,3 +80,15 @@ varReference:
     kind: ImageStream
     apiGroup: image.openshift.io/v1
     name: odh-rstudio-gpu-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