diff --git a/manifests/base/commit.env b/manifests/base/commit.env
index 37aeafba1..3c91a509e 100644
--- a/manifests/base/commit.env
+++ b/manifests/base/commit.env
@@ -18,3 +18,11 @@ 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-codeserver-notebook-image-commit-n=a6c251e
+odh-codeserver-notebook-image-commit-n-1=6a6f888
+odh-rstudio-notebook-image-commit-n=a6c251e
+odh-rstudio-notebook-image-commit-n-1=6a6f888
+odh-rstudio-gpu-notebook-image-commit-n=a6c251e
+odh-rstudio-gpu-notebook-image-commit-n-1=6a6f888
+odh-rocm-pytorch-notebook-image-commit-n=
+odh-rocm-pytorch-notebook-image-commit-n=
diff --git a/manifests/base/commit.yaml b/manifests/base/commit.yaml
index ebf4b92ba..0e60c36b1 100644
--- a/manifests/base/commit.yaml
+++ b/manifests/base/commit.yaml
@@ -80,3 +80,11 @@ 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-pytorch-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
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..dfc94d5ea
--- /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-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/params.env b/manifests/base/params.env
index 92b57d01f..2fbfdcdc4 100644
--- a/manifests/base/params.env
+++ b/manifests/base/params.env
@@ -18,3 +18,11 @@ odh-rstudio-notebook-image-n=quay.io/opendatahub/workbench-images@sha256:2bbeb2b
 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-codeserver-notebook-image-n=quay.io/opendatahub/workbench-images@sha256:64f0dd3075a38b2ce1cc1723e04a6db0e585080e73c8860c46e38f5454321187
+odh-codeserver-notebook-image-n-1=quay.io/opendatahub/workbench-images@sha256:d624284904c9e988e05e1b8175f1cc38541066b00dc94573014b38153cafe3e1
+odh-rstudio-notebook-image-n=quay.io/opendatahub/workbench-images@sha256:d5df31b1bc1e2f8b38d558d9f13c2926665d09237feabaaef94dc3574d613f0d
+odh-rstudio-notebook-image-n-1=quay.io/opendatahub/workbench-images@sha256:718fe35e0a89061e0c99387b13b36765a3ea684700dcad11db3f53725e5de94f
+odh-rstudio-gpu-notebook-image-n=quay.io/opendatahub/workbench-images@sha256:d5df31b1bc1e2f8b38d558d9f13c2926665d09237feabaaef94dc3574d613f0d
+odh-rstudio-gpu-notebook-image-n-1=quay.io/opendatahub/workbench-images@sha256:f5abed3d9ece908b254e920bcaee4931f3c516f63dff83fd9c462ba4246a7c0d
+odh-rocm-pytorch-notebook-image-commit-n=
+odh-rocm-tensorflow-notebook-image-commit-n=
diff --git a/manifests/base/params.yaml b/manifests/base/params.yaml
index e1bafc7a4..fbb9200b8 100644
--- a/manifests/base/params.yaml
+++ b/manifests/base/params.yaml
@@ -80,3 +80,11 @@ 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-pytorch-notebook-image-commit-n
+  - path: spec/tags[]/from/name
+    kind: ImageStream
+    apiGroup: image.openshift.io/v1
+    name: odh-rocm-pytorch-notebook-image-commit-n