diff --git a/.github/workflows/rhel-9-0.yml b/.github/workflows/rhel-9-0.yml
deleted file mode 100644
index 29b921074..000000000
--- a/.github/workflows/rhel-9-0.yml
+++ /dev/null
@@ -1,538 +0,0 @@
----
-name: Run Edge Test on RHEL 9.0.0
-
-on:
-  issue_comment:
-    types:
-      - created
-
-jobs:
-  pr-info:
-    if: ${{ github.event.issue.pull_request &&
-            (endsWith(github.event.comment.body, '/test-rhel-9-0') ||
-            endsWith(github.event.comment.body, '/test-rhel-9-0-virt') ||
-            endsWith(github.event.comment.body, '/test-rhel-9-0-ng') ||
-            endsWith(github.event.comment.body, '/test-rhel-9-0-raw') ||
-            endsWith(github.event.comment.body, '/test-rhel-9-0-simplified') ||
-            endsWith(github.event.comment.body, '/test-rhel-9-0-fdo-aio') ||
-            endsWith(github.event.comment.body, '/test-rhel-9-0-8to9')) }}
-    runs-on: ubuntu-latest
-    steps:
-      - name: Query author repository permissions
-        uses: octokit/request-action@v2.x
-        id: user_permission
-        with:
-          route: GET /repos/${{ github.repository }}/collaborators/${{ github.event.sender.login }}/permission
-        env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-
-      # restrict running of tests to users with admin or write permission for the repository
-      # see https://docs.github.com/en/free-pro-team@latest/rest/reference/repos#get-repository-permissions-for-a-user
-      - name: Check if user does have correct permissions
-        if: contains('admin write', fromJson(steps.user_permission.outputs.data).permission)
-        id: check_user_perm
-        run: |
-          echo "User '${{ github.event.sender.login }}' has permission '${{ fromJson(steps.user_permission.outputs.data).permission }}' allowed values: 'admin', 'write'"
-          echo "allowed_user=true" >> $GITHUB_OUTPUT
-      - name: Get information for pull request
-        uses: octokit/request-action@v2.x
-        id: pr-api
-        with:
-          route: GET /repos/${{ github.repository }}/pulls/${{ github.event.issue.number }}
-        env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-
-    outputs:
-      allowed_user: ${{ steps.check_user_perm.outputs.allowed_user }}
-      sha: ${{ fromJson(steps.pr-api.outputs.data).head.sha }}
-
-  pre-edge-commit-90:
-    needs: pr-info
-    if: ${{ needs.pr-info.outputs.allowed_user == 'true' && github.event.issue.pull_request &&
-            (endsWith(github.event.comment.body, '/test-rhel-9-0') ||
-            endsWith(github.event.comment.body, '/test-rhel-9-0-virt')) }}
-    runs-on: ubuntu-latest
-    env:
-      STATUS_NAME: edge-commit-9.0
-
-    steps:
-      - name: Create in-progress status
-        uses: octokit/request-action@v2.x
-        with:
-          route: 'POST /repos/${{ github.repository }}/statuses/${{ needs.pr-info.outputs.sha }}'
-          context: ${{ env.STATUS_NAME }}
-          state: pending
-          description: 'Runner has been deploying...'
-          target_url: 'https://github.com/${{ github.repository }}/actions/runs/${{ github.run_id }}'
-        env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-
-  edge-commit-90:
-    needs: [pr-info, pre-edge-commit-90]
-    runs-on: [kite, x86_64, rhos-01, rhel-9-0, large]
-    env:
-      STATUS_NAME: edge-commit-9.0
-
-    steps:
-      - name: Create in-progress status
-        uses: octokit/request-action@v2.x
-        with:
-          route: 'POST /repos/${{ github.repository }}/statuses/${{ needs.pr-info.outputs.sha }}'
-          context: ${{ env.STATUS_NAME }}
-          state: pending
-          description: 'Test has been running...'
-          target_url: 'https://github.com/${{ github.repository }}/actions/runs/${{ github.run_id }}'
-        env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-
-      - name: Clone repository
-        uses: actions/checkout@v3
-        with:
-          ref: ${{ needs.pr-info.outputs.sha }}
-          fetch-depth: 0
-
-      - name: run ostree.sh
-        run: ./ostree.sh
-        env:
-          DOWNLOAD_NODE: ${{ secrets.DOWNLOAD_NODE }}
-        timeout-minutes: 60
-
-      - name: Set non cancelled result status
-        if: ${{ !cancelled() }}
-        uses: octokit/request-action@v2.x
-        with:
-          route: 'POST /repos/${{ github.repository }}/statuses/${{ needs.pr-info.outputs.sha }}'
-          context: ${{ env.STATUS_NAME }}
-          state: ${{ job.status }}
-          target_url: 'https://github.com/${{ github.repository }}/actions/runs/${{ github.run_id }}'
-        env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-
-      - name: Set cancelled result status
-        if: ${{ cancelled() }}
-        uses: octokit/request-action@v2.x
-        with:
-          route: 'POST /repos/${{ github.repository }}/statuses/${{ needs.pr-info.outputs.sha }}'
-          context: ${{ env.STATUS_NAME }}
-          state: error
-          target_url: 'https://github.com/${{ github.repository }}/actions/runs/${{ github.run_id }}'
-        env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-
-      - uses: actions/upload-artifact@v3
-        if: ${{ always() }}
-        with:
-          name: edge-commit-9.0
-          path: |
-            *.json
-            *.log
-
-  pre-edge-installer-90:
-    needs: pr-info
-    if: ${{ needs.pr-info.outputs.allowed_user == 'true' && github.event.issue.pull_request &&
-            (endsWith(github.event.comment.body, '/test-rhel-9-0') ||
-            endsWith(github.event.comment.body, '/test-rhel-9-0-ng')) }}
-    runs-on: ubuntu-latest
-    env:
-      STATUS_NAME: edge-installer-9.0
-
-    steps:
-      - name: Create in-progress status
-        uses: octokit/request-action@v2.x
-        with:
-          route: 'POST /repos/${{ github.repository }}/statuses/${{ needs.pr-info.outputs.sha }}'
-          context: ${{ env.STATUS_NAME }}
-          state: pending
-          description: 'Runner has been deploying...'
-          target_url: 'https://github.com/${{ github.repository }}/actions/runs/${{ github.run_id }}'
-        env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-
-  edge-installer-90:
-    needs: [pr-info, pre-edge-installer-90]
-    runs-on: [kite, x86_64, rhos-01, rhel-9-0, large]
-    env:
-      STATUS_NAME: edge-installer-9.0
-
-    steps:
-      - name: Create in-progress status
-        uses: octokit/request-action@v2.x
-        with:
-          route: 'POST /repos/${{ github.repository }}/statuses/${{ needs.pr-info.outputs.sha }}'
-          context: ${{ env.STATUS_NAME }}
-          state: pending
-          description: 'Test has been running...'
-          target_url: 'https://github.com/${{ github.repository }}/actions/runs/${{ github.run_id }}'
-        env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-
-      - name: Clone repository
-        uses: actions/checkout@v3
-        with:
-          ref: ${{ needs.pr-info.outputs.sha }}
-          fetch-depth: 0
-
-      - name: run ostree-ng.sh
-        run: ./ostree-ng.sh
-        env:
-          OCP4_TOKEN: ${{ secrets.OCP4_TOKEN }}
-          QUAY_USERNAME: ${{ secrets.QUAY_USERNAME }}
-          QUAY_PASSWORD: ${{ secrets.QUAY_PASSWORD }}
-          DOWNLOAD_NODE: ${{ secrets.DOWNLOAD_NODE }}
-        timeout-minutes: 120
-
-      - name: Set non cancelled result status
-        if: ${{ !cancelled() }}
-        uses: octokit/request-action@v2.x
-        with:
-          route: 'POST /repos/${{ github.repository }}/statuses/${{ needs.pr-info.outputs.sha }}'
-          context: ${{ env.STATUS_NAME }}
-          state: ${{ job.status }}
-          target_url: 'https://github.com/${{ github.repository }}/actions/runs/${{ github.run_id }}'
-        env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-
-      - name: Set cancelled result status
-        if: ${{ cancelled() }}
-        uses: octokit/request-action@v2.x
-        with:
-          route: 'POST /repos/${{ github.repository }}/statuses/${{ needs.pr-info.outputs.sha }}'
-          context: ${{ env.STATUS_NAME }}
-          state: error
-          target_url: 'https://github.com/${{ github.repository }}/actions/runs/${{ github.run_id }}'
-        env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-
-      - uses: actions/upload-artifact@v3
-        if: ${{ always() }}
-        with:
-          name: edge-installer-9.0
-          path: |
-            *.json
-            *.log
-
-  pre-edge-raw-image-90:
-    needs: pr-info
-    if: ${{ needs.pr-info.outputs.allowed_user == 'true' && github.event.issue.pull_request &&
-            (endsWith(github.event.comment.body, '/test-rhel-9-0') ||
-            endsWith(github.event.comment.body, '/test-rhel-9-0-raw')) }}
-    runs-on: ubuntu-latest
-    env:
-      STATUS_NAME: edge-raw-image-9.0
-
-    steps:
-      - name: Create in-progress status
-        uses: octokit/request-action@v2.x
-        with:
-          route: 'POST /repos/${{ github.repository }}/statuses/${{ needs.pr-info.outputs.sha }}'
-          context: ${{ env.STATUS_NAME }}
-          state: pending
-          description: 'Runner has been deploying...'
-          target_url: 'https://github.com/${{ github.repository }}/actions/runs/${{ github.run_id }}'
-        env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-
-  edge-raw-image-90:
-    needs: [pr-info, pre-edge-raw-image-90]
-    runs-on: [kite, x86_64, rhos-01, rhel-9-0, large]
-    env:
-      STATUS_NAME: edge-raw-image-9.0
-
-    steps:
-      - name: Create in-progress status
-        uses: octokit/request-action@v2.x
-        with:
-          route: 'POST /repos/${{ github.repository }}/statuses/${{ needs.pr-info.outputs.sha }}'
-          context: ${{ env.STATUS_NAME }}
-          state: pending
-          description: 'Test has been running...'
-          target_url: 'https://github.com/${{ github.repository }}/actions/runs/${{ github.run_id }}'
-        env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-
-      - name: Clone repository
-        uses: actions/checkout@v3
-        with:
-          ref: ${{ needs.pr-info.outputs.sha }}
-          fetch-depth: 0
-
-      - name: run ostree-raw-image.sh
-        run: ./ostree-raw-image.sh
-        env:
-          DOCKERHUB_USERNAME: ${{ secrets.DOCKERHUB_USERNAME }}
-          DOCKERHUB_PASSWORD: ${{ secrets.DOCKERHUB_PASSWORD }}
-          DOWNLOAD_NODE: ${{ secrets.DOWNLOAD_NODE }}
-        timeout-minutes: 90
-
-      - name: Set non cancelled result status
-        if: ${{ !cancelled() }}
-        uses: octokit/request-action@v2.x
-        with:
-          route: 'POST /repos/${{ github.repository }}/statuses/${{ needs.pr-info.outputs.sha }}'
-          context: ${{ env.STATUS_NAME }}
-          state: ${{ job.status }}
-          target_url: 'https://github.com/${{ github.repository }}/actions/runs/${{ github.run_id }}'
-        env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-
-      - name: Set cancelled result status
-        if: ${{ cancelled() }}
-        uses: octokit/request-action@v2.x
-        with:
-          route: 'POST /repos/${{ github.repository }}/statuses/${{ needs.pr-info.outputs.sha }}'
-          context: ${{ env.STATUS_NAME }}
-          state: error
-          target_url: 'https://github.com/${{ github.repository }}/actions/runs/${{ github.run_id }}'
-        env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-
-      - uses: actions/upload-artifact@v3
-        if: ${{ always() }}
-        with:
-          name: edge-raw-image-9.0
-          path: |
-            *.json
-            *.log
-
-  pre-edge-simplified-90:
-    needs: pr-info
-    if: ${{ needs.pr-info.outputs.allowed_user == 'true' && github.event.issue.pull_request &&
-            (endsWith(github.event.comment.body, '/test-rhel-9-0') ||
-            endsWith(github.event.comment.body, '/test-rhel-9-0-simplified')) }}
-    runs-on: ubuntu-latest
-    env:
-      STATUS_NAME: edge-simplified-installer-9.0
-
-    steps:
-      - name: Create in-progress status
-        uses: octokit/request-action@v2.x
-        with:
-          route: 'POST /repos/${{ github.repository }}/statuses/${{ needs.pr-info.outputs.sha }}'
-          context: ${{ env.STATUS_NAME }}
-          state: pending
-          description: 'Runner has been deploying...'
-          target_url: 'https://github.com/${{ github.repository }}/actions/runs/${{ github.run_id }}'
-        env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-
-  edge-simplified-90:
-    needs: [pr-info, pre-edge-simplified-90]
-    runs-on: [kite, x86_64, rhos-01, rhel-9-0, large]
-    env:
-      STATUS_NAME: edge-simplified-installer-9.0
-
-    steps:
-      - name: Create in-progress status
-        uses: octokit/request-action@v2.x
-        with:
-          route: 'POST /repos/${{ github.repository }}/statuses/${{ needs.pr-info.outputs.sha }}'
-          context: ${{ env.STATUS_NAME }}
-          state: pending
-          description: 'Test has been running...'
-          target_url: 'https://github.com/${{ github.repository }}/actions/runs/${{ github.run_id }}'
-        env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-
-      - name: Clone repository
-        uses: actions/checkout@v3
-        with:
-          ref: ${{ needs.pr-info.outputs.sha }}
-          fetch-depth: 0
-
-      - name: run ostree-simplified-installer.sh
-        run: ./ostree-simplified-installer.sh
-        env:
-          DOWNLOAD_NODE: ${{ secrets.DOWNLOAD_NODE }}
-        timeout-minutes: 150
-
-      - name: Set non cancelled result status
-        if: ${{ !cancelled() }}
-        uses: octokit/request-action@v2.x
-        with:
-          route: 'POST /repos/${{ github.repository }}/statuses/${{ needs.pr-info.outputs.sha }}'
-          context: ${{ env.STATUS_NAME }}
-          state: ${{ job.status }}
-          target_url: 'https://github.com/${{ github.repository }}/actions/runs/${{ github.run_id }}'
-        env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-
-      - name: Set cancelled result status
-        if: ${{ cancelled() }}
-        uses: octokit/request-action@v2.x
-        with:
-          route: 'POST /repos/${{ github.repository }}/statuses/${{ needs.pr-info.outputs.sha }}'
-          context: ${{ env.STATUS_NAME }}
-          state: error
-          target_url: 'https://github.com/${{ github.repository }}/actions/runs/${{ github.run_id }}'
-        env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-
-      - uses: actions/upload-artifact@v3
-        if: ${{ always() }}
-        with:
-          name: edge-simplified-installer-9.0
-          path: |
-            *.json
-            *.log
-
-  pre-edge-8to9-90:
-    needs: pr-info
-    if: ${{ needs.pr-info.outputs.allowed_user == 'true' && github.event.issue.pull_request &&
-            (endsWith(github.event.comment.body, '/test-rhel-9-0') ||
-            endsWith(github.event.comment.body, '/test-rhel-9-0-8to9')) }}
-    runs-on: ubuntu-latest
-    env:
-      STATUS_NAME: edge-8to9-9.0
-
-    steps:
-      - name: Create in-progress status
-        uses: octokit/request-action@v2.x
-        with:
-          route: 'POST /repos/${{ github.repository }}/statuses/${{ needs.pr-info.outputs.sha }}'
-          context: ${{ env.STATUS_NAME }}
-          state: pending
-          description: 'Runner has been deploying...'
-          target_url: 'https://github.com/${{ github.repository }}/actions/runs/${{ github.run_id }}'
-        env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-
-  edge-8to9-90:
-    needs: [pr-info, pre-edge-8to9-90]
-    runs-on: [kite, x86_64, rhos-01, rhel-9-0, large]
-    env:
-      STATUS_NAME: edge-8to9-9.0
-
-    steps:
-      - name: Create in-progress status
-        uses: octokit/request-action@v2.x
-        with:
-          route: 'POST /repos/${{ github.repository }}/statuses/${{ needs.pr-info.outputs.sha }}'
-          context: ${{ env.STATUS_NAME }}
-          state: pending
-          description: 'Test has been running...'
-          target_url: 'https://github.com/${{ github.repository }}/actions/runs/${{ github.run_id }}'
-        env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-
-      - name: Clone repository
-        uses: actions/checkout@v3
-        with:
-          ref: ${{ needs.pr-info.outputs.sha }}
-          fetch-depth: 0
-
-      - name: run ostree-8-to-9.sh
-        run: ./ostree-8-to-9.sh
-        env:
-          DOWNLOAD_NODE: ${{ secrets.DOWNLOAD_NODE }}
-        timeout-minutes: 90
-
-      - name: Set non cancelled result status
-        if: ${{ !cancelled() }}
-        uses: octokit/request-action@v2.x
-        with:
-          route: 'POST /repos/${{ github.repository }}/statuses/${{ needs.pr-info.outputs.sha }}'
-          context: ${{ env.STATUS_NAME }}
-          state: ${{ job.status }}
-          target_url: 'https://github.com/${{ github.repository }}/actions/runs/${{ github.run_id }}'
-        env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-
-      - name: Set cancelled result status
-        if: ${{ cancelled() }}
-        uses: octokit/request-action@v2.x
-        with:
-          route: 'POST /repos/${{ github.repository }}/statuses/${{ needs.pr-info.outputs.sha }}'
-          context: ${{ env.STATUS_NAME }}
-          state: error
-          target_url: 'https://github.com/${{ github.repository }}/actions/runs/${{ github.run_id }}'
-        env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-
-      - uses: actions/upload-artifact@v3
-        if: ${{ always() }}
-        with:
-          name: edge-8to9-9.0
-          path: |
-            *.json
-            *.log
-
-  pre-edge-fdo-aio-90:
-    needs: pr-info
-    if: ${{ needs.pr-info.outputs.allowed_user == 'true' && github.event.issue.pull_request &&
-            (endsWith(github.event.comment.body, '/test-rhel-9-0') ||
-            endsWith(github.event.comment.body, '/test-rhel-9-0-fdo-aio')) }}
-    runs-on: ubuntu-latest
-    env:
-      STATUS_NAME: edge-fdo-aio-9.0
-
-    steps:
-      - name: Create in-progress status
-        uses: octokit/request-action@v2.x
-        with:
-          route: 'POST /repos/${{ github.repository }}/statuses/${{ needs.pr-info.outputs.sha }}'
-          context: ${{ env.STATUS_NAME }}
-          state: pending
-          description: 'Runner has been deploying...'
-          target_url: 'https://github.com/${{ github.repository }}/actions/runs/${{ github.run_id }}'
-        env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-
-  edge-fdo-aio-90:
-    needs: [pr-info, pre-edge-fdo-aio-90]
-    runs-on: [kite, x86_64, rhos-01, rhel-9-0, large]
-    env:
-      STATUS_NAME: edge-fdo-aio-9.0
-
-    steps:
-      - name: Create in-progress status
-        uses: octokit/request-action@v2.x
-        with:
-          route: 'POST /repos/${{ github.repository }}/statuses/${{ needs.pr-info.outputs.sha }}'
-          context: ${{ env.STATUS_NAME }}
-          state: pending
-          description: 'Test has been running...'
-          target_url: 'https://github.com/${{ github.repository }}/actions/runs/${{ github.run_id }}'
-        env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-
-      - name: Clone repository
-        uses: actions/checkout@v3
-        with:
-          ref: ${{ needs.pr-info.outputs.sha }}
-          fetch-depth: 0
-
-      - name: run ostree-fdo-aio.sh
-        run: ./ostree-fdo-aio.sh
-        env:
-          DOWNLOAD_NODE: ${{ secrets.DOWNLOAD_NODE }}
-        timeout-minutes: 150
-
-      - name: Set non cancelled result status
-        if: ${{ !cancelled() }}
-        uses: octokit/request-action@v2.x
-        with:
-          route: 'POST /repos/${{ github.repository }}/statuses/${{ needs.pr-info.outputs.sha }}'
-          context: ${{ env.STATUS_NAME }}
-          state: ${{ job.status }}
-          target_url: 'https://github.com/${{ github.repository }}/actions/runs/${{ github.run_id }}'
-        env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-
-      - name: Set cancelled result status
-        if: ${{ cancelled() }}
-        uses: octokit/request-action@v2.x
-        with:
-          route: 'POST /repos/${{ github.repository }}/statuses/${{ needs.pr-info.outputs.sha }}'
-          context: ${{ env.STATUS_NAME }}
-          state: error
-          target_url: 'https://github.com/${{ github.repository }}/actions/runs/${{ github.run_id }}'
-        env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-
-      - uses: actions/upload-artifact@v3
-        if: ${{ always() }}
-        with:
-          name: edge-fdo-aio-9.0
-          path: |
-            *.json
-            *.log
diff --git a/.github/workflows/rhel-9-2.yml b/.github/workflows/rhel-9-2.yml
deleted file mode 100644
index 90729dd3d..000000000
--- a/.github/workflows/rhel-9-2.yml
+++ /dev/null
@@ -1,702 +0,0 @@
----
-name: Run Edge Test on RHEL 9.2.0
-
-on:
-  issue_comment:
-    types:
-      - created
-
-jobs:
-  pr-info:
-    if: ${{ github.event.issue.pull_request &&
-            (endsWith(github.event.comment.body, '/test-rhel-9-2') ||
-            endsWith(github.event.comment.body, '/test-rhel-9-2-virt') ||
-            endsWith(github.event.comment.body, '/test-rhel-9-2-ng') ||
-            endsWith(github.event.comment.body, '/test-rhel-9-2-raw') ||
-            endsWith(github.event.comment.body, '/test-rhel-9-2-simplified') ||
-            endsWith(github.event.comment.body, '/test-rhel-9-2-fdo-aio') ||
-            endsWith(github.event.comment.body, '/test-rhel-9-2-9to9') ||
-            endsWith(github.event.comment.body, '/test-rhel-9-2-8to9') ||
-            endsWith(github.event.comment.body, '/test-rhel-9-2-ignition')) }}
-    runs-on: ubuntu-latest
-    steps:
-      - name: Query author repository permissions
-        uses: octokit/request-action@v2.x
-        id: user_permission
-        with:
-          route: GET /repos/${{ github.repository }}/collaborators/${{ github.event.sender.login }}/permission
-        env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-
-      # restrict running of tests to users with admin or write permission for the repository
-      # see https://docs.github.com/en/free-pro-team@latest/rest/reference/repos#get-repository-permissions-for-a-user
-      - name: Check if user does have correct permissions
-        if: contains('admin write', fromJson(steps.user_permission.outputs.data).permission)
-        id: check_user_perm
-        run: |
-          echo "User '${{ github.event.sender.login }}' has permission '${{ fromJson(steps.user_permission.outputs.data).permission }}' allowed values: 'admin', 'write'"
-          echo "allowed_user=true" >> $GITHUB_OUTPUT
-      - name: Get information for pull request
-        uses: octokit/request-action@v2.x
-        id: pr-api
-        with:
-          route: GET /repos/${{ github.repository }}/pulls/${{ github.event.issue.number }}
-        env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-
-    outputs:
-      allowed_user: ${{ steps.check_user_perm.outputs.allowed_user }}
-      sha: ${{ fromJson(steps.pr-api.outputs.data).head.sha }}
-
-  pre-edge-commit-92:
-    needs: pr-info
-    if: ${{ needs.pr-info.outputs.allowed_user == 'true' && github.event.issue.pull_request &&
-            (endsWith(github.event.comment.body, '/test-rhel-9-2') ||
-            endsWith(github.event.comment.body, '/test-rhel-9-2-virt')) }}
-    runs-on: ubuntu-latest
-    env:
-      STATUS_NAME: edge-commit-9.2
-
-    steps:
-      - name: Create in-progress status
-        uses: octokit/request-action@v2.x
-        with:
-          route: 'POST /repos/${{ github.repository }}/statuses/${{ needs.pr-info.outputs.sha }}'
-          context: ${{ env.STATUS_NAME }}
-          state: pending
-          description: 'Runner has been deploying...'
-          target_url: 'https://github.com/${{ github.repository }}/actions/runs/${{ github.run_id }}'
-        env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-
-  edge-commit-92:
-    needs: [pr-info, pre-edge-commit-92]
-    runs-on: [kite, x86_64, rhos-01, rhel-9-2, large]
-    env:
-      STATUS_NAME: edge-commit-9.2
-
-    steps:
-      - name: Create in-progress status
-        uses: octokit/request-action@v2.x
-        with:
-          route: 'POST /repos/${{ github.repository }}/statuses/${{ needs.pr-info.outputs.sha }}'
-          context: ${{ env.STATUS_NAME }}
-          state: pending
-          description: 'Test has been running...'
-          target_url: 'https://github.com/${{ github.repository }}/actions/runs/${{ github.run_id }}'
-        env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-
-      - name: Clone repository
-        uses: actions/checkout@v3
-        with:
-          ref: ${{ needs.pr-info.outputs.sha }}
-          fetch-depth: 0
-
-      - name: run ostree.sh
-        run: ./ostree.sh
-        env:
-          DOWNLOAD_NODE: ${{ secrets.DOWNLOAD_NODE }}
-        timeout-minutes: 60
-
-      - name: Set non cancelled result status
-        if: ${{ !cancelled() }}
-        uses: octokit/request-action@v2.x
-        with:
-          route: 'POST /repos/${{ github.repository }}/statuses/${{ needs.pr-info.outputs.sha }}'
-          context: ${{ env.STATUS_NAME }}
-          state: ${{ job.status }}
-          target_url: 'https://github.com/${{ github.repository }}/actions/runs/${{ github.run_id }}'
-        env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-
-      - name: Set cancelled result status
-        if: ${{ cancelled() }}
-        uses: octokit/request-action@v2.x
-        with:
-          route: 'POST /repos/${{ github.repository }}/statuses/${{ needs.pr-info.outputs.sha }}'
-          context: ${{ env.STATUS_NAME }}
-          state: error
-          target_url: 'https://github.com/${{ github.repository }}/actions/runs/${{ github.run_id }}'
-        env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-
-      - uses: actions/upload-artifact@v3
-        if: ${{ always() }}
-        with:
-          name: edge-commit-9.2
-          path: |
-            *.json
-            *.log
-
-  pre-edge-installer-92:
-    needs: pr-info
-    if: ${{ needs.pr-info.outputs.allowed_user == 'true' && github.event.issue.pull_request &&
-            (endsWith(github.event.comment.body, '/test-rhel-9-2') ||
-            endsWith(github.event.comment.body, '/test-rhel-9-2-ng')) }}
-    runs-on: ubuntu-latest
-    env:
-      STATUS_NAME: edge-installer-9.2
-
-    steps:
-      - name: Create in-progress status
-        uses: octokit/request-action@v2.x
-        with:
-          route: 'POST /repos/${{ github.repository }}/statuses/${{ needs.pr-info.outputs.sha }}'
-          context: ${{ env.STATUS_NAME }}
-          state: pending
-          description: 'Runner has been deploying...'
-          target_url: 'https://github.com/${{ github.repository }}/actions/runs/${{ github.run_id }}'
-        env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-
-  edge-installer-92:
-    needs: [pr-info, pre-edge-installer-92]
-    runs-on: [kite, x86_64, rhos-01, rhel-9-2, large]
-    env:
-      STATUS_NAME: edge-installer-9.2
-
-    steps:
-      - name: Create in-progress status
-        uses: octokit/request-action@v2.x
-        with:
-          route: 'POST /repos/${{ github.repository }}/statuses/${{ needs.pr-info.outputs.sha }}'
-          context: ${{ env.STATUS_NAME }}
-          state: pending
-          description: 'Test has been running...'
-          target_url: 'https://github.com/${{ github.repository }}/actions/runs/${{ github.run_id }}'
-        env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-
-      - name: Clone repository
-        uses: actions/checkout@v3
-        with:
-          ref: ${{ needs.pr-info.outputs.sha }}
-          fetch-depth: 0
-
-      - name: run ostree-ng.sh
-        run: ./ostree-ng.sh
-        env:
-          OCP4_TOKEN: ${{ secrets.OCP4_TOKEN }}
-          QUAY_USERNAME: ${{ secrets.QUAY_USERNAME }}
-          QUAY_PASSWORD: ${{ secrets.QUAY_PASSWORD }}
-          DOWNLOAD_NODE: ${{ secrets.DOWNLOAD_NODE }}
-        timeout-minutes: 120
-
-      - name: Set non cancelled result status
-        if: ${{ !cancelled() }}
-        uses: octokit/request-action@v2.x
-        with:
-          route: 'POST /repos/${{ github.repository }}/statuses/${{ needs.pr-info.outputs.sha }}'
-          context: ${{ env.STATUS_NAME }}
-          state: ${{ job.status }}
-          target_url: 'https://github.com/${{ github.repository }}/actions/runs/${{ github.run_id }}'
-        env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-
-      - name: Set cancelled result status
-        if: ${{ cancelled() }}
-        uses: octokit/request-action@v2.x
-        with:
-          route: 'POST /repos/${{ github.repository }}/statuses/${{ needs.pr-info.outputs.sha }}'
-          context: ${{ env.STATUS_NAME }}
-          state: error
-          target_url: 'https://github.com/${{ github.repository }}/actions/runs/${{ github.run_id }}'
-        env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-
-      - uses: actions/upload-artifact@v3
-        if: ${{ always() }}
-        with:
-          name: edge-installer-9.2
-          path: |
-            *.json
-            *.log
-
-  pre-edge-raw-image-92:
-    needs: pr-info
-    if: ${{ needs.pr-info.outputs.allowed_user == 'true' && github.event.issue.pull_request &&
-            (endsWith(github.event.comment.body, '/test-rhel-9-2') ||
-            endsWith(github.event.comment.body, '/test-rhel-9-2-raw')) }}
-    runs-on: ubuntu-latest
-    env:
-      STATUS_NAME: edge-raw-image-9.2
-
-    steps:
-      - name: Create in-progress status
-        uses: octokit/request-action@v2.x
-        with:
-          route: 'POST /repos/${{ github.repository }}/statuses/${{ needs.pr-info.outputs.sha }}'
-          context: ${{ env.STATUS_NAME }}
-          state: pending
-          description: 'Runner has been deploying...'
-          target_url: 'https://github.com/${{ github.repository }}/actions/runs/${{ github.run_id }}'
-        env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-
-  edge-raw-image-92:
-    needs: [pr-info, pre-edge-raw-image-92]
-    runs-on: [kite, x86_64, rhos-01, rhel-9-2, large]
-    env:
-      STATUS_NAME: edge-raw-image-9.2
-
-    steps:
-      - name: Create in-progress status
-        uses: octokit/request-action@v2.x
-        with:
-          route: 'POST /repos/${{ github.repository }}/statuses/${{ needs.pr-info.outputs.sha }}'
-          context: ${{ env.STATUS_NAME }}
-          state: pending
-          description: 'Test has been running...'
-          target_url: 'https://github.com/${{ github.repository }}/actions/runs/${{ github.run_id }}'
-        env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-
-      - name: Clone repository
-        uses: actions/checkout@v3
-        with:
-          ref: ${{ needs.pr-info.outputs.sha }}
-          fetch-depth: 0
-
-      - name: run ostree-raw-image.sh
-        run: ./ostree-raw-image.sh
-        env:
-          DOCKERHUB_USERNAME: ${{ secrets.DOCKERHUB_USERNAME }}
-          DOCKERHUB_PASSWORD: ${{ secrets.DOCKERHUB_PASSWORD }}
-          DOWNLOAD_NODE: ${{ secrets.DOWNLOAD_NODE }}
-        timeout-minutes: 90
-
-      - name: Set non cancelled result status
-        if: ${{ !cancelled() }}
-        uses: octokit/request-action@v2.x
-        with:
-          route: 'POST /repos/${{ github.repository }}/statuses/${{ needs.pr-info.outputs.sha }}'
-          context: ${{ env.STATUS_NAME }}
-          state: ${{ job.status }}
-          target_url: 'https://github.com/${{ github.repository }}/actions/runs/${{ github.run_id }}'
-        env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-
-      - name: Set cancelled result status
-        if: ${{ cancelled() }}
-        uses: octokit/request-action@v2.x
-        with:
-          route: 'POST /repos/${{ github.repository }}/statuses/${{ needs.pr-info.outputs.sha }}'
-          context: ${{ env.STATUS_NAME }}
-          state: error
-          target_url: 'https://github.com/${{ github.repository }}/actions/runs/${{ github.run_id }}'
-        env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-
-      - uses: actions/upload-artifact@v3
-        if: ${{ always() }}
-        with:
-          name: edge-raw-image-9.2
-          path: |
-            *.json
-            *.log
-
-  pre-edge-simplified-92:
-    needs: pr-info
-    if: ${{ needs.pr-info.outputs.allowed_user == 'true' && github.event.issue.pull_request &&
-            (endsWith(github.event.comment.body, '/test-rhel-9-2') ||
-            endsWith(github.event.comment.body, '/test-rhel-9-2-simplified')) }}
-    runs-on: ubuntu-latest
-    env:
-      STATUS_NAME: edge-simplified-installer-9.2
-
-    steps:
-      - name: Create in-progress status
-        uses: octokit/request-action@v2.x
-        with:
-          route: 'POST /repos/${{ github.repository }}/statuses/${{ needs.pr-info.outputs.sha }}'
-          context: ${{ env.STATUS_NAME }}
-          state: pending
-          description: 'Runner has been deploying...'
-          target_url: 'https://github.com/${{ github.repository }}/actions/runs/${{ github.run_id }}'
-        env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-
-  edge-simplified-92:
-    needs: [pr-info, pre-edge-simplified-92]
-    runs-on: [kite, x86_64, rhos-01, rhel-9-2, large]
-    env:
-      STATUS_NAME: edge-simplified-installer-9.2
-
-    steps:
-      - name: Create in-progress status
-        uses: octokit/request-action@v2.x
-        with:
-          route: 'POST /repos/${{ github.repository }}/statuses/${{ needs.pr-info.outputs.sha }}'
-          context: ${{ env.STATUS_NAME }}
-          state: pending
-          description: 'Test has been running...'
-          target_url: 'https://github.com/${{ github.repository }}/actions/runs/${{ github.run_id }}'
-        env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-
-      - name: Clone repository
-        uses: actions/checkout@v3
-        with:
-          ref: ${{ needs.pr-info.outputs.sha }}
-          fetch-depth: 0
-
-      - name: run ostree-simplified-installer.sh
-        run: ./ostree-simplified-installer.sh
-        env:
-          DOWNLOAD_NODE: ${{ secrets.DOWNLOAD_NODE }}
-        timeout-minutes: 150
-
-      - name: Set non cancelled result status
-        if: ${{ !cancelled() }}
-        uses: octokit/request-action@v2.x
-        with:
-          route: 'POST /repos/${{ github.repository }}/statuses/${{ needs.pr-info.outputs.sha }}'
-          context: ${{ env.STATUS_NAME }}
-          state: ${{ job.status }}
-          target_url: 'https://github.com/${{ github.repository }}/actions/runs/${{ github.run_id }}'
-        env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-
-      - name: Set cancelled result status
-        if: ${{ cancelled() }}
-        uses: octokit/request-action@v2.x
-        with:
-          route: 'POST /repos/${{ github.repository }}/statuses/${{ needs.pr-info.outputs.sha }}'
-          context: ${{ env.STATUS_NAME }}
-          state: error
-          target_url: 'https://github.com/${{ github.repository }}/actions/runs/${{ github.run_id }}'
-        env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-
-      - uses: actions/upload-artifact@v3
-        if: ${{ always() }}
-        with:
-          name: edge-simplified-installer-9.2
-          path: |
-            *.json
-            *.log
-
-  pre-edge-8to9-92:
-    needs: pr-info
-    if: ${{ needs.pr-info.outputs.allowed_user == 'true' && github.event.issue.pull_request &&
-            (endsWith(github.event.comment.body, '/test-rhel-9-2') ||
-            endsWith(github.event.comment.body, '/test-rhel-9-2-8to9')) }}
-    runs-on: ubuntu-latest
-    env:
-      STATUS_NAME: edge-8to9-9.2
-
-    steps:
-      - name: Create in-progress status
-        uses: octokit/request-action@v2.x
-        with:
-          route: 'POST /repos/${{ github.repository }}/statuses/${{ needs.pr-info.outputs.sha }}'
-          context: ${{ env.STATUS_NAME }}
-          state: pending
-          description: 'Runner has been deploying...'
-          target_url: 'https://github.com/${{ github.repository }}/actions/runs/${{ github.run_id }}'
-        env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-
-  edge-8to9-92:
-    needs: [pr-info, pre-edge-8to9-92]
-    runs-on: [kite, x86_64, rhos-01, rhel-9-2, large]
-    env:
-      STATUS_NAME: edge-8to9-9.2
-
-    steps:
-      - name: Create in-progress status
-        uses: octokit/request-action@v2.x
-        with:
-          route: 'POST /repos/${{ github.repository }}/statuses/${{ needs.pr-info.outputs.sha }}'
-          context: ${{ env.STATUS_NAME }}
-          state: pending
-          description: 'Test has been running...'
-          target_url: 'https://github.com/${{ github.repository }}/actions/runs/${{ github.run_id }}'
-        env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-
-      - name: Clone repository
-        uses: actions/checkout@v3
-        with:
-          ref: ${{ needs.pr-info.outputs.sha }}
-          fetch-depth: 0
-
-      - name: run ostree-8-to-9.sh
-        run: ./ostree-8-to-9.sh
-        env:
-          DOWNLOAD_NODE: ${{ secrets.DOWNLOAD_NODE }}
-        timeout-minutes: 90
-
-      - name: Set non cancelled result status
-        if: ${{ !cancelled() }}
-        uses: octokit/request-action@v2.x
-        with:
-          route: 'POST /repos/${{ github.repository }}/statuses/${{ needs.pr-info.outputs.sha }}'
-          context: ${{ env.STATUS_NAME }}
-          state: ${{ job.status }}
-          target_url: 'https://github.com/${{ github.repository }}/actions/runs/${{ github.run_id }}'
-        env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-
-      - name: Set cancelled result status
-        if: ${{ cancelled() }}
-        uses: octokit/request-action@v2.x
-        with:
-          route: 'POST /repos/${{ github.repository }}/statuses/${{ needs.pr-info.outputs.sha }}'
-          context: ${{ env.STATUS_NAME }}
-          state: error
-          target_url: 'https://github.com/${{ github.repository }}/actions/runs/${{ github.run_id }}'
-        env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-
-      - uses: actions/upload-artifact@v3
-        if: ${{ always() }}
-        with:
-          name: edge-8to9-9.2
-          path: |
-            *.json
-            *.log
-
-  pre-edge-9to9-92:
-    needs: pr-info
-    if: ${{ needs.pr-info.outputs.allowed_user == 'true' && github.event.issue.pull_request &&
-            (endsWith(github.event.comment.body, '/test-rhel-9-2') ||
-            endsWith(github.event.comment.body, '/test-rhel-9-2-9to9')) }}
-    runs-on: ubuntu-latest
-    env:
-      STATUS_NAME: edge-9to9-9.2
-
-    steps:
-      - name: Create in-progress status
-        uses: octokit/request-action@v2.x
-        with:
-          route: 'POST /repos/${{ github.repository }}/statuses/${{ needs.pr-info.outputs.sha }}'
-          context: ${{ env.STATUS_NAME }}
-          state: pending
-          description: 'Runner has been deploying...'
-          target_url: 'https://github.com/${{ github.repository }}/actions/runs/${{ github.run_id }}'
-        env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-
-  edge-9to9-92:
-    needs: [pr-info, pre-edge-9to9-92]
-    runs-on: [kite, x86_64, rhos-01, rhel-9-2, large]
-    env:
-      STATUS_NAME: edge-9to9-9.2
-
-    steps:
-      - name: Create in-progress status
-        uses: octokit/request-action@v2.x
-        with:
-          route: 'POST /repos/${{ github.repository }}/statuses/${{ needs.pr-info.outputs.sha }}'
-          context: ${{ env.STATUS_NAME }}
-          state: pending
-          description: 'Test has been running...'
-          target_url: 'https://github.com/${{ github.repository }}/actions/runs/${{ github.run_id }}'
-        env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-
-      - name: Clone repository
-        uses: actions/checkout@v3
-        with:
-          ref: ${{ needs.pr-info.outputs.sha }}
-          fetch-depth: 0
-
-      - name: run ostree-9-to-9.sh
-        run: ./ostree-9-to-9.sh
-        env:
-          DOWNLOAD_NODE: ${{ secrets.DOWNLOAD_NODE }}
-        timeout-minutes: 90
-
-      - name: Set non cancelled result status
-        if: ${{ !cancelled() }}
-        uses: octokit/request-action@v2.x
-        with:
-          route: 'POST /repos/${{ github.repository }}/statuses/${{ needs.pr-info.outputs.sha }}'
-          context: ${{ env.STATUS_NAME }}
-          state: ${{ job.status }}
-          target_url: 'https://github.com/${{ github.repository }}/actions/runs/${{ github.run_id }}'
-        env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-
-      - name: Set cancelled result status
-        if: ${{ cancelled() }}
-        uses: octokit/request-action@v2.x
-        with:
-          route: 'POST /repos/${{ github.repository }}/statuses/${{ needs.pr-info.outputs.sha }}'
-          context: ${{ env.STATUS_NAME }}
-          state: error
-          target_url: 'https://github.com/${{ github.repository }}/actions/runs/${{ github.run_id }}'
-        env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-
-      - uses: actions/upload-artifact@v3
-        if: ${{ always() }}
-        with:
-          name: edge-9to9-9.2
-          path: |
-            *.json
-            *.log
-
-  pre-edge-ignition-92:
-    needs: pr-info
-    if: ${{ needs.pr-info.outputs.allowed_user == 'true' && github.event.issue.pull_request &&
-            (endsWith(github.event.comment.body, '/test-rhel-9-2') ||
-            endsWith(github.event.comment.body, '/test-rhel-9-2-ignition')) }}
-    runs-on: ubuntu-latest
-    env:
-      STATUS_NAME: edge-ignition-9.2
-
-    steps:
-      - name: Create in-progress status
-        uses: octokit/request-action@v2.x
-        with:
-          route: 'POST /repos/${{ github.repository }}/statuses/${{ needs.pr-info.outputs.sha }}'
-          context: ${{ env.STATUS_NAME }}
-          state: pending
-          description: 'Runner has been deploying...'
-          target_url: 'https://github.com/${{ github.repository }}/actions/runs/${{ github.run_id }}'
-        env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-
-  edge-ignition-92:
-    needs: [pr-info, pre-edge-ignition-92]
-    runs-on: [kite, x86_64, rhos-01, rhel-9-2, large]
-    env:
-      STATUS_NAME: edge-ignition-9.2
-
-    steps:
-      - name: Create in-progress status
-        uses: octokit/request-action@v2.x
-        with:
-          route: 'POST /repos/${{ github.repository }}/statuses/${{ needs.pr-info.outputs.sha }}'
-          context: ${{ env.STATUS_NAME }}
-          state: pending
-          description: 'Test has been running...'
-          target_url: 'https://github.com/${{ github.repository }}/actions/runs/${{ github.run_id }}'
-        env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-
-      - name: Clone repository
-        uses: actions/checkout@v3
-        with:
-          ref: ${{ needs.pr-info.outputs.sha }}
-          fetch-depth: 0
-
-      - name: run ostree-ignition.sh
-        run: ./ostree-ignition.sh
-        env:
-          DOWNLOAD_NODE: ${{ secrets.DOWNLOAD_NODE }}
-        timeout-minutes: 120
-
-      - name: Set non cancelled result status
-        if: ${{ !cancelled() }}
-        uses: octokit/request-action@v2.x
-        with:
-          route: 'POST /repos/${{ github.repository }}/statuses/${{ needs.pr-info.outputs.sha }}'
-          context: ${{ env.STATUS_NAME }}
-          state: ${{ job.status }}
-          target_url: 'https://github.com/${{ github.repository }}/actions/runs/${{ github.run_id }}'
-        env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-
-      - name: Set cancelled result status
-        if: ${{ cancelled() }}
-        uses: octokit/request-action@v2.x
-        with:
-          route: 'POST /repos/${{ github.repository }}/statuses/${{ needs.pr-info.outputs.sha }}'
-          context: ${{ env.STATUS_NAME }}
-          state: error
-          target_url: 'https://github.com/${{ github.repository }}/actions/runs/${{ github.run_id }}'
-        env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-
-      - uses: actions/upload-artifact@v3
-        if: ${{ always() }}
-        with:
-          name: edge-ignition-9.2
-          path: |
-            *.json
-            *.log
-
-  pre-edge-fdo-aio-92:
-    needs: pr-info
-    if: ${{ needs.pr-info.outputs.allowed_user == 'true' && github.event.issue.pull_request &&
-            (endsWith(github.event.comment.body, '/test-rhel-9-2') ||
-            endsWith(github.event.comment.body, '/test-rhel-9-2-fdo-aio')) }}
-    runs-on: ubuntu-latest
-    env:
-      STATUS_NAME: edge-fdo-aio-9.2
-
-    steps:
-      - name: Create in-progress status
-        uses: octokit/request-action@v2.x
-        with:
-          route: 'POST /repos/${{ github.repository }}/statuses/${{ needs.pr-info.outputs.sha }}'
-          context: ${{ env.STATUS_NAME }}
-          state: pending
-          description: 'Runner has been deploying...'
-          target_url: 'https://github.com/${{ github.repository }}/actions/runs/${{ github.run_id }}'
-        env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-
-  edge-fdo-aio-92:
-    needs: [pr-info, pre-edge-fdo-aio-92]
-    runs-on: [kite, x86_64, rhos-01, rhel-9-2, large]
-    env:
-      STATUS_NAME: edge-fdo-aio-9.2
-
-    steps:
-      - name: Create in-progress status
-        uses: octokit/request-action@v2.x
-        with:
-          route: 'POST /repos/${{ github.repository }}/statuses/${{ needs.pr-info.outputs.sha }}'
-          context: ${{ env.STATUS_NAME }}
-          state: pending
-          description: 'Test has been running...'
-          target_url: 'https://github.com/${{ github.repository }}/actions/runs/${{ github.run_id }}'
-        env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-
-      - name: Clone repository
-        uses: actions/checkout@v3
-        with:
-          ref: ${{ needs.pr-info.outputs.sha }}
-          fetch-depth: 0
-
-      - name: run ostree-fdo-aio.sh
-        run: ./ostree-fdo-aio.sh
-        env:
-          DOWNLOAD_NODE: ${{ secrets.DOWNLOAD_NODE }}
-        timeout-minutes: 150
-
-      - name: Set non cancelled result status
-        if: ${{ !cancelled() }}
-        uses: octokit/request-action@v2.x
-        with:
-          route: 'POST /repos/${{ github.repository }}/statuses/${{ needs.pr-info.outputs.sha }}'
-          context: ${{ env.STATUS_NAME }}
-          state: ${{ job.status }}
-          target_url: 'https://github.com/${{ github.repository }}/actions/runs/${{ github.run_id }}'
-        env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-
-      - name: Set cancelled result status
-        if: ${{ cancelled() }}
-        uses: octokit/request-action@v2.x
-        with:
-          route: 'POST /repos/${{ github.repository }}/statuses/${{ needs.pr-info.outputs.sha }}'
-          context: ${{ env.STATUS_NAME }}
-          state: error
-          target_url: 'https://github.com/${{ github.repository }}/actions/runs/${{ github.run_id }}'
-        env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-
-      - uses: actions/upload-artifact@v3
-        if: ${{ always() }}
-        with:
-          name: edge-fdo-aio-9.2
-          path: |
-            *.json
-            *.log
diff --git a/.github/workflows/trigger-8.yml b/.github/workflows/trigger-8.yml
index 9309933bc..1626d89de 100644
--- a/.github/workflows/trigger-8.yml
+++ b/.github/workflows/trigger-8.yml
@@ -10,9 +10,7 @@ on:
     - cron: '0 19 * * *'
 
 env:
