diff --git a/.github/workflows/runtimes-digest-updater-upstream.yaml b/.github/workflows/runtimes-digest-updater-upstream.yaml
index 4d9ce0298..39cdd49cc 100644
--- a/.github/workflows/runtimes-digest-updater-upstream.yaml
+++ b/.github/workflows/runtimes-digest-updater-upstream.yaml
@@ -78,7 +78,9 @@ jobs:
             "jupyter/datascience/ubi9-python-3.9/runtime-images/datascience-ubi9-py39.json"
             "jupyter/datascience/ubi9-python-3.9/runtime-images/pytorch-ubi9-py39.json"
             "jupyter/datascience/ubi9-python-3.9/runtime-images/tensorflow-ubi9-py39.json"
-            "jupyter/datascience/ubi9-python-3.9/runtime-images/ubi9-py39.json")
+            "jupyter/datascience/ubi9-python-3.9/runtime-images/ubi9-py39.json"
+            "jupyter/datascience/ubi9-python-3.9/runtime-images/rocm-tensorflow-ubi9-py39.json"
+            "jupyter/datascience/ubi9-python-3.9/runtime-images/rocm-pytorch-ubi9-py39.json")
 
             for ((i=0;i<${#PATHS[@]};++i)); do
               path=${PATHS[$i]}
@@ -86,15 +88,19 @@ jobs:
               name=$(echo "$path" | sed 's#.*runtime-images/\(.*\)-py.*#\1#')
               py_version=$(echo "$path" | grep -o 'python-[0-9]\.[0-9]')
               # Handling specific cases
-              if [[ $name == *tensorflow* ]]; then
+              if [[ $name == tensorflow* ]]; then
                   name="cuda-$name"
               elif [[ $name == ubi* ]]; then
                   name="minimal-$name"
               fi
               registry=$(echo $img | cut -d '@' -f1)
               regex="^runtime-$name-$py_version-${{ env.RELEASE_VERSION_N}}-\d+-${{ steps.hash-n.outputs.HASH_N }}\$"
-              echo "CHECKING: "  $regex
               latest_tag=$(skopeo inspect docker://$img | jq -r --arg regex "$regex" '.RepoTags | map(select(. | test($regex))) | .[0]')
+              echo "CHECKING: "  $latest_tag
+              if [[ -z "$latest_tag" ]]; then
+                echo "No matching tag found"
+                exit 1
+              fi
               digest=$(skopeo inspect docker://$registry:$latest_tag | jq .Digest | tr -d '"')
               output=$registry@$digest
               echo "NEW: " $output