diff --git a/.github/workflows/pr-merge-image-delete.yml b/.github/workflows/pr-merge-image-delete.yml
index becff11be..31fef9ed2 100644
--- a/.github/workflows/pr-merge-image-delete.yml
+++ b/.github/workflows/pr-merge-image-delete.yml
@@ -59,24 +59,11 @@ jobs:
 
           set +e # Don't abort if a delete operation fails as all images might not be available for the PR
 
-          skopeo delete docker://${QUAY_IMAGE_REPO}:base-ubi8-python-3.8-pr-${{ env.PR }}
-          skopeo delete docker://${QUAY_IMAGE_REPO}:base-anaconda-python-3.8-pr-${{ env.PR }}
           skopeo delete docker://${QUAY_IMAGE_REPO}:base-ubi9-python-3.9-pr-${{ env.PR }}
           skopeo delete docker://${QUAY_IMAGE_REPO}:base-c9s-python-3.9-pr-${{ env.PR }}
-          skopeo delete docker://${QUAY_IMAGE_REPO}:cuda-ubi8-python-3.8-pr-${{ env.PR }}
           skopeo delete docker://${QUAY_IMAGE_REPO}:cuda-ubi9-python-3.9-pr-${{ env.PR }}
           skopeo delete docker://${QUAY_IMAGE_REPO}:cuda-c9s-python-3.9-pr-${{ env.PR }}
 
-          skopeo delete docker://${QUAY_IMAGE_REPO}:jupyter-minimal-ubi8-python-3.8-pr-${{ env.PR }}
-          skopeo delete docker://${QUAY_IMAGE_REPO}:jupyter-datascience-ubi8-python-3.8-pr-${{ env.PR }}
-          skopeo delete docker://${QUAY_IMAGE_REPO}:jupyter-datascience-anaconda-python-3.8-pr-${{ env.PR }}
-          skopeo delete docker://${QUAY_IMAGE_REPO}:cuda-jupyter-minimal-ubi8-python-3.8-pr-${{ env.PR }}
-          skopeo delete docker://${QUAY_IMAGE_REPO}:cuda-jupyter-datascience-ubi8-python-3.8-pr-${{ env.PR }}
-          skopeo delete docker://${QUAY_IMAGE_REPO}:runtime-minimal-ubi8-python-3.8-pr-${{ env.PR }}
-          skopeo delete docker://${QUAY_IMAGE_REPO}:runtime-datascience-ubi8-python-3.8-pr-${{ env.PR }}
-          skopeo delete docker://${QUAY_IMAGE_REPO}:runtime-pytorch-ubi8-python-3.8-pr-${{ env.PR }}
-          skopeo delete docker://${QUAY_IMAGE_REPO}:runtime-cuda-tensorflow-ubi8-python-3.8-pr-${{ env.PR }}
-
           skopeo delete docker://${QUAY_IMAGE_REPO}:jupyter-minimal-ubi9-python-3.9-pr-${{ env.PR }}
           skopeo delete docker://${QUAY_IMAGE_REPO}:jupyter-datascience-ubi9-python-3.9-pr-${{ env.PR }}
           skopeo delete docker://${QUAY_IMAGE_REPO}:jupyter-pytorch-ubi9-python-3.9-pr-${{ env.PR }}
@@ -92,9 +79,6 @@ jobs:
           skopeo delete docker://${QUAY_IMAGE_REPO}:rstudio-c9s-python-3.9-pr-${{ env.PR }}
           skopeo delete docker://${QUAY_IMAGE_REPO}:cuda-rstudio-c9s-python-3.9-pr-${{ env.PR }}
 
-          skopeo delete docker://${QUAY_IMAGE_REPO}:habana-jupyter-1.10.0-ubi8-python-3.8-pr-${{ env.PR }}
-          skopeo delete docker://${QUAY_IMAGE_REPO}:habana-jupyter-1.13.0-ubi8-python-3.8-pr-${{ env.PR }}
-
           skopeo delete docker://${QUAY_IMAGE_REPO}:intel-base-gpu-ubi9-python-3.9-pr-${{ env.PR }}
           skopeo delete docker://${QUAY_IMAGE_REPO}:intel-runtime-tensorflow-ubi9-python-3.9-pr-${{ env.PR }}
           skopeo delete docker://${QUAY_IMAGE_REPO}:intel-runtime-pytorch-ubi9-python-3.9-pr-${{ env.PR }}
diff --git a/.github/workflows/runtimes-digest-updater-upstream.yaml b/.github/workflows/runtimes-digest-updater-upstream.yaml
index e2c014a50..453d1b222 100644
--- a/.github/workflows/runtimes-digest-updater-upstream.yaml
+++ b/.github/workflows/runtimes-digest-updater-upstream.yaml
@@ -67,15 +67,7 @@ jobs:
       - name: Update Runtimes
         run: |
             echo Latest commit is: ${{ steps.hash-n.outputs.HASH_N }} on ${{ env.RELEASE_VERSION_N}}
-            PATHS=("jupyter/datascience/anaconda-python-3.8/runtime-images/datascience-ubi8-py38.json"
-            "jupyter/datascience/anaconda-python-3.8/runtime-images/pytorch-ubi8-py38.json"
-            "jupyter/datascience/anaconda-python-3.8/runtime-images/tensorflow-ubi8-py38.json"
-            "jupyter/datascience/anaconda-python-3.8/runtime-images/ubi8-py38.json"
-            "jupyter/datascience/ubi8-python-3.8/runtime-images/datascience-ubi8-py38.json"
-            "jupyter/datascience/ubi8-python-3.8/runtime-images/pytorch-ubi8-py38.json"
-            "jupyter/datascience/ubi8-python-3.8/runtime-images/tensorflow-ubi8-py38.json"
-            "jupyter/datascience/ubi8-python-3.8/runtime-images/ubi8-py38.json"
-            "jupyter/datascience/ubi9-python-3.9/runtime-images/datascience-ubi9-py39.json"
+            PATHS=("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"
diff --git a/ci/check-params-env.sh b/ci/check-params-env.sh
index 5c9bd3295..dafeaaba7 100755
--- a/ci/check-params-env.sh
+++ b/ci/check-params-env.sh
@@ -150,16 +150,6 @@ function check_image_variable_matches_name_and_commitref() {
             expected_commitref="2023b"
             expected_build_name="jupyter-trustyai-ubi9-python-3.9-amd64"
             ;;
-        odh-habana-notebook-image-n)
-            expected_name="odh-notebook-habana-jupyter-1.13.0-ubi8-python-3.8"
-            expected_commitref="2024a"
-            expected_build_name="habana-jupyter-1.13.0-ubi8-python-3.8-amd64"
-            ;;
-        odh-habana-notebook-image-n-1)
-            expected_name="odh-notebook-habana-jupyter-1.10.0-ubi8-python-3.8"
-            expected_commitref="2023b"
-            expected_build_name="habana-jupyter-1.10.0-ubi8-python-3.8-amd64"
-            ;;
         odh-codeserver-notebook-image-n)
             expected_name="odh-notebook-code-server-ubi9-python-3.9"
             expected_commitref="2024a"