-  COMPOSE_URL_86: "http://${{ secrets.DOWNLOAD_NODE }}/rhel-8/nightly/updates/RHEL-8"
   COMPOSE_URL_88: "http://${{ secrets.DOWNLOAD_NODE }}/rhel-8/nightly/updates/RHEL-8"
-  COMPOSE_URL_89: "http://${{ secrets.DOWNLOAD_NODE }}/rhel-8/nightly/updates/RHEL-8"
   COMPOSE_URL_810: "http://${{ secrets.DOWNLOAD_NODE }}/rhel-8/nightly/RHEL-8"
 
 jobs:
@@ -26,47 +24,6 @@ jobs:
 
       - run: sudo dnf install -y gh
 
-      - name: Check RHEL 8.6 compose
-        id: check_compose_id_86
-        run: |
-          curl -s ${COMPOSE_URL_86}/latest-RHEL-8.6.0/STATUS --output STATUS_86
-          STATUS_86=$(cat STATUS_86)
-          if [[ "$STATUS_86" == "FINISHED" ]]; then
-              curl -s ${COMPOSE_URL_86}/latest-RHEL-8.6.0/COMPOSE_ID --output COMPOSE_ID_86
-              COMPOSE_ID_86=$(cat COMPOSE_ID_86)
-              TESTED_COMPOSE_86=( $( cat compose/compose.86 ) )
-              if [[ " ${TESTED_COMPOSE_86[*]} " =~ "$COMPOSE_ID_86" ]]; then
-                  COMPOSE_ID_86="false"
-              fi
-          else
-              COMPOSE_ID_86="false"
-          fi
-
-          if [[ "$COMPOSE_ID_86" != "false" ]]; then
-              gh pr list -R virt-s1/rhel-edge --state open --json title --jq '.[].title' > PR_LIST_86
-              PR_LIST_86=$(cat PR_LIST_86)
-              if [[ $PR_LIST_86 == *"$COMPOSE_ID_86"* ]]; then
-                  echo "pr_running_86=true" >> $GITHUB_OUTPUT
-              else
-                  echo "pr_running_86=false" >> $GITHUB_OUTPUT
-              fi
-
-              OSBUILD_VERSION_86=$(curl -s "${COMPOSE_URL_86}/${COMPOSE_ID_86}/compose/AppStream/x86_64/os/Packages/" | grep -ioE ">osbuild-[0-9].*<" | tr -d "><")
-              OSBUILD_COMPOSER_VERSION_86=$(curl -s "${COMPOSE_URL_86}/${COMPOSE_ID_86}/compose/AppStream/x86_64/os/Packages/" | grep -ioE ">osbuild-composer-[0-9].*<" | tr -d "><")
-              COMPOSER_CLI_VERSION_86=$(curl -s "${COMPOSE_URL_86}/${COMPOSE_ID_86}/compose/AppStream/x86_64/os/Packages/" | grep -ioE ">weldr-client-[0-9].*<" | tr -d "><")
-              echo "osbuild_version_86=$OSBUILD_VERSION_86" >> $GITHUB_OUTPUT
-              echo "osbuild_composer_version_86=$OSBUILD_COMPOSER_VERSION_86" >> $GITHUB_OUTPUT
-              echo "composer_cli_version_86=$COMPOSER_CLI_VERSION_86" >> $GITHUB_OUTPUT
-          else
-              echo "osbuild_version_86=Null" >> $GITHUB_OUTPUT
-              echo "osbuild_composer_version_86=Null" >> $GITHUB_OUTPUT
-              echo "composer_cli_version_86=Null" >> $GITHUB_OUTPUT
-          fi
-
-          echo "rhel86_compose=$COMPOSE_ID_86" >> $GITHUB_OUTPUT
-        env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-
       - name: Check RHEL 8.8 compose
         id: check_compose_id_88
         run: |
