diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index a1496ea1f..f175ab4b9 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -205,11 +205,6 @@ Integration:
         RUNNER:
           - aws/rhel-8.5-x86_64
         INTERNAL_NETWORK: ["true"]
-      - <<: *INTEGRATION_TESTS
-        RUNNER:
-          - aws/rhel-8-x86_64
-        INTERNAL_NETWORK: ["true"]
-        DISTRO_CODE: ["rhel_90"]
       - SCRIPT:
           - libvirt.sh
         RUNNER:
@@ -251,11 +246,19 @@ API:
           - aws/rhel-8-x86_64
           - aws/rhel-8.5-x86_64
         INTERNAL_NETWORK: ["true"]
-      - <<: *API_TESTS
-        RUNNER:
-          - aws/rhel-8-x86_64
-        INTERNAL_NETWORK: ["true"]
-        DISTRO_CODE: ["rhel_90"]
+
+RHEL 9 on 8:
+  stage: test
+  extends: .terraform
+  rules:
+    - if: '$CI_PIPELINE_SOURCE != "schedule"'
+  script:
+    - schutzbot/deploy.sh
+    - /usr/libexec/tests/osbuild-composer/koji.sh
+  variables:
+    RUNNER: aws/rhel-8-x86_64
+    INTERNAL_NETWORK: "true"
+    DISTRO_CODE: rhel-90
 
 NIGHTLY_FAIL:
   stage: finish