diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 0ed7d677..f5d3ff73 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -66,7 +66,6 @@ prepare-rhel-internal-runners:
       - RUNNER:
           # NOTE: 1 runner prepares for all arches b/c subsequent jobs download
           # artifacts from all previous jobs and the last one wins
-          - aws/rhel-9.6-nightly-x86_64
           - aws/rhel-10.0-nightly-x86_64
         INTERNAL_NIGHTLY: [ "internal" ]
         INTERNAL_NETWORK: [ "true" ]
diff --git a/schutzbot/deploy.sh b/schutzbot/deploy.sh
index d0c7fd0b..51d09896 100755
--- a/schutzbot/deploy.sh
+++ b/schutzbot/deploy.sh
@@ -63,12 +63,15 @@ function get_last_passed_commit {
         base_curl="curl --header PRIVATE-TOKEN:${GITLAB_API_TOKEN}"
 
         # To get the schedule id use the ../pipeline_schedule endpoint
-        if [[ ${VERSION_ID%.*} == "8" ]]; then
-            # RHEL 8 scheduled pipeline id
-            schedule_id="233735"
-        else
+        if [[ ${VERSION_ID%.*} == "9" ]]; then
             # RHEL 9 scheduled pipeline id
             schedule_id="233736"
+        elif [[ ${VERSION_ID%.*} == "10" ]]; then
+            # RHEL 10 scheduled pipeline id (FYI - it was used for RHEL 8 before)
+            schedule_id="233735"
+        else
+            echo "No scheduled pipeline defined for RHEL $VERSION_ID"
+            exit 1
         fi
 
         # Last executed pipeline ID