@@ -108,47 +65,6 @@ jobs:
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
 
-      - name: Check RHEL 8.9 compose
-        id: check_compose_id_89
-        run: |
-          curl -s ${COMPOSE_URL_89}/latest-RHEL-8.9.0/STATUS --output STATUS_89
-          STATUS_89=$(cat STATUS_89)
-          if [[ "$STATUS_89" == "FINISHED" ]]; then
-              curl -s ${COMPOSE_URL_89}/latest-RHEL-8.9.0/COMPOSE_ID --output COMPOSE_ID_89
-              COMPOSE_ID_89=$(cat COMPOSE_ID_89)
-              TESTED_COMPOSE_89=( $( cat compose/compose.89 ) )
-              if [[ " ${TESTED_COMPOSE_89[*]} " =~ "$COMPOSE_ID_89" ]]; then
-                  COMPOSE_ID_89="false"
-              fi
-          else
-              COMPOSE_ID_89="false"
-          fi
-
-          if [[ "$COMPOSE_ID_89" != "false" ]]; then
-              gh pr list -R virt-s1/rhel-edge --state open --json title --jq '.[].title' > PR_LIST_89
-              PR_LIST_89=$(cat PR_LIST_89)
-              if [[ $PR_LIST_89 == *"$COMPOSE_ID_89"* ]]; then
-                  echo "pr_running_89=true" >> $GITHUB_OUTPUT
-              else
-                  echo "pr_running_89=false" >> $GITHUB_OUTPUT
-              fi
-
-              OSBUILD_VERSION_89=$(curl -s "${COMPOSE_URL_89}/${COMPOSE_ID_89}/compose/AppStream/x86_64/os/Packages/" | grep -ioE ">osbuild-[0-9].*<" | tr -d "><")
-              OSBUILD_COMPOSER_VERSION_89=$(curl -s "${COMPOSE_URL_89}/${COMPOSE_ID_89}/compose/AppStream/x86_64/os/Packages/" | grep -ioE ">osbuild-composer-[0-9].*<" | tr -d "><")
-              COMPOSER_CLI_VERSION_89=$(curl -s "${COMPOSE_URL_89}/${COMPOSE_ID_89}/compose/AppStream/x86_64/os/Packages/" | grep -ioE ">weldr-client-[0-9].*<" | tr -d "><")
-              echo "osbuild_version_89=$OSBUILD_VERSION_89" >> $GITHUB_OUTPUT
-              echo "osbuild_composer_version_89=$OSBUILD_COMPOSER_VERSION_89" >> $GITHUB_OUTPUT
-              echo "composer_cli_version_89=$COMPOSER_CLI_VERSION_89" >> $GITHUB_OUTPUT
-          else
-              echo "osbuild_version_89=Null" >> $GITHUB_OUTPUT
-              echo "osbuild_composer_version_89=Null" >> $GITHUB_OUTPUT
-              echo "composer_cli_version_89=Null" >> $GITHUB_OUTPUT
-          fi
-
-          echo "rhel89_compose=$COMPOSE_ID_89" >> $GITHUB_OUTPUT
-        env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-
       - name: Check RHEL 8.10 compose
         id: check_compose_id_810
         run: |
@@ -191,88 +107,17 @@ jobs:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
 
     outputs:
-      rhel86_compose: ${{ steps.check_compose_id_86.outputs.rhel86_compose }}
       rhel88_compose: ${{ steps.check_compose_id_88.outputs.rhel88_compose }}
-      rhel89_compose: ${{ steps.check_compose_id_89.outputs.rhel89_compose }}
       rhel810_compose: ${{ steps.check_compose_id_810.outputs.rhel810_compose }}
-      osbuild_version_86: ${{ steps.check_compose_id_86.outputs.osbuild_version_86 }}
-      osbuild_composer_version_86: ${{ steps.check_compose_id_86.outputs.osbuild_composer_version_86 }}
-      composer_cli_version_86: ${{ steps.check_compose_id_86.outputs.composer_cli_version_86 }}
       osbuild_version_88: ${{ steps.check_compose_id_88.outputs.osbuild_version_88 }}
       osbuild_composer_version_88: ${{ steps.check_compose_id_88.outputs.osbuild_composer_version_88 }}
       composer_cli_version_88: ${{ steps.check_compose_id_88.outputs.composer_cli_version_88 }}
-      osbuild_version_89: ${{ steps.check_compose_id_89.outputs.osbuild_version_89 }}
-      osbuild_composer_version_89: ${{ steps.check_compose_id_89.outputs.osbuild_composer_version_89 }}
-      composer_cli_version_89: ${{ steps.check_compose_id_89.outputs.composer_cli_version_89 }}
       osbuild_version_810: ${{ steps.check_compose_id_810.outputs.osbuild_version_810 }}
       osbuild_composer_version_810: ${{ steps.check_compose_id_810.outputs.osbuild_composer_version_810 }}
       composer_cli_version_810: ${{ steps.check_compose_id_810.outputs.composer_cli_version_810 }}
-      pr_running_86: ${{ steps.check_compose_id_86.outputs.pr_running_86 }}
       pr_running_88: ${{ steps.check_compose_id_88.outputs.pr_running_88 }}
-      pr_running_89: ${{ steps.check_compose_id_89.outputs.pr_running_89 }}
       pr_running_810: ${{ steps.check_compose_id_810.outputs.pr_running_810 }}
 
-  rhel-8-6:
-    needs: check-compose
-    if: ${{ needs.check-compose.outputs.rhel86_compose != 'false' && needs.check-compose.outputs.pr_running_86 == 'false' }}
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@v3
-
-      - name: Add new compose id in compose.86
-        run: |
-          compose_id="${{ needs.check-compose.outputs.rhel86_compose }}"
-          echo $compose_id >> compose/compose.86
-          cat compose/compose.86
-
-      - name: Get current date
-        id: date
-        run: echo "date=$(date +'%Y-%m-%d')" >> $GITHUB_OUTPUT
-
-      - name: Create Pull Request
-        id: cpr
-        uses: peter-evans/create-pull-request@v4
-        with:
-          token: ${{ secrets.GITHUB_TOKEN }}
-          commit-message: "${{ needs.check-compose.outputs.rhel86_compose }} - ${{ steps.date.outputs.date }}"
-          committer: cloudkitebot <henrywangxf1@gmail.com>
-          author: ${{ github.actor }} <${{ github.actor }}@users.noreply.github.com>
-          branch: cpr
-          branch-suffix: random
-          delete-branch: true
-          title: "${{ needs.check-compose.outputs.rhel86_compose }} - ${{ steps.date.outputs.date }}"
-          labels: auto-merge,RHEL-8.6.0
-          body: |
-            RHEL 8.6 compose ${{ needs.check-compose.outputs.rhel86_compose }}
-            - Date: ${{ steps.date.outputs.date }}
-            - Packages:
-                - ${{ needs.check-compose.outputs.osbuild_version_86 }}
-                - ${{ needs.check-compose.outputs.osbuild_composer_version_86 }}
-                - ${{ needs.check-compose.outputs.composer_cli_version_86 }}
-
-      - name: Enable Pull Request Automerge
-        if: steps.cpr.outputs.pull-request-operation == 'created'
-        uses: peter-evans/enable-pull-request-automerge@v2
-        with:
-          token: ${{ secrets.GITHUB_TOKEN }}
-          pull-request-number: ${{ steps.cpr.outputs.pull-request-number }}
-          merge-method: rebase
-
-      - name: Add a comment to trigger test workflow
-        uses: peter-evans/create-or-update-comment@v2
-        with:
-          token: ${{ secrets.PAT }}
-          issue-number: ${{ steps.cpr.outputs.pull-request-number }}
-          body: /test-rhel-8-6
-
-      - name: Create a project card to track compose test result
-        uses: peter-evans/create-or-update-project-card@v2
-        with:
-          token: ${{ secrets.GITHUB_TOKEN }}
-          project-name: RHEL Compose Test
-          column-name: RHEL-8-6
-          issue-number: ${{ steps.cpr.outputs.pull-request-number }}
-
   rhel-8-8:
     needs: check-compose
     if: ${{ needs.check-compose.outputs.rhel88_compose != 'false' && needs.check-compose.outputs.pr_running_88 == 'false' }}
@@ -334,67 +179,6 @@ jobs:
           column-name: RHEL-8-8
           issue-number: ${{ steps.cpr.outputs.pull-request-number }}
 
-  rhel-8-9:
-    needs: check-compose
-    if: ${{ needs.check-compose.outputs.rhel89_compose != 'false' && needs.check-compose.outputs.pr_running_89 == 'false' }}
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@v3
-
-      - name: Add new compose id in compose.89
-        run: |
-          compose_id="${{ needs.check-compose.outputs.rhel89_compose }}"
-          echo $compose_id >> compose/compose.89
-          cat compose/compose.89
-
-      - name: Get current date
-        id: date
-        run: echo "date=$(date +'%Y-%m-%d')" >> $GITHUB_OUTPUT
-
-      - name: Create Pull Request
-        id: cpr
-        uses: peter-evans/create-pull-request@v4
-        with:
-          token: ${{ secrets.GITHUB_TOKEN }}
-          commit-message: "${{ needs.check-compose.outputs.rhel89_compose }} - ${{ steps.date.outputs.date }}"
-          committer: cloudkitebot <henrywangxf1@gmail.com>
-          author: ${{ github.actor }} <${{ github.actor }}@users.noreply.github.com>
-          branch: cpr
-          branch-suffix: random
-          delete-branch: true
-          title: "${{ needs.check-compose.outputs.rhel89_compose }} - ${{ steps.date.outputs.date }}"
-          labels: auto-merge,RHEL-8.9.0
-          body: |
-            RHEL 8.9 compose ${{ needs.check-compose.outputs.rhel89_compose }}
-            - Date: ${{ steps.date.outputs.date }}
-            - Packages:
-                - ${{ needs.check-compose.outputs.osbuild_version_89 }}
-                - ${{ needs.check-compose.outputs.osbuild_composer_version_89 }}
-                - ${{ needs.check-compose.outputs.composer_cli_version_89 }}
-
-      - name: Enable Pull Request Automerge
-        if: steps.cpr.outputs.pull-request-operation == 'created'
-        uses: peter-evans/enable-pull-request-automerge@v2
-        with:
-          token: ${{ secrets.GITHUB_TOKEN }}
-          pull-request-number: ${{ steps.cpr.outputs.pull-request-number }}
-          merge-method: rebase
-
-      - name: Add a comment to trigger test workflow
-        uses: peter-evans/create-or-update-comment@v1
-        with:
-          token: ${{ secrets.PAT }}
-          issue-number: ${{ steps.cpr.outputs.pull-request-number }}
-          body: /test-rhel-8-9
-
-      - name: Create a project card to track compose test result
-        uses: peter-evans/create-or-update-project-card@v2
-        with:
-          token: ${{ secrets.GITHUB_TOKEN }}
-          project-name: RHEL Compose Test
-          column-name: RHEL-8-9
-          issue-number: ${{ steps.cpr.outputs.pull-request-number }}
-
   rhel-8-10:
     needs: check-compose
     if: ${{ needs.check-compose.outputs.rhel810_compose != 'false' && needs.check-compose.outputs.pr_running_810 == 'false' }}
diff --git a/.github/workflows/trigger-9.yml b/.github/workflows/trigger-9.yml
index 5199a2a98..7c22ef615 100644
--- a/.github/workflows/trigger-9.yml
+++ b/.github/workflows/trigger-9.yml
@@ -10,7 +10,6 @@ on:
     - cron: '0 20 * * *'
 
 env:
-  COMPOSE_URL_92: "http://${{ secrets.DOWNLOAD_NODE }}/rhel-9/nightly/updates/RHEL-9"
   COMPOSE_URL_93: "http://${{ secrets.DOWNLOAD_NODE }}/rhel-9/nightly/updates/RHEL-9"
   COMPOSE_URL_94: "http://${{ secrets.DOWNLOAD_NODE }}/rhel-9/nightly/updates/RHEL-9"
   COMPOSE_URL_95: "http://${{ secrets.DOWNLOAD_NODE }}/rhel-9/nightly/RHEL-9"
@@ -26,47 +25,6 @@ jobs:
 
       - run: sudo dnf install -y gh
 
-      - name: Check RHEL 9.2 compose
-        id: check_compose_id_92
-        run: |
-          curl -s ${COMPOSE_URL_92}/latest-RHEL-9.2.0/STATUS --output STATUS_92
-          STATUS_92=$(cat STATUS_92)
-          if [[ "$STATUS_92" == "FINISHED" ]]; then
-              curl -s ${COMPOSE_URL_92}/latest-RHEL-9.2.0/COMPOSE_ID --output COMPOSE_ID_92
-              COMPOSE_ID_92=$(cat COMPOSE_ID_92)
-              TESTED_COMPOSE_92=( $( cat compose/compose.92 ) )
-              if [[ " ${TESTED_COMPOSE_92[*]} " =~ "$COMPOSE_ID_92" ]]; then
-                  COMPOSE_ID_92="false"
-              fi
-          else
-              COMPOSE_ID_92="false"
-          fi
-
-          if [[ "$COMPOSE_ID_92" != "false" ]]; then
-              gh pr list -R virt-s1/rhel-edge --state open --json title --jq '.[].title' > PR_LIST_92
-              PR_LIST_92=$(cat PR_LIST_92)
-              if [[ $PR_LIST_92 == *"$COMPOSE_ID_92"* ]]; then
-                  echo "pr_running_92=true" >> $GITHUB_OUTPUT
-              else
-                  echo "pr_running_92=false" >> $GITHUB_OUTPUT
-              fi
-
-              OSBUILD_VERSION_92=$(curl -s "${COMPOSE_URL_92}/${COMPOSE_ID_92}/compose/AppStream/x86_64/os/Packages/" | grep -ioE ">osbuild-[0-9].*<" | tr -d "><")
-              OSBUILD_COMPOSER_VERSION_92=$(curl -s "${COMPOSE_URL_92}/${COMPOSE_ID_92}/compose/AppStream/x86_64/os/Packages/" | grep -ioE ">osbuild-composer-[0-9].*<" | tr -d "><")
-              COMPOSER_CLI_VERSION_92=$(curl -s "${COMPOSE_URL_92}/${COMPOSE_ID_92}/compose/AppStream/x86_64/os/Packages/" | grep -ioE ">weldr-client-[0-9].*<" | tr -d "><")
-              echo "osbuild_version_92=$OSBUILD_VERSION_92" >> $GITHUB_OUTPUT
-              echo "osbuild_composer_version_92=$OSBUILD_COMPOSER_VERSION_92" >> $GITHUB_OUTPUT
-              echo "composer_cli_version_92=$COMPOSER_CLI_VERSION_92" >> $GITHUB_OUTPUT
-          else
-              echo "osbuild_version_92=Null" >> $GITHUB_OUTPUT
-              echo "osbuild_composer_version_92=Null" >> $GITHUB_OUTPUT
-              echo "composer_cli_version_92=Null" >> $GITHUB_OUTPUT
-          fi
-
-          echo "rhel92_compose=$COMPOSE_ID_92" >> $GITHUB_OUTPUT
-        env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-
       - name: Check RHEL 9.3 compose
         id: check_compose_id_93
         run: |
@@ -191,13 +149,9 @@ jobs:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
 
     outputs:
-      rhel92_compose: ${{ steps.check_compose_id_92.outputs.rhel92_compose }}
       rhel93_compose: ${{ steps.check_compose_id_93.outputs.rhel93_compose }}
       rhel94_compose: ${{ steps.check_compose_id_94.outputs.rhel94_compose }}
       rhel95_compose: ${{ steps.check_compose_id_95.outputs.rhel95_compose }}
-      osbuild_version_92: ${{ steps.check_compose_id_92.outputs.osbuild_version_92 }}
-      osbuild_composer_version_92: ${{ steps.check_compose_id_92.outputs.osbuild_composer_version_92 }}
-      composer_cli_version_92: ${{ steps.check_compose_id_92.outputs.composer_cli_version_92 }}
       osbuild_version_93: ${{ steps.check_compose_id_93.outputs.osbuild_version_93 }}
       osbuild_composer_version_93: ${{ steps.check_compose_id_93.outputs.osbuild_composer_version_93 }}
       composer_cli_version_93: ${{ steps.check_compose_id_93.outputs.composer_cli_version_93 }}
@@ -207,72 +161,10 @@ jobs:
       osbuild_version_95: ${{ steps.check_compose_id_95.outputs.osbuild_version_95 }}
       osbuild_composer_version_95: ${{ steps.check_compose_id_95.outputs.osbuild_composer_version_95 }}
       composer_cli_version_95: ${{ steps.check_compose_id_95.outputs.composer_cli_version_95 }}
-      pr_running_92: ${{ steps.check_compose_id_92.outputs.pr_running_92 }}
       pr_running_93: ${{ steps.check_compose_id_93.outputs.pr_running_93 }}
       pr_running_94: ${{ steps.check_compose_id_94.outputs.pr_running_94 }}
       pr_running_95: ${{ steps.check_compose_id_95.outputs.pr_running_95 }}
 
-  rhel-9-2:
-    needs: check-compose
-    if: ${{ needs.check-compose.outputs.rhel92_compose != 'false' && needs.check-compose.outputs.pr_running_92 == 'false' }}
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@v3
-
-      - name: Add new compose id in compose.92
-        run: |
-          compose_id="${{ needs.check-compose.outputs.rhel92_compose }}"
-          echo $compose_id >> compose/compose.92
-          cat compose/compose.92
-
-      - name: Get current date
-        id: date
-        run: echo "date=$(date +'%Y-%m-%d')" >> $GITHUB_OUTPUT
-
-      - name: Create Pull Request
-        id: cpr
-        uses: peter-evans/create-pull-request@v4
-        with:
-          token: ${{ secrets.GITHUB_TOKEN }}
-          commit-message: "${{ needs.check-compose.outputs.rhel92_compose }} - ${{ steps.date.outputs.date }}"
-          committer: cloudkitebot <henrywangxf1@gmail.com>
-          author: ${{ github.actor }} <${{ github.actor }}@users.noreply.github.com>
-          branch: cpr
-          branch-suffix: random
-          delete-branch: true
-          title: "${{ needs.check-compose.outputs.rhel92_compose }} - ${{ steps.date.outputs.date }}"
-          labels: auto-merge,RHEL-9.2.0
-          body: |
-            RHEL 9.2 compose ${{ needs.check-compose.outputs.rhel92_compose }}
-            - Date: ${{ steps.date.outputs.date }}
-            - Packages:
-                - ${{ needs.check-compose.outputs.osbuild_version_92 }}
-                - ${{ needs.check-compose.outputs.osbuild_composer_version_92 }}
-                - ${{ needs.check-compose.outputs.composer_cli_version_92 }}
-
-      - name: Enable Pull Request Automerge
-        if: steps.cpr.outputs.pull-request-operation == 'created'
-        uses: peter-evans/enable-pull-request-automerge@v2
-        with:
-          token: ${{ secrets.GITHUB_TOKEN }}
-          pull-request-number: ${{ steps.cpr.outputs.pull-request-number }}
-          merge-method: rebase
-
-      - name: Add a comment to trigger test workflow
-        uses: peter-evans/create-or-update-comment@v1
-        with:
-          token: ${{ secrets.PAT }}
-          issue-number: ${{ steps.cpr.outputs.pull-request-number }}
-          body: /test-rhel-9-2
-
-      - name: Create a project card to track compose test result
-        uses: peter-evans/create-or-update-project-card@v2
-        with:
-          token: ${{ secrets.GITHUB_TOKEN }}
-          project-name: RHEL Compose Test
-          column-name: RHEL-9-2
-          issue-number: ${{ steps.cpr.outputs.pull-request-number }}
-
   rhel-9-3:
     needs: check-compose
     if: ${{ needs.check-compose.outputs.rhel93_compose != 'false' && needs.check-compose.outputs.pr_running_93 == 'false' }}
diff --git a/.github/workflows/trigger-cs.yml b/.github/workflows/trigger-cs.yml
index 4e7c844db..fa8e4c525 100644
--- a/.github/workflows/trigger-cs.yml
+++ b/.github/workflows/trigger-cs.yml
@@ -8,7 +8,6 @@ on:
     - cron: '0 15 * * *'
 
 env:
-  COMPOSE_URL_CS8: https://odcs.stream.centos.org/stream-8/production
   COMPOSE_URL_CS9: https://composes.stream.centos.org/production
 
 jobs:
diff --git a/minimal-raw.sh b/minimal-raw.sh
index 563c87580..2babd4c69 100755
--- a/minimal-raw.sh
+++ b/minimal-raw.sh
@@ -48,20 +48,12 @@ case "${ID}-${VERSION_ID}" in
         MINIMAL_RAW_DECOMPRESSED=disk.raw
         MINIMAL_RAW_FILENAME=disk.raw.xz
         ;;
-    "centos-8")
-        OS_VARIANT="centos-stream8"
-        ;;
     "centos-9")
         OS_VARIANT="centos-stream9"
         MINIMAL_RAW_DECOMPRESSED=disk.raw
         MINIMAL_RAW_FILENAME=disk.raw.xz
         BOOT_ARGS="uefi,firmware.feature0.name=secure-boot,firmware.feature0.enabled=no"
         ;;
-    "fedora-38")
-        OS_VARIANT="fedora-unknown"
-        MINIMAL_RAW_DECOMPRESSED=disk.raw
-        MINIMAL_RAW_FILENAME=disk.raw.xz
-        ;;
     "fedora-39")
         OS_VARIANT="fedora-unknown"
         MINIMAL_RAW_DECOMPRESSED=disk.raw
diff --git a/ostree-8-to-9.sh b/ostree-8-to-9.sh
index a4ef0f8b0..23c43433f 100755
--- a/ostree-8-to-9.sh
+++ b/ostree-8-to-9.sh
@@ -41,21 +41,6 @@ BOOT_ARGS="uefi"
 SYSROOT_RO="false"
 
 case "${ID}-${VERSION_ID}" in
-    "rhel-9.0")
-        OSTREE_REF="rhel/9/${ARCH}/edge"
-        PARENT_REF="rhel/8/${ARCH}/edge"
-        OS_VARIANT="rhel8-unknown"
-        DISTRO="rhel-86"
-        BOOT_LOCATION="http://${DOWNLOAD_NODE}/rhel-8/rel-eng/updates/RHEL-8/latest-RHEL-8.6.0/compose/BaseOS/x86_64/os/"
-        ;;
-    "rhel-9.2")
-        OSTREE_REF="rhel/9/${ARCH}/edge"
-        PARENT_REF="rhel/8/${ARCH}/edge"
-        OS_VARIANT="rhel8-unknown"
-        DISTRO="rhel-88"
-        BOOT_LOCATION="http://${DOWNLOAD_NODE}/rhel-8/nightly/updates/RHEL-8/latest-RHEL-8.8.0/compose/BaseOS/x86_64/os/"
-        SYSROOT_RO="true"
-        ;;
     "rhel-9.3")
         OSTREE_REF="rhel/9/${ARCH}/edge"
         PARENT_REF="rhel/8/${ARCH}/edge"
diff --git a/ostree-9-to-9.sh b/ostree-9-to-9.sh
index 0032f9c1d..6df589b5a 100755
--- a/ostree-9-to-9.sh
+++ b/ostree-9-to-9.sh
@@ -38,15 +38,6 @@ CONTAINER_FILENAME=container.tar
 SYSROOT_RO="false"
 
 case "${ID}-${VERSION_ID}" in
-    "rhel-9.2")
-        OS_VARIANT="rhel9-unknown"
-        PARENT_REF="rhel/9/${ARCH}/edge"
-        OSTREE_REF="rhel/9/${ARCH}/edge"
-        OSTREE_REBASE_REF="rhel/92/${ARCH}/edge"
-        DISTRO="rhel-91"
-        BOOT_LOCATION="http://${DOWNLOAD_NODE}/rhel-9/rel-eng/updates/RHEL-9/latest-RHEL-9.1.0/compose/BaseOS/x86_64/os/"
-        SYSROOT_RO="true"
-        ;;
     "rhel-9.3")
         OS_VARIANT="rhel9-unknown"
         PARENT_REF="rhel/9/${ARCH}/edge"
diff --git a/ostree-adds-on.sh b/ostree-adds-on.sh
index b4b19d124..b629271ad 100755
--- a/ostree-adds-on.sh
+++ b/ostree-adds-on.sh
@@ -35,12 +35,6 @@ CONTAINER_IMAGE_TYPE=edge-container
 CONTAINER_FILENAME=container.tar
 
 case "${ID}-${VERSION_ID}" in
-    "rhel-9.2")
-        PARENT_REF="rhel/9/${ARCH}/edge"
-        OSTREE_REF="rhel/9/${ARCH}/edge"
-        OSTREE_REBASE_REF="rhel/9x/${ARCH}/edge"
-        BOOT_LOCATION="http://${DOWNLOAD_NODE}/rhel-9/nightly/updates/RHEL-9/latest-RHEL-9.2.0/compose/BaseOS/x86_64/os/"
-        ;;
     "rhel-9.3")
         PARENT_REF="rhel/9/${ARCH}/edge"
         OSTREE_REF="rhel/9/${ARCH}/edge"
diff --git a/ostree-fdo-aio.sh b/ostree-fdo-aio.sh
index 08cfd0a8d..8d2ac7a42 100755
--- a/ostree-fdo-aio.sh
+++ b/ostree-fdo-aio.sh
@@ -73,13 +73,6 @@ sudo mkdir -p /etc/osbuild-composer/repositories
 # The RO setting on RHEL 8.8 and CS8 is not configured by ostree, but osbuild-composer
 # by PR https://github.com/osbuild/osbuild-composer/pull/3178
 case "${ID}-${VERSION_ID}" in
-    "rhel-8.6")
-        OSTREE_REF="rhel/8/${ARCH}/edge"
-        PARENT_REF="rhel/8/${ARCH}/edge"
-        OS_VARIANT="rhel8-unknown"
-        IMAGE_NAME="disk.img.xz"
-        sudo mkdir -p /var/lib/fdo
-        ;;
     "rhel-8.8")
         OSTREE_REF="rhel/8/${ARCH}/edge"
         PARENT_REF="rhel/8/${ARCH}/edge"
@@ -89,15 +82,6 @@ case "${ID}-${VERSION_ID}" in
         BLUEPRINT_USER="simple"
         sudo mkdir -p /var/lib/fdo
         ;;
-    "rhel-8.9")
-        OSTREE_REF="rhel/8/${ARCH}/edge"
-        PARENT_REF="rhel/8/${ARCH}/edge"
-        OS_VARIANT="rhel8-unknown"
-        IMAGE_NAME="image.raw.xz"
-        USER_IN_BLUEPRINT="true"
-        BLUEPRINT_USER="simple"
-        sudo mkdir -p /var/lib/fdo
-        ;;
     "rhel-8.10")
         OSTREE_REF="rhel/8/${ARCH}/edge"
         PARENT_REF="rhel/8/${ARCH}/edge"
@@ -107,25 +91,6 @@ case "${ID}-${VERSION_ID}" in
         BLUEPRINT_USER="simple"
         sudo mkdir -p /var/lib/fdo
         ;;
-    "rhel-9.0")
-        OSTREE_REF="rhel/9/${ARCH}/edge"
-        PARENT_REF="rhel/9/${ARCH}/edge"
-        OS_VARIANT="rhel9.0"
-        IMAGE_NAME="disk.img.xz"
-        sudo mkdir -p /var/lib/fdo
-        ;;
-    "rhel-9.2")
-        OSTREE_REF="rhel/9/${ARCH}/edge"
-        PARENT_REF="rhel/9/${ARCH}/edge"
-        OS_VARIANT="rhel9-unknown"
-        IMAGE_NAME="image.raw.xz"
-        SYSROOT_RO="true"
-        ANSIBLE_USER=fdouser
-        FDO_USER_ONBOARDING="true"
-        USER_IN_BLUEPRINT="true"
-        BLUEPRINT_USER="simple"
-        sudo mkdir -p /var/lib/fdo
-        ;;
     "rhel-9.3")
         OSTREE_REF="rhel/9/${ARCH}/edge"
         PARENT_REF="rhel/9/${ARCH}/edge"
@@ -160,20 +125,6 @@ case "${ID}-${VERSION_ID}" in
         BLUEPRINT_USER="simple"
         OS_NAME="rhel-edge"
         ;;
-    "centos-8")
-        OSTREE_REF="centos/8/${ARCH}/edge"
-        PARENT_REF="centos/8/${ARCH}/edge"
-        OS_VARIANT="centos-stream8"
-        IMAGE_NAME="image.raw.xz"
-        USER_IN_BLUEPRINT="true"
-        BLUEPRINT_USER="simple"
-        # workaround issue #2640
-        BOOT_ARGS="loader=/usr/share/edk2/ovmf/OVMF_CODE.secboot.fd,loader.readonly=yes,loader.secure=no,loader.type=pflash,nvram=/usr/share/edk2/ovmf/OVMF_VARS.fd"
-        # sometimes the file /usr/share/edk2/ovmf/OVMF_VARS.fd got deleted after virt-install
-        # a workaround for this issue
-        sudo cp /usr/share/edk2/ovmf/OVMF_VARS.fd /tmp/
-        sudo mkdir -p /var/lib/fdo
-        ;;
     "centos-9")
         OSTREE_REF="centos/9/${ARCH}/edge"
         PARENT_REF="centos/9/${ARCH}/edge"
diff --git a/ostree-ng.sh b/ostree-ng.sh
index 5b9de922d..bf9e62641 100755
--- a/ostree-ng.sh
+++ b/ostree-ng.sh
@@ -64,11 +64,6 @@ NEW_MKKSISO="false"
 SYSROOT_RO="false"
 
 case "${ID}-${VERSION_ID}" in
-    "rhel-8.6")
-        OSTREE_REF="rhel/8/${ARCH}/edge"
-        OS_VARIANT="rhel8-unknown"
-        DIRS_FILES_CUSTOMIZATION="false"
-        ;;
     "rhel-8.8")
         OSTREE_REF="rhel/8/${ARCH}/edge"
         OS_VARIANT="rhel8-unknown"
@@ -77,14 +72,6 @@ case "${ID}-${VERSION_ID}" in
         HTTP_BOOT_FEAT="true"
         DIRS_FILES_CUSTOMIZATION="true"
         ;;
-    "rhel-8.9")
-        OSTREE_REF="rhel/8/${ARCH}/edge"
-        OS_VARIANT="rhel8-unknown"
-        CONTAINER_PUSHING_FEAT="true"
-        EMBEDDED_CONTAINER="true"
-        HTTP_BOOT_FEAT="true"
-        DIRS_FILES_CUSTOMIZATION="true"
-        ;;
     "rhel-8.10")
         OSTREE_REF="rhel/8/${ARCH}/edge"
         OS_VARIANT="rhel8-unknown"
@@ -93,21 +80,6 @@ case "${ID}-${VERSION_ID}" in
         HTTP_BOOT_FEAT="true"
         DIRS_FILES_CUSTOMIZATION="true"
         ;;
-    "rhel-9.0")
-        OSTREE_REF="rhel/9/${ARCH}/edge"
-        OS_VARIANT="rhel9.0"
-        DIRS_FILES_CUSTOMIZATION="false"
-        ;;
-    "rhel-9.2")
-        OSTREE_REF="rhel/9/${ARCH}/edge"
-        OS_VARIANT="rhel9-unknown"
-        NEW_MKKSISO="true"
-        CONTAINER_PUSHING_FEAT="true"
-        EMBEDDED_CONTAINER="true"
-        HTTP_BOOT_FEAT="true"
-        SYSROOT_RO="true"
-        DIRS_FILES_CUSTOMIZATION="true"
-        ;;
     "rhel-9.3")
         OSTREE_REF="rhel/9/${ARCH}/edge"
         OS_VARIANT="rhel9-unknown"
@@ -139,15 +111,6 @@ case "${ID}-${VERSION_ID}" in
         DIRS_FILES_CUSTOMIZATION="true"
         ANSIBLE_OS_NAME="rhel-edge"
         ;;
-    "centos-8")
-        OSTREE_REF="centos/8/${ARCH}/edge"
-        OS_VARIANT="centos-stream8"
-        CONTAINER_PUSHING_FEAT="true"
-        EMBEDDED_CONTAINER="true"
-        DIRS_FILES_CUSTOMIZATION="true"
-        # workaround issue #2640
-        BOOT_ARGS="loader=/usr/share/edk2/ovmf/OVMF_CODE.secboot.fd,loader.readonly=yes,loader.secure='no',loader.type=pflash,nvram=/usr/share/edk2/ovmf/OVMF_VARS.fd"
-        ;;
     "centos-9")
         OSTREE_REF="centos/9/${ARCH}/edge"
         OS_VARIANT="centos-stream9"
@@ -159,15 +122,6 @@ case "${ID}-${VERSION_ID}" in
         DIRS_FILES_CUSTOMIZATION="true"
         ANSIBLE_OS_NAME="rhel-edge"
         ;;
-    "fedora-38")
-        CONTAINER_IMAGE_TYPE=fedora-iot-container
-        INSTALLER_IMAGE_TYPE=fedora-iot-installer
-        OSTREE_REF="fedora-iot/38/${ARCH}/iot"
-        OS_VARIANT="fedora-unknown"
-        ANSIBLE_OS_NAME="fedora-iot"
-        SYSROOT_RO="true"
-        DIRS_FILES_CUSTOMIZATION="true"
-        ;;
     "fedora-39")
         CONTAINER_IMAGE_TYPE=fedora-iot-container
         INSTALLER_IMAGE_TYPE=fedora-iot-installer
diff --git a/ostree-raw-image.sh b/ostree-raw-image.sh
index 8a524d7a1..69f3b0a70 100755
--- a/ostree-raw-image.sh
+++ b/ostree-raw-image.sh
@@ -52,13 +52,6 @@ sudo mkdir -p /etc/osbuild-composer/repositories
 # The RO setting on RHEL 8.8 and CS8 is not configured by ostree, but osbuild-composer
 # by PR https://github.com/osbuild/osbuild-composer/pull/3178
 case "${ID}-${VERSION_ID}" in
-    "rhel-8.6")
-        OSTREE_REF="rhel/8/${ARCH}/edge"
-        PARENT_REF="rhel/8/${ARCH}/edge"
-        OS_VARIANT="rhel8-unknown"
-        ADD_SSSD="false"
-        USER_IN_RAW="false"
-        ;;
     "rhel-8.8")
         OSTREE_REF="rhel/8/${ARCH}/edge"
         PARENT_REF="rhel/8/${ARCH}/edge"
@@ -67,14 +60,6 @@ case "${ID}-${VERSION_ID}" in
         USER_IN_RAW="true"
         SYSROOT_RO="false"
         ;;
-    "rhel-8.9")
-        OSTREE_REF="rhel/8/${ARCH}/edge"
-        PARENT_REF="rhel/8/${ARCH}/edge"
-        OS_VARIANT="rhel8-unknown"
-        ADD_SSSD="true"
-        USER_IN_RAW="true"
-        SYSROOT_RO="false"
-        ;;
     "rhel-8.10")
         OSTREE_REF="rhel/8/${ARCH}/edge"
         PARENT_REF="rhel/8/${ARCH}/edge"
@@ -83,21 +68,6 @@ case "${ID}-${VERSION_ID}" in
         USER_IN_RAW="true"
         SYSROOT_RO="false"
         ;;
-    "rhel-9.0")
-        OSTREE_REF="rhel/9/${ARCH}/edge"
-        PARENT_REF="rhel/9/${ARCH}/edge"
-        OS_VARIANT="rhel9.0"
-        ADD_SSSD="false"
-        USER_IN_RAW="false"
-        ;;
-    "rhel-9.2")
-        OSTREE_REF="rhel/9/${ARCH}/edge"
-        PARENT_REF="rhel/9/${ARCH}/edge"
-        OS_VARIANT="rhel9-unknown"
-        ADD_SSSD="true"
-        USER_IN_RAW="true"
-        SYSROOT_RO="true"
-        ;;
     "rhel-9.3")
         OSTREE_REF="rhel/9/${ARCH}/edge"
         PARENT_REF="rhel/9/${ARCH}/edge"
@@ -123,16 +93,6 @@ case "${ID}-${VERSION_ID}" in
         SYSROOT_RO="true"
         ANSIBLE_OS_NAME="rhel-edge"
         ;;
-    "centos-8")
-        OSTREE_REF="centos/8/${ARCH}/edge"
-        PARENT_REF="centos/8/${ARCH}/edge"
-        OS_VARIANT="centos-stream8"
-        ADD_SSSD="true"
-        USER_IN_RAW="true"
-        SYSROOT_RO="false"
-        # workaround issue #2640
-        BOOT_ARGS="loader=/usr/share/edk2/ovmf/OVMF_CODE.secboot.fd,loader.readonly=yes,loader.secure='no',loader.type=pflash,nvram=/usr/share/edk2/ovmf/OVMF_VARS.fd"
-        ;;
     "centos-9")
         OSTREE_REF="centos/9/${ARCH}/edge"
         PARENT_REF="centos/9/${ARCH}/edge"
@@ -143,17 +103,6 @@ case "${ID}-${VERSION_ID}" in
         SYSROOT_RO="true"
         ANSIBLE_OS_NAME="rhel-edge"
         ;;
-    "fedora-38")
-        CONTAINER_TYPE=fedora-iot-container
-        RAW_TYPE=iot-raw-image
-        OSTREE_REF="fedora/38/${ARCH}/iot"
-        OS_VARIANT="fedora-unknown"
-        ADD_SSSD="false"
-        ANSIBLE_OS_NAME="fedora-iot"
-        USER_IN_RAW="true"
-        REF_PREFIX="fedora-iot"
-        SYSROOT_RO="true"
-        ;;
     "fedora-39")
         CONTAINER_TYPE=fedora-iot-container
         RAW_TYPE=iot-raw-image
diff --git a/ostree-simplified-installer.sh b/ostree-simplified-installer.sh
index ca1f4d915..2bd3ffa17 100755
--- a/ostree-simplified-installer.sh
+++ b/ostree-simplified-installer.sh
@@ -109,13 +109,6 @@ sudo mkdir -p /etc/osbuild-composer/repositories
 # The RO setting on RHEL 8.8 and CS8 is not configured by ostree, but osbuild-composer
 # by PR https://github.com/osbuild/osbuild-composer/pull/3178
 case "${ID}-${VERSION_ID}" in
-    "rhel-8.6")
-        OSTREE_REF="rhel/8/${ARCH}/edge"
-        PARENT_REF="rhel/8/${ARCH}/edge"
-        OS_VARIANT="rhel8-unknown"
-        IMAGE_NAME="disk.img.xz"
-        sudo mkdir -p /var/lib/fdo
-        ;;
     "rhel-8.8")
         OSTREE_REF="rhel/8/${ARCH}/edge"
         PARENT_REF="rhel/8/${ARCH}/edge"
@@ -126,16 +119,6 @@ case "${ID}-${VERSION_ID}" in
         NO_FDO="true"
         sudo mkdir -p /var/lib/fdo
         ;;
-    "rhel-8.9")
-        OSTREE_REF="rhel/8/${ARCH}/edge"
-        PARENT_REF="rhel/8/${ARCH}/edge"
-        OS_VARIANT="rhel8-unknown"
-        IMAGE_NAME="image.raw.xz"
-        USER_IN_BLUEPRINT="true"
-        BLUEPRINT_USER="simple"
-        NO_FDO="true"
-        sudo mkdir -p /var/lib/fdo
-        ;;
     "rhel-8.10")
         OSTREE_REF="rhel/8/${ARCH}/edge"
         PARENT_REF="rhel/8/${ARCH}/edge"
@@ -146,26 +129,6 @@ case "${ID}-${VERSION_ID}" in
         NO_FDO="true"
         sudo mkdir -p /var/lib/fdo
         ;;
-    "rhel-9.0")
-        OSTREE_REF="rhel/9/${ARCH}/edge"
-        PARENT_REF="rhel/9/${ARCH}/edge"
-        OS_VARIANT="rhel9.0"
-        IMAGE_NAME="disk.img.xz"
-        sudo mkdir -p /var/lib/fdo
-        ;;
-    "rhel-9.2")
-        OSTREE_REF="rhel/9/${ARCH}/edge"
-        PARENT_REF="rhel/9/${ARCH}/edge"
-        OS_VARIANT="rhel9-unknown"
-        IMAGE_NAME="image.raw.xz"
-        SYSROOT_RO="true"
-        ANSIBLE_USER=fdouser
-        FDO_USER_ONBOARDING="true"
-        USER_IN_BLUEPRINT="true"
-        BLUEPRINT_USER="simple"
-        NO_FDO="true"
-        sudo mkdir -p /var/lib/fdo
-        ;;
     "rhel-9.3")
         OSTREE_REF="rhel/9/${ARCH}/edge"
         PARENT_REF="rhel/9/${ARCH}/edge"
@@ -203,21 +166,6 @@ case "${ID}-${VERSION_ID}" in
         NO_FDO="true"
         OS_NAME="rhel-edge"
         ;;
-    "centos-8")
-        OSTREE_REF="centos/8/${ARCH}/edge"
-        PARENT_REF="centos/8/${ARCH}/edge"
-        OS_VARIANT="centos-stream8"
-        IMAGE_NAME="image.raw.xz"
-        USER_IN_BLUEPRINT="true"
-        BLUEPRINT_USER="simple"
-        # workaround issue #2640
-        BOOT_ARGS="loader=/usr/share/edk2/ovmf/OVMF_CODE.secboot.fd,loader.readonly=yes,loader.secure=no,loader.type=pflash,nvram=/usr/share/edk2/ovmf/OVMF_VARS.fd"
-        # sometimes the file /usr/share/edk2/ovmf/OVMF_VARS.fd got deleted after virt-install
-        # a workaround for this issue
-        sudo cp /usr/share/edk2/ovmf/OVMF_VARS.fd /tmp/
-        NO_FDO="true"
-        sudo mkdir -p /var/lib/fdo
-        ;;
     "centos-9")
         OSTREE_REF="centos/9/${ARCH}/edge"
         PARENT_REF="centos/9/${ARCH}/edge"
diff --git a/ostree.sh b/ostree.sh
index 0e7bd8167..f44e3bd1d 100755
--- a/ostree.sh
+++ b/ostree.sh
@@ -36,15 +36,6 @@ FEDORA_LOCAL_NAME="localhost/fedora-minimal:v1"
 
 # Set os-variant and boot location used by virt-install.
 case "${ID}-${VERSION_ID}" in
-    "rhel-8.6")
-        OSTREE_REF="rhel/8/${ARCH}/edge"
-        OS_VARIANT="rhel8-unknown"
-        USER_IN_COMMIT="true"
-        BOOT_LOCATION="http://${DOWNLOAD_NODE}/rhel-8/rel-eng/updates/RHEL-8/latest-RHEL-8.6.0/compose/BaseOS/x86_64/os/"
-        CUT_DIRS=9
-        ADD_SSSD="false"
-        DIRS_FILES_CUSTOMIZATION="false"
-        ;;
     "rhel-8.8")
         OSTREE_REF="rhel/8/${ARCH}/edge"
         USER_IN_COMMIT="true"
@@ -56,17 +47,6 @@ case "${ID}-${VERSION_ID}" in
         FIREWALL_FEATURE="true"
         DIRS_FILES_CUSTOMIZATION="true"
         ;;
-    "rhel-8.9")
-        OSTREE_REF="rhel/8/${ARCH}/edge"
-        USER_IN_COMMIT="true"
-        OS_VARIANT="rhel8-unknown"
-        BOOT_LOCATION="http://${DOWNLOAD_NODE}/rhel-8/nightly/updates/RHEL-8/latest-RHEL-8.9.0/compose/BaseOS/x86_64/os/"
-        CUT_DIRS=9
-        ADD_SSSD="true"
-        EMBEDDED_CONTAINER="true"
-        FIREWALL_FEATURE="true"
-        DIRS_FILES_CUSTOMIZATION="true"
-        ;;
     "rhel-8.10")
         OSTREE_REF="rhel/8/${ARCH}/edge"
         USER_IN_COMMIT="true"
@@ -78,27 +58,6 @@ case "${ID}-${VERSION_ID}" in
         FIREWALL_FEATURE="true"
         DIRS_FILES_CUSTOMIZATION="true"
         ;;
-    "rhel-9.0")
-        OSTREE_REF="rhel/9/${ARCH}/edge"
-        USER_IN_COMMIT="true"
-        OS_VARIANT="rhel9.0"
-        BOOT_LOCATION="http://${DOWNLOAD_NODE}/rhel-9/rel-eng/updates/RHEL-9/latest-RHEL-9.0.0/compose/BaseOS/x86_64/os/"
-        CUT_DIRS=9
-        ADD_SSSD="false"
-        DIRS_FILES_CUSTOMIZATION="false"
-        ;;
-    "rhel-9.2")
-        OSTREE_REF="rhel/9/${ARCH}/edge"
-        USER_IN_COMMIT="true"
-        OS_VARIANT="rhel9-unknown"
-        BOOT_LOCATION="http://${DOWNLOAD_NODE}/rhel-9/nightly/updates/RHEL-9/latest-RHEL-9.2.0/compose/BaseOS/x86_64/os/"
-        CUT_DIRS=9
-        ADD_SSSD="true"
-        EMBEDDED_CONTAINER="true"
-        FIREWALL_FEATURE="true"
-        SYSROOT_RO="true"
-        DIRS_FILES_CUSTOMIZATION="true"
-        ;;
     "rhel-9.3")
         OSTREE_REF="rhel/9/${ARCH}/edge"
         USER_IN_COMMIT="true"
@@ -135,16 +94,6 @@ case "${ID}-${VERSION_ID}" in
         SYSROOT_RO="true"
         DIRS_FILES_CUSTOMIZATION="true"
         ;;
-    "centos-8")
-        OSTREE_REF="centos/8/${ARCH}/edge"
-        USER_IN_COMMIT="true"
-        OS_VARIANT="centos-stream8"
-        CUT_DIRS=7
-        ADD_SSSD="true"
-        EMBEDDED_CONTAINER="true"
-        FIREWALL_FEATURE="true"
-        DIRS_FILES_CUSTOMIZATION="true"
-        ;;
     "centos-9")
         OSTREE_REF="centos/9/${ARCH}/edge"
         USER_IN_COMMIT="true"