diff --git a/.github/workflows/adds-on.yml b/.github/workflows/adds-on.yml
deleted file mode 100644
index 491f02187..000000000
--- a/.github/workflows/adds-on.yml
+++ /dev/null
@@ -1,204 +0,0 @@
----
-name: Run customer case on RHEL 9.5.0
-
-on:
-  issue_comment:
-    types:
-      - created
-
-jobs:
-  pr-info:
-    if: ${{ github.event.issue.pull_request &&
-            (endsWith(github.event.comment.body, '/test-fapolicyd-rhel-9-5') ||
-            endsWith(github.event.comment.body, '/test-grafana-pcp-rhel-9-5')) }}
-    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-fapolicyd:
-    needs: pr-info
-    if: ${{ needs.pr-info.outputs.allowed_user == 'true' && github.event.issue.pull_request &&
-            endsWith(github.event.comment.body, '/test-fapolicyd-rhel-9-5') }}
-    runs-on: ubuntu-latest
-    env:
-      STATUS_NAME: fapolicyd-9.5
-
-    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 }}
-
-  fapolicyd:
-    needs: [pr-info, pre-fapolicyd]
-    runs-on: [kite, x86_64, rhos-01, rhel-9-5, large]
-    env:
-      STATUS_NAME: fapolicyd-9.5
-
-    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-adds-on.sh
-        run: ./ostree-adds-on.sh
-        env:
-          USER_CASE: fapolicyd
-          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: fapolicyd-9.5
-          path: |
-            *.json
-            *.log
-
-  pre-grafana-pcp:
-    needs: pr-info
-    if: ${{ needs.pr-info.outputs.allowed_user == 'true' && github.event.issue.pull_request &&
-            endsWith(github.event.comment.body, '/test-grafana-pcp-rhel-9-5') }}
-    runs-on: ubuntu-latest
-    env:
-      STATUS_NAME: grafana-pcp-9.5
-
-    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 }}
-
-  grafana-pcp:
-    needs: [pr-info, pre-grafana-pcp]
-    runs-on: [kite, x86_64, rhos-01, rhel-9-5, large]
-    env:
-      STATUS_NAME: grafana-pcp-9.5
-
-    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-adds-on.sh
-        run: ./ostree-adds-on.sh
-        env:
-          USER_CASE: grafana-pcp
-          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: grafana-pcp-9.5
-          path: |
-            *.json
-            *.log
diff --git a/.github/workflows/ansible-runner.yml b/.github/workflows/ansible-runner.yml
deleted file mode 100644
index a50b034e7..000000000
--- a/.github/workflows/ansible-runner.yml
+++ /dev/null
@@ -1,26 +0,0 @@
----
-name: Build and upload ansible runner container
-
-on:
-  workflow_dispatch:
-  schedule:
-    # run 8:05 every Sunday
-    - cron: '5 8 * * 0'
-
-jobs:
-  build-upload:
-    # Do not run this job on any fork repos
-    if: github.repository == 'virt-s1/rhel-edge'
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@v3
-
-      - name: Build container
-        run: |
-          sudo apt-get install -y podman
-          podman build -t ansible-runner:x86_64 -f tools/Dockerfile.ansible.x86_64
-          podman push --creds "$QUAY_USERNAME":"$QUAY_PASSWORD" ansible-runner:x86_64 quay.io/rhel-edge/ansible-runner:x86_64
-          podman push --creds "$QUAY_USERNAME":"$QUAY_PASSWORD" ansible-runner:x86_64 quay.io/rhel-edge/ansible-runner:latest
-        env:
-          QUAY_USERNAME: ${{ secrets.QUAY_USERNAME }}
-          QUAY_PASSWORD: ${{ secrets.QUAY_PASSWORD }}
diff --git a/.github/workflows/arm-centos-stream-9.yml b/.github/workflows/arm-centos-stream-9.yml
deleted file mode 100644
index 2a2dc87ed..000000000
--- a/.github/workflows/arm-centos-stream-9.yml
+++ /dev/null
@@ -1,589 +0,0 @@
----
-name: Run Edge ARM64 Test on CentOS Stream 9
-
-on:
-  issue_comment:
-    types:
-      - created
-
-jobs:
-  pr-info:
-    if: ${{ github.event.issue.pull_request &&
-            (endsWith(github.event.comment.body, '/arm-cs9-all') ||
-            endsWith(github.event.comment.body, '/arm-cs9-commit') ||
-            endsWith(github.event.comment.body, '/arm-cs9-installer') ||
-            endsWith(github.event.comment.body, '/arm-cs9-raw') ||
-            endsWith(github.event.comment.body, '/arm-cs9-simplified') ||
-            endsWith(github.event.comment.body, '/arm-cs9-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-arm-all-cs9:
-    needs: pr-info
-    if: ${{ needs.pr-info.outputs.allowed_user == 'true' && github.event.issue.pull_request &&
-            endsWith(github.event.comment.body, '/arm-cs9-all') }}
-    runs-on: ubuntu-latest
-    env:
-      STATUS_NAME: arm-all-cs9
-
-    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 }}
-
-  arm-all-cs9:
-    needs: [pr-info, pre-arm-all-cs9]
-    runs-on: [kite, aarch64, beaker, fedora-37]
-    timeout-minutes: 420
-    env:
-      STATUS_NAME: arm-all-cs9
-
-    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: Setup arm runner
-        run: tools/deploy_bare.sh
-        timeout-minutes: 10
-
-      - name: Set private key permission to 600
-        run: sudo chmod 600 key/ostree_key
-
-      - name: run arm-commit.sh
-        run: ./arm-commit.sh centos-stream-9
-        timeout-minutes: 60
-
-      - name: run arm-installer.sh
-        if: always()
-        run: ./arm-installer.sh centos-stream-9
-        env:
-          QUAY_USERNAME: ${{ secrets.QUAY_USERNAME }}
-          QUAY_PASSWORD: ${{ secrets.QUAY_PASSWORD }}
-        timeout-minutes: 120
-
-      - name: run arm-raw.sh
-        if: always()
-        run: ./arm-raw.sh centos-stream-9
-        env:
-          DOCKERHUB_USERNAME: ${{ secrets.DOCKERHUB_USERNAME }}
-          DOCKERHUB_PASSWORD: ${{ secrets.DOCKERHUB_PASSWORD }}
-        timeout-minutes: 90
-
-      - name: run arm-simplified.sh
-        if: always()
-        run: ./arm-simplified.sh centos-stream-9
-        timeout-minutes: 150
-
-      - name: run arm-ignition.sh
-        if: always()
-        run: ./arm-ignition.sh centos-stream-9
-        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: arm-all-cs9
-          path: |
-            *.json
-            *.log
-
-  pre-arm-commit-cs9:
-    needs: pr-info
-    if: ${{ needs.pr-info.outputs.allowed_user == 'true' && github.event.issue.pull_request &&
-            endsWith(github.event.comment.body, '/arm-cs9-commit') }}
-    runs-on: ubuntu-latest
-    env:
-      STATUS_NAME: arm-commit-cs9
-
-    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 }}
-
-  arm-commit-cs9:
-    needs: [pr-info, pre-arm-commit-cs9]
-    runs-on: [kite, aarch64, beaker, fedora-37]
-    env:
-      STATUS_NAME: arm-commit-cs9
-
-    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: Setup arm runner
-        run: tools/deploy_bare.sh
-        timeout-minutes: 10
-
-      - name: Set private key permission to 600
-        run: sudo chmod 600 key/ostree_key
-
-      - name: run arm-commit.sh
-        run: ./arm-commit.sh centos-stream-9
-        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: arm-commit-cs9
-          path: |
-            *.json
-            *.log
-
-  pre-arm-installer-cs9:
-    needs: pr-info
-    if: ${{ needs.pr-info.outputs.allowed_user == 'true' && github.event.issue.pull_request &&
-            endsWith(github.event.comment.body, '/arm-cs9-installer') }}
-    runs-on: ubuntu-latest
-    env:
-      STATUS_NAME: arm-installer-cs9
-
-    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 }}
-
-  arm-installer-cs9:
-    needs: [pr-info, pre-arm-installer-cs9]
-    runs-on: [kite, aarch64, beaker, fedora-37]
-    env:
-      STATUS_NAME: arm-installer-cs9
-
-    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: Setup arm runner
-        run: tools/deploy_bare.sh
-        timeout-minutes: 10
-
-      - name: Set private key permission to 600
-        run: sudo chmod 600 key/ostree_key
-
-      - name: run arm-installer.sh
-        run: ./arm-installer.sh centos-stream-9
-        env:
-          QUAY_USERNAME: ${{ secrets.QUAY_USERNAME }}
-          QUAY_PASSWORD: ${{ secrets.QUAY_PASSWORD }}
-        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: arm-installer-cs9
-          path: |
-            *.json
-            *.log
-
-  pre-arm-raw-cs9:
-    needs: pr-info
-    if: ${{ needs.pr-info.outputs.allowed_user == 'true' && github.event.issue.pull_request &&
-            endsWith(github.event.comment.body, '/arm-cs9-raw') }}
-    runs-on: ubuntu-latest
-    env:
-      STATUS_NAME: arm-raw-cs9
-
-    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 }}
-
-  arm-raw-cs9:
-    needs: [pr-info, pre-arm-raw-cs9]
-    runs-on: [kite, aarch64, beaker, fedora-37]
-    env:
-      STATUS_NAME: arm-raw-cs9
-
-    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: Setup arm runner
-        run: tools/deploy_bare.sh
-        timeout-minutes: 10
-
-      - name: Set private key permission to 600
-        run: sudo chmod 600 key/ostree_key
-
-      - name: run arm-raw.sh
-        run: ./arm-raw.sh centos-stream-9
-        env:
-          DOCKERHUB_USERNAME: ${{ secrets.DOCKERHUB_USERNAME }}
-          DOCKERHUB_PASSWORD: ${{ secrets.DOCKERHUB_PASSWORD }}
-        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: arm-raw-cs9
-          path: |
-            *.json
-            *.log
-
-  pre-arm-simplified-cs9:
-    needs: pr-info
-    if: ${{ needs.pr-info.outputs.allowed_user == 'true' && github.event.issue.pull_request &&
-            endsWith(github.event.comment.body, '/arm-cs9-simplified') }}
-    runs-on: ubuntu-latest
-    env:
-      STATUS_NAME: arm-simplified-installer-cs9
-
-    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 }}
-
-  arm-simplified-cs9:
-    needs: [pr-info, pre-arm-simplified-cs9]
-    runs-on: [kite, aarch64, beaker, fedora-37]
-    env:
-      STATUS_NAME: arm-simplified-installer-cs9
-
-    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: Setup arm runner
-        run: tools/deploy_bare.sh
-        timeout-minutes: 10
-
-      - name: Set private key permission to 600
-        run: sudo chmod 600 key/ostree_key
-
-      - name: run arm-simplified.sh
-        run: ./arm-simplified.sh centos-stream-9
-        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: arm-simplified-installer-cs9
-          path: |
-            *.json
-            *.log
-
-  pre-arm-ignition-cs9:
-    needs: pr-info
-    if: ${{ needs.pr-info.outputs.allowed_user == 'true' && github.event.issue.pull_request &&
-            endsWith(github.event.comment.body, '/arm-cs9-ignition') }}
-    runs-on: ubuntu-latest
-    env:
-      STATUS_NAME: arm-ignition-cs9
-
-    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 }}
-
-  arm-ignition-cs9:
-    needs: [pr-info, pre-arm-ignition-cs9]
-    runs-on: [kite, aarch64, beaker, fedora-37]
-    env:
-      STATUS_NAME: arm-ignition-cs9
-
-    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: Setup arm runner
-        run: tools/deploy_bare.sh
-        timeout-minutes: 10
-
-      - name: Set private key permission to 600
-        run: sudo chmod 600 key/ostree_key
-
-      - name: run arm-ignition.sh
-        run: ./arm-ignition.sh centos-stream-9
-        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: arm-ignition-cs9
-          path: |
-            *.json
-            *.log
diff --git a/.github/workflows/arm-fedora-39.yml b/.github/workflows/arm-fedora-39.yml
deleted file mode 100644
index 4a7f2a023..000000000
--- a/.github/workflows/arm-fedora-39.yml
+++ /dev/null
@@ -1,406 +0,0 @@
----
-name: Run Edge ARM64 Test on Fedora 39
-
-on:
-  issue_comment:
-    types:
-      - created
-
-jobs:
-  pr-info:
-    if: ${{ github.event.issue.pull_request &&
-            (endsWith(github.event.comment.body, '/arm-f39-all') ||
-            endsWith(github.event.comment.body, '/arm-f39-commit') ||
-            endsWith(github.event.comment.body, '/arm-f39-installer') ||
-            endsWith(github.event.comment.body, '/arm-f39-raw')) }}
-    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-arm-all-f39:
-    needs: pr-info
-    if: ${{ needs.pr-info.outputs.allowed_user == 'true' && github.event.issue.pull_request &&
-            endsWith(github.event.comment.body, '/arm-f39-all') }}
-    runs-on: ubuntu-latest
-    env:
-      STATUS_NAME: arm-all-f39
-
-    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 }}
-
-  arm-all-f39:
-    needs: [pr-info, pre-arm-all-f39]
-    runs-on: [kite, aarch64, beaker, fedora-39]
-    env:
-      STATUS_NAME: arm-all-f39
-
-    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: Setup arm runner
-        run: tools/deploy_bare.sh
-        timeout-minutes: 10
-
-      - name: Set private key permission to 600
-        run: sudo chmod 600 key/ostree_key
-
-      - name: run arm-commit.sh
-        run: ./arm-commit.sh fedora-39
-        timeout-minutes: 120
-
-      - name: run arm-installer.sh
-        if: always()
-        run: ./arm-installer.sh fedora-39
-        env:
-          QUAY_USERNAME: ${{ secrets.QUAY_USERNAME }}
-          QUAY_PASSWORD: ${{ secrets.QUAY_PASSWORD }}
-        timeout-minutes: 120
-
-      - name: run arm-raw.sh
-        if: always()
-        run: ./arm-raw.sh fedora-39
-        env:
-          DOCKERHUB_USERNAME: ${{ secrets.DOCKERHUB_USERNAME }}
-          DOCKERHUB_PASSWORD: ${{ secrets.DOCKERHUB_PASSWORD }}
-        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: arm-all-f39
-          path: |
-            *.json
-            *.log
-
-  pre-arm-commit-f39:
-    needs: pr-info
-    if: ${{ needs.pr-info.outputs.allowed_user == 'true' && github.event.issue.pull_request &&
-            endsWith(github.event.comment.body, '/arm-f39-commit') }}
-    runs-on: ubuntu-latest
-    env:
-      STATUS_NAME: arm-commit-f39
-
-    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 }}
-
-  arm-commit-f39:
-    needs: [pr-info, pre-arm-commit-f39]
-    runs-on: [kite, aarch64, beaker, fedora-39]
-    env:
-      STATUS_NAME: arm-commit-f39
-
-    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: Setup arm runner
-        run: tools/deploy_bare.sh
-        timeout-minutes: 10
-
-      - name: Set private key permission to 600
-        run: sudo chmod 600 key/ostree_key
-
-      - name: run arm-commit.sh
-        run: ./arm-commit.sh fedora-39
-        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: arm-commit-f39
-          path: |
-            *.json
-            *.log
-
-  pre-arm-installer-f39:
-    needs: pr-info
-    if: ${{ needs.pr-info.outputs.allowed_user == 'true' && github.event.issue.pull_request &&
-            endsWith(github.event.comment.body, '/arm-f39-installer') }}
-    runs-on: ubuntu-latest
-    env:
-      STATUS_NAME: arm-installer-f39
-
-    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 }}
-
-  arm-installer-f39:
-    needs: [pr-info, pre-arm-installer-f39]
-    runs-on: [kite, aarch64, beaker, fedora-39]
-    env:
-      STATUS_NAME: arm-installer-f39
-
-    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: Setup arm runner
-        run: tools/deploy_bare.sh
-        timeout-minutes: 10
-
-      - name: Set private key permission to 600
-        run: sudo chmod 600 key/ostree_key
-
-      - name: run arm-installer.sh
-        run: ./arm-installer.sh fedora-39
-        env:
-          QUAY_USERNAME: ${{ secrets.QUAY_USERNAME }}
-          QUAY_PASSWORD: ${{ secrets.QUAY_PASSWORD }}
-        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: arm-installer-f39
-          path: |
-            *.json
-            *.log
-
-  pre-arm-raw-f39:
-    needs: pr-info
-    if: ${{ needs.pr-info.outputs.allowed_user == 'true' && github.event.issue.pull_request &&
-            endsWith(github.event.comment.body, '/arm-f39-raw') }}
-    runs-on: ubuntu-latest
-    env:
-      STATUS_NAME: arm-raw-f39
-
-    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 }}
-
-  arm-raw-f39:
-    needs: [pr-info, pre-arm-raw-f39]
-    runs-on: [kite, aarch64, beaker, fedora-39]
-    env:
-      STATUS_NAME: arm-raw-f39
-
-    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: Setup arm runner
-        run: tools/deploy_bare.sh
-        timeout-minutes: 10
-
-      - name: Set private key permission to 600
-        run: sudo chmod 600 key/ostree_key
-
-      - name: run arm-raw.sh
-        run: ./arm-raw.sh fedora-39
-        env:
-          DOCKERHUB_USERNAME: ${{ secrets.DOCKERHUB_USERNAME }}
-          DOCKERHUB_PASSWORD: ${{ secrets.DOCKERHUB_PASSWORD }}
-        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: arm-raw-f39
-          path: |
-            *.json
-            *.log
diff --git a/.github/workflows/arm-rhel-9-3.yml b/.github/workflows/arm-rhel-9-3.yml
deleted file mode 100644
index 62fa7eff4..000000000
--- a/.github/workflows/arm-rhel-9-3.yml
+++ /dev/null
@@ -1,605 +0,0 @@
----
-name: Run Edge ARM64 Test on RHEL 9.3
-
-on:
-  issue_comment:
-    types:
-      - created
-
-jobs:
-  pr-info:
-    if: ${{ github.event.issue.pull_request &&
-            (endsWith(github.event.comment.body, '/arm-rhel-9-3-all') ||
-            endsWith(github.event.comment.body, '/arm-rhel-9-3-commit') ||
-            endsWith(github.event.comment.body, '/arm-rhel-9-3-installer') ||
-            endsWith(github.event.comment.body, '/arm-rhel-9-3-raw') ||
-            endsWith(github.event.comment.body, '/arm-rhel-9-3-simplified') ||
-            endsWith(github.event.comment.body, '/arm-rhel-9-3-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-arm-all-93:
-    needs: pr-info
-    if: ${{ needs.pr-info.outputs.allowed_user == 'true' && github.event.issue.pull_request &&
-            endsWith(github.event.comment.body, '/arm-rhel-9-3-all') }}
-    runs-on: ubuntu-latest
-    env:
-      STATUS_NAME: arm-all-93
-
-    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 }}
-
-  arm-all-93:
-    needs: [pr-info, pre-arm-all-93]
-    runs-on: [kite, aarch64, beaker, fedora-37]
-    timeout-minutes: 420
-    env:
-      STATUS_NAME: arm-all-93
-
-    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: Setup arm runner
-        run: tools/deploy_bare.sh
-        timeout-minutes: 10
-
-      - name: Set private key permission to 600
-        run: sudo chmod 600 key/ostree_key
-
-      - name: run arm-commit.sh
-        run: ./arm-commit.sh rhel-9-3
-        env:
-          DOWNLOAD_NODE: ${{ secrets.DOWNLOAD_NODE }}
-        timeout-minutes: 60
-
-      - name: run arm-installer.sh
-        if: always()
-        run: ./arm-installer.sh rhel-9-3
-        env:
-          DOWNLOAD_NODE: ${{ secrets.DOWNLOAD_NODE }}
-          QUAY_USERNAME: ${{ secrets.QUAY_USERNAME }}
-          QUAY_PASSWORD: ${{ secrets.QUAY_PASSWORD }}
-        timeout-minutes: 120
-
-      - name: run arm-raw.sh
-        if: always()
-        run: ./arm-raw.sh rhel-9-3
-        env:
-          DOWNLOAD_NODE: ${{ secrets.DOWNLOAD_NODE }}
-          DOCKERHUB_USERNAME: ${{ secrets.DOCKERHUB_USERNAME }}
-          DOCKERHUB_PASSWORD: ${{ secrets.DOCKERHUB_PASSWORD }}
-        timeout-minutes: 90
-
-      - name: run arm-simplified.sh
-        if: always()
-        run: ./arm-simplified.sh rhel-9-3
-        env:
-          DOWNLOAD_NODE: ${{ secrets.DOWNLOAD_NODE }}
-        timeout-minutes: 150
-
-      - name: run arm-ignition.sh
-        if: always()
-        run: ./arm-ignition.sh rhel-9-3
-        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: arm-all-93
-          path: |
-            *.json
-            *.log
-
-  pre-arm-commit-93:
-    needs: pr-info
-    if: ${{ needs.pr-info.outputs.allowed_user == 'true' && github.event.issue.pull_request &&
-            endsWith(github.event.comment.body, '/arm-rhel-9-3-commit') }}
-    runs-on: ubuntu-latest
-    env:
-      STATUS_NAME: arm-commit-93
-
-    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 }}
-
-  arm-commit-93:
-    needs: [pr-info, pre-arm-commit-93]
-    runs-on: [kite, aarch64, beaker, fedora-37]
-    env:
-      STATUS_NAME: arm-commit-93
-
-    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: Setup arm runner
-        run: tools/deploy_bare.sh
-        timeout-minutes: 10
-
-      - name: Set private key permission to 600
-        run: sudo chmod 600 key/ostree_key
-
-      - name: run arm-commit.sh
-        env:
-          DOWNLOAD_NODE: ${{ secrets.DOWNLOAD_NODE }}
-        run: ./arm-commit.sh rhel-9-3
-        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: arm-commit-93
-          path: |
-            *.json
-            *.log
-
-  pre-arm-installer-93:
-    needs: pr-info
-    if: ${{ needs.pr-info.outputs.allowed_user == 'true' && github.event.issue.pull_request &&
-            endsWith(github.event.comment.body, '/arm-rhel-9-3-installer') }}
-    runs-on: ubuntu-latest
-    env:
-      STATUS_NAME: arm-installer-93
-
-    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 }}
-
-  arm-installer-93:
-    needs: [pr-info, pre-arm-installer-93]
-    runs-on: [kite, aarch64, beaker, fedora-37]
-    env:
-      STATUS_NAME: arm-installer-93
-
-    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: Setup arm runner
-        run: tools/deploy_bare.sh
-        timeout-minutes: 10
-
-      - name: Set private key permission to 600
-        run: sudo chmod 600 key/ostree_key
-
-      - name: run arm-installer.sh
-        run: ./arm-installer.sh rhel-9-3
-        env:
-          DOWNLOAD_NODE: ${{ secrets.DOWNLOAD_NODE }}
-          QUAY_USERNAME: ${{ secrets.QUAY_USERNAME }}
-          QUAY_PASSWORD: ${{ secrets.QUAY_PASSWORD }}
-        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: arm-installer-93
-          path: |
-            *.json
-            *.log
-
-  pre-arm-raw-93:
-    needs: pr-info
-    if: ${{ needs.pr-info.outputs.allowed_user == 'true' && github.event.issue.pull_request &&
-            endsWith(github.event.comment.body, '/arm-rhel-9-3-raw') }}
-    runs-on: ubuntu-latest
-    env:
-      STATUS_NAME: arm-raw-93
-
-    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 }}
-
-  arm-raw-93:
-    needs: [pr-info, pre-arm-raw-93]
-    runs-on: [kite, aarch64, beaker, fedora-37]
-    env:
-      STATUS_NAME: arm-raw-93
-
-    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: Setup arm runner
-        run: tools/deploy_bare.sh
-        timeout-minutes: 10
-
-      - name: Set private key permission to 600
-        run: sudo chmod 600 key/ostree_key
-
-      - name: run arm-raw.sh
-        run: ./arm-raw.sh rhel-9-3
-        env:
-          DOWNLOAD_NODE: ${{ secrets.DOWNLOAD_NODE }}
-          DOCKERHUB_USERNAME: ${{ secrets.DOCKERHUB_USERNAME }}
-          DOCKERHUB_PASSWORD: ${{ secrets.DOCKERHUB_PASSWORD }}
-        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: arm-raw-93
-          path: |
-            *.json
-            *.log
-
-  pre-arm-simplified-93:
-    needs: pr-info
-    if: ${{ needs.pr-info.outputs.allowed_user == 'true' && github.event.issue.pull_request &&
-            endsWith(github.event.comment.body, '/arm-rhel-9-3-simplified') }}
-    runs-on: ubuntu-latest
-    env:
-      STATUS_NAME: arm-simplified-installer-93
-
-    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 }}
-
-  arm-simplified-93:
-    needs: [pr-info, pre-arm-simplified-93]
-    runs-on: [kite, aarch64, beaker, fedora-37]
-    env:
-      STATUS_NAME: arm-simplified-installer-93
-
-    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: Setup arm runner
-        run: tools/deploy_bare.sh
-        timeout-minutes: 10
-
-      - name: Set private key permission to 600
-        run: sudo chmod 600 key/ostree_key
-
-      - name: run arm-simplified.sh
-        run: ./arm-simplified.sh rhel-9-3
-        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: arm-simplified-installer-93
-          path: |
-            *.json
-            *.log
-
-  pre-arm-ignition-93:
-    needs: pr-info
-    if: ${{ needs.pr-info.outputs.allowed_user == 'true' && github.event.issue.pull_request &&
-            endsWith(github.event.comment.body, '/arm-rhel-9-3-ignition') }}
-    runs-on: ubuntu-latest
-    env:
-      STATUS_NAME: arm-ignition-93
-
-    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 }}
-
-  arm-ignition-93:
-    needs: [pr-info, pre-arm-ignition-93]
-    runs-on: [kite, aarch64, beaker, fedora-37]
-    env:
-      STATUS_NAME: arm-ignition-93
-
-    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: Setup arm runner
-        run: tools/deploy_bare.sh
-        timeout-minutes: 10
-
-      - name: Set private key permission to 600
-        run: sudo chmod 600 key/ostree_key
-
-      - name: run arm-ignition.sh
-        run: ./arm-ignition.sh rhel-9-3
-        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: arm-ignition-93
-          path: |
-            *.json
-            *.log
diff --git a/.github/workflows/fedora-38.yml b/.github/workflows/fedora-38.yml
deleted file mode 100644
index 71d92a2d5..000000000
--- a/.github/workflows/fedora-38.yml
+++ /dev/null
@@ -1,448 +0,0 @@
----
-name: Run Edge Test on Fedora 38
-
-on:
-  issue_comment:
-    types:
-      - created
-
-jobs:
-  pr-info:
-    if: ${{ github.event.issue.pull_request &&
-            (endsWith(github.event.comment.body, '/test-f38') ||
-            endsWith(github.event.comment.body, '/test-f38-minimal') ||
-            endsWith(github.event.comment.body, '/test-f38-virt') ||
-            endsWith(github.event.comment.body, '/test-f38-ng') ||
-            endsWith(github.event.comment.body, '/test-f38-qcow2') ||
-            endsWith(github.event.comment.body, '/test-f38-raw')) }}
-    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-iot-commit-f38:
-    needs: pr-info
-    if: ${{ needs.pr-info.outputs.allowed_user == 'true' && github.event.issue.pull_request &&
-            (endsWith(github.event.comment.body, '/test-f38') ||
-            endsWith(github.event.comment.body, '/test-f38-virt')) }}
-    runs-on: ubuntu-latest
-    env:
-      STATUS_NAME: iot-commit-f38
-
-    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 }}
-
-  iot-commit-f38:
-    needs: [pr-info, pre-iot-commit-f38]
-    runs-on: [kite, x86_64, gcp, fedora-38, medium]
-    env:
-      STATUS_NAME: iot-commit-f38
-
-    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
-        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
-        with:
-          name: iot-commit-f38
-          path: |
-            *.json
-            *.log
-
-  pre-iot-installer-f38:
-    needs: pr-info
-    if: ${{ needs.pr-info.outputs.allowed_user == 'true' && github.event.issue.pull_request &&
-            (endsWith(github.event.comment.body, '/test-f38') ||
-            endsWith(github.event.comment.body, '/test-f38-ng')) }}
-    runs-on: ubuntu-latest
-    env:
-      STATUS_NAME: iot-installer-f38
-
-    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 }}
-
-  iot-installer-f38:
-    needs: [pr-info, pre-iot-installer-f38]
-    runs-on: [kite, x86_64, rhos-01, fedora-38, large]
-    env:
-      STATUS_NAME: iot-installer-f38
-
-    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 }}
-        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
-        with:
-          name: iot-installer-f38
-          path: |
-            *.json
-            *.log
-
-  pre-iot-raw-image-f38:
-    needs: pr-info
-    if: ${{ needs.pr-info.outputs.allowed_user == 'true' && github.event.issue.pull_request &&
-            (endsWith(github.event.comment.body, '/test-f38') ||
-            endsWith(github.event.comment.body, '/test-f38-raw')) }}
-    runs-on: ubuntu-latest
-    env:
-      STATUS_NAME: iot-raw-image-f38
-
-    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 }}
-
-  iot-raw-image-f38:
-    needs: [pr-info, pre-iot-raw-image-f38]
-    runs-on: [kite, x86_64, gcp, fedora-38, medium]
-    env:
-      STATUS_NAME: iot-raw-image-f38
-
-    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 }}
-        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: iot-raw-image-f38
-          path: |
-            *.json
-            *.log
-
-  pre-minimal-raw-f38:
-    needs: pr-info
-    if: ${{ needs.pr-info.outputs.allowed_user == 'true' && github.event.issue.pull_request &&
-            (endsWith(github.event.comment.body, '/test-f38') ||
-            endsWith(github.event.comment.body, '/test-f38-minimal')) }}
-    runs-on: ubuntu-latest
-    env:
-      STATUS_NAME: minimal-raw-f38
-
-    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 }}
-
-  minimal-raw-f38:
-    needs: [pr-info, pre-minimal-raw-f38]
-    runs-on: [kite, x86_64, gcp, fedora-38, medium]
-    env:
-      STATUS_NAME: minimal-raw-f38
-
-    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 minimal-raw.sh
-        run: ./minimal-raw.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
-        with:
-          name: minimal-raw-f38
-          path: |
-            *.json
-            *.log
-
-  pre-iot-qcow2-f38:
-    needs: pr-info
-    if: ${{ needs.pr-info.outputs.allowed_user == 'true' && github.event.issue.pull_request &&
-            (endsWith(github.event.comment.body, '/test-f38') ||
-            endsWith(github.event.comment.body, '/test-f38-qcow2')) }}
-    runs-on: ubuntu-latest
-    env:
-      STATUS_NAME: iot-qcow2-f38
-
-    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 }}
-
-  iot-qcow2-f38:
-    needs: [pr-info, pre-iot-qcow2-f38]
-    runs-on: [kite, x86_64, gcp, fedora-38, medium]
-    env:
-      STATUS_NAME: iot-qcow2-f38
-
-    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-iot-qcow2.sh
-        run: ./ostree-iot-qcow2.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
-        with:
-          name: iot-qcow2-f38
-          path: |
-            *.json
-            *.log
diff --git a/.github/workflows/fedora-39.yml b/.github/workflows/fedora-39.yml
deleted file mode 100644
index 1fdb62376..000000000
--- a/.github/workflows/fedora-39.yml
+++ /dev/null
@@ -1,98 +0,0 @@
----
-name: Run Edge Test on Fedora 39
-
-on:
-  issue_comment:
-    types:
-      - created
-
-jobs:
-  pr-info:
-    if: ${{ github.event.issue.pull_request &&
-            (endsWith(github.event.comment.body, '/test-f39')) }}
-    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 }}
-
-      - 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 }}
-      ref: ${{ fromJson(steps.pr-api.outputs.data).head.ref }}
-      repo_url: ${{ fromJson(steps.pr-api.outputs.data).head.repo.html_url }}
-
-  iot-f39-x86:
-    needs: pr-info
-    if: ${{ needs.pr-info.outputs.allowed_user == 'true' && github.event.issue.pull_request }}
-    continue-on-error: true
-    runs-on: ubuntu-latest
-
-    steps:
-      - name: Clone repository
-        uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11  # v4
-        with:
-          ref: ${{ needs.pr-info.outputs.sha }}
-          fetch-depth: 0
-
-      - name: Run the tests
-        uses: sclorg/testing-farm-as-github-action@v3.1.0
-        with:
-          compose: Fedora-39-Updated
-          api_key: ${{ secrets.TF_API_KEY }}
-          git_url: ${{ needs.pr-info.outputs.repo_url }}
-          git_ref: ${{ needs.pr-info.outputs.ref }}
-          update_pull_request_status: true
-          pull_request_status_name: "iot-f39-x86"
-          tmt_context: "arch=x86_64;distro=fedora"
-          tmt_plan_regex: edge-x86
-          tf_scope: private
-          secrets: "DOWNLOAD_NODE=${{ secrets.DOWNLOAD_NODE }};OCP4_TOKEN=${{ secrets.OCP4_TOKEN }};QUAY_USERNAME=${{ secrets.QUAY_USERNAME }};QUAY_PASSWORD=${{ secrets.QUAY_PASSWORD }};DOCKERHUB_USERNAME=${{ secrets.DOCKERHUB_USERNAME }};DOCKERHUB_PASSWORD=${{ secrets.DOCKERHUB_PASSWORD }};AWS_ACCESS_KEY_ID=${{ secrets.AWS_ACCESS_KEY_ID }};AWS_SECRET_ACCESS_KEY=${{ secrets.AWS_SECRET_ACCESS_KEY }};GOVC_URL=${{ secrets.GOVC_URL }};GOVC_USERNAME=${{ secrets.GOVC_USERNAME }};GOVC_PASSWORD=${{ secrets.GOVC_PASSWORD }}"
-          variables: "ARCH=x86_64;AWS_DEFAULT_REGION=us-east-1;GOVC_INSECURE=1"
-
-  iot-f39-arm:
-    needs: pr-info
-    if: ${{ needs.pr-info.outputs.allowed_user == 'true' && github.event.issue.pull_request }}
-    continue-on-error: true
-    runs-on: ubuntu-latest
-
-    steps:
-      - name: Clone repository
-        uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11  # v4
-        with:
-          ref: ${{ needs.pr-info.outputs.sha }}
-          fetch-depth: 0
-
-      - name: Run the tests
-        uses: sclorg/testing-farm-as-github-action@v3.1.0
-        with:
-          compose: Fedora-39-Updated
-          api_key: ${{ secrets.TF_API_KEY }}
-          git_url: ${{ needs.pr-info.outputs.repo_url }}
-          git_ref: ${{ needs.pr-info.outputs.ref }}
-          update_pull_request_status: true
-          pull_request_status_name: "iot-f39-arm"
-          tmt_context: "arch=aarch64;distro=fedora"
-          tmt_plan_regex: edge-arm
-          tf_scope: private
-          secrets: "DOWNLOAD_NODE=${{ secrets.DOWNLOAD_NODE }};OCP4_TOKEN=${{ secrets.OCP4_TOKEN }};QUAY_USERNAME=${{ secrets.QUAY_USERNAME }};QUAY_PASSWORD=${{ secrets.QUAY_PASSWORD }};DOCKERHUB_USERNAME=${{ secrets.DOCKERHUB_USERNAME }};DOCKERHUB_PASSWORD=${{ secrets.DOCKERHUB_PASSWORD }};AWS_ACCESS_KEY_ID=${{ secrets.AWS_ACCESS_KEY_ID }};AWS_SECRET_ACCESS_KEY=${{ secrets.AWS_SECRET_ACCESS_KEY }};GOVC_URL=${{ secrets.GOVC_URL }};GOVC_USERNAME=${{ secrets.GOVC_USERNAME }};GOVC_PASSWORD=${{ secrets.GOVC_PASSWORD }}"
-          variables: "ARCH=aarch64;AWS_DEFAULT_REGION=us-east-1;GOVC_INSECURE=1"
diff --git a/.github/workflows/fedora-40.yml b/.github/workflows/fedora-40.yml
deleted file mode 100644
index 3b454ec0b..000000000
--- a/.github/workflows/fedora-40.yml
+++ /dev/null
@@ -1,98 +0,0 @@
----
-name: Run Edge Test on Fedora 40
-
-on:
-  issue_comment:
-    types:
-      - created
-
-jobs:
-  pr-info:
-    if: ${{ github.event.issue.pull_request &&
-            (endsWith(github.event.comment.body, '/test-f40')) }}
-    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 }}
-
-      - 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 }}
-      ref: ${{ fromJson(steps.pr-api.outputs.data).head.ref }}
-      repo_url: ${{ fromJson(steps.pr-api.outputs.data).head.repo.html_url }}
-
-  iot-f40-x86:
-    needs: pr-info
-    if: ${{ needs.pr-info.outputs.allowed_user == 'true' && github.event.issue.pull_request }}
-    continue-on-error: true
-    runs-on: ubuntu-latest
-
-    steps:
-      - name: Clone repository
-        uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11  # v4
-        with:
-          ref: ${{ needs.pr-info.outputs.sha }}
-          fetch-depth: 0
-
-      - name: Run the tests
-        uses: sclorg/testing-farm-as-github-action@v3.1.2
-        with:
-          compose: Fedora-40
-          api_key: ${{ secrets.TF_API_KEY }}
-          git_url: ${{ needs.pr-info.outputs.repo_url }}
-          git_ref: ${{ needs.pr-info.outputs.ref }}
-          update_pull_request_status: true
-          pull_request_status_name: "iot-f40-x86"
-          tmt_context: "arch=x86_64;distro=fedora"
-          tmt_plan_regex: edge-x86
-          tf_scope: private
-          secrets: "DOWNLOAD_NODE=${{ secrets.DOWNLOAD_NODE }};QUAY_USERNAME=${{ secrets.QUAY_USERNAME }};QUAY_PASSWORD=${{ secrets.QUAY_PASSWORD }};DOCKERHUB_USERNAME=${{ secrets.DOCKERHUB_USERNAME }};DOCKERHUB_PASSWORD=${{ secrets.DOCKERHUB_PASSWORD }};AWS_ACCESS_KEY_ID=${{ secrets.AWS_ACCESS_KEY_ID }};AWS_SECRET_ACCESS_KEY=${{ secrets.AWS_SECRET_ACCESS_KEY }};GOVC_URL=${{ secrets.GOVC_URL }};GOVC_USERNAME=${{ secrets.GOVC_USERNAME }};GOVC_PASSWORD=${{ secrets.GOVC_PASSWORD }}"
-          variables: "ARCH=x86_64;AWS_DEFAULT_REGION=us-east-1;GOVC_INSECURE=1"
-
-  iot-f40-arm:
-    needs: pr-info
-    if: ${{ needs.pr-info.outputs.allowed_user == 'true' && github.event.issue.pull_request }}
-    continue-on-error: true
-    runs-on: ubuntu-latest
-
-    steps:
-      - name: Clone repository
-        uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11  # v4
-        with:
-          ref: ${{ needs.pr-info.outputs.sha }}
-          fetch-depth: 0
-
-      - name: Run the tests
-        uses: sclorg/testing-farm-as-github-action@v3.1.2
-        with:
-          compose: Fedora-40
-          api_key: ${{ secrets.TF_API_KEY }}
-          git_url: ${{ needs.pr-info.outputs.repo_url }}
-          git_ref: ${{ needs.pr-info.outputs.ref }}
-          update_pull_request_status: true
-          pull_request_status_name: "iot-f40-arm"
-          tmt_context: "arch=aarch64;distro=fedora"
-          tmt_plan_regex: edge-arm
-          tf_scope: private
-          secrets: "DOWNLOAD_NODE=${{ secrets.DOWNLOAD_NODE }};QUAY_USERNAME=${{ secrets.QUAY_USERNAME }};QUAY_PASSWORD=${{ secrets.QUAY_PASSWORD }};DOCKERHUB_USERNAME=${{ secrets.DOCKERHUB_USERNAME }};DOCKERHUB_PASSWORD=${{ secrets.DOCKERHUB_PASSWORD }};AWS_ACCESS_KEY_ID=${{ secrets.AWS_ACCESS_KEY_ID }};AWS_SECRET_ACCESS_KEY=${{ secrets.AWS_SECRET_ACCESS_KEY }};GOVC_URL=${{ secrets.GOVC_URL }};GOVC_USERNAME=${{ secrets.GOVC_USERNAME }};GOVC_PASSWORD=${{ secrets.GOVC_PASSWORD }}"
-          variables: "ARCH=aarch64;AWS_DEFAULT_REGION=us-east-1;GOVC_INSECURE=1"
diff --git a/.github/workflows/rhel-8-8.yml b/.github/workflows/rhel-8-8.yml
deleted file mode 100644
index aee081faa..000000000
--- a/.github/workflows/rhel-8-8.yml
+++ /dev/null
@@ -1,71 +0,0 @@
----
-name: Run Edge Test on RHEL 8.8.0
-
-on:
-  issue_comment:
-    types:
-      - created
-
-jobs:
-  pr-info:
-    if: ${{ github.event.issue.pull_request &&
-            (endsWith(github.event.comment.body, '/test-rhel-8-8')) }}
-    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 }}
-
-      - 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 }}
-      ref: ${{ fromJson(steps.pr-api.outputs.data).head.ref }}
-      repo_url: ${{ fromJson(steps.pr-api.outputs.data).head.repo.html_url }}
-
-  edge-rhel-88-x86:
-    needs: pr-info
-    if: ${{ needs.pr-info.outputs.allowed_user == 'true' && github.event.issue.pull_request }}
-    continue-on-error: true
-    runs-on: ubuntu-latest
-
-    steps:
-      - name: Clone repository
-        uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11  # v4
-        with:
-          ref: ${{ needs.pr-info.outputs.sha }}
-          fetch-depth: 0
-
-      - name: Run the tests
-        uses: sclorg/testing-farm-as-github-action@v3.1.2
-        with:
-          compose: RHEL-8.8.0-Nightly
-          arch: x86_64
-          api_key: ${{ secrets.TF_API_KEY }}
-          git_url: ${{ needs.pr-info.outputs.repo_url }}
-          git_ref: ${{ needs.pr-info.outputs.ref }}
-          update_pull_request_status: true
-          tmt_context: "arch=x86_64;distro=rhel-8-8"
-          pull_request_status_name: "edge-rhel-8.8-x86"
-          tmt_plan_regex: edge-x86
-          tf_scope: private
-          secrets: "DOWNLOAD_NODE=${{ secrets.DOWNLOAD_NODE }};OCP4_TOKEN=${{ secrets.OCP4_TOKEN }};QUAY_USERNAME=${{ secrets.QUAY_USERNAME }};QUAY_PASSWORD=${{ secrets.QUAY_PASSWORD }};DOCKERHUB_USERNAME=${{ secrets.DOCKERHUB_USERNAME }};DOCKERHUB_PASSWORD=${{ secrets.DOCKERHUB_PASSWORD }}"
-          variables: "ARCH=x86_64"
diff --git a/.github/workflows/rhel-9-3.yml b/.github/workflows/rhel-9-3.yml
deleted file mode 100644
index 0c5bdb62d..000000000
--- a/.github/workflows/rhel-9-3.yml
+++ /dev/null
@@ -1,100 +0,0 @@
----
-name: Run Edge Test on RHEL 9.3.0
-
-on:
-  issue_comment:
-    types:
-      - created
-
-jobs:
-  pr-info:
-    if: ${{ github.event.issue.pull_request &&
-            (endsWith(github.event.comment.body, '/test-rhel-9-3')) }}
-    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 }}
-
-      - 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 }}
-      ref: ${{ fromJson(steps.pr-api.outputs.data).head.ref }}
-      repo_url: ${{ fromJson(steps.pr-api.outputs.data).head.repo.html_url }}
-
-  edge-rhel-93-x86:
-    needs: pr-info
-    if: ${{ needs.pr-info.outputs.allowed_user == 'true' && github.event.issue.pull_request }}
-    continue-on-error: true
-    runs-on: ubuntu-latest
-
-    steps:
-      - name: Clone repository
-        uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11  # v4
-        with:
-          ref: ${{ needs.pr-info.outputs.sha }}
-          fetch-depth: 0
-
-      - name: Run the tests
-        uses: sclorg/testing-farm-as-github-action@v2
-        with:
-          compose: RHEL-9.3.0-Nightly
-          arch: x86_64
-          api_key: ${{ secrets.TF_API_KEY }}
-          git_url: ${{ needs.pr-info.outputs.repo_url }}
-          git_ref: ${{ needs.pr-info.outputs.ref }}
-          update_pull_request_status: true
-          tmt_context: "arch=x86_64;distro=rhel-9-3"
-          pull_request_status_name: "edge-rhel-9.3-x86"
-          tmt_plan_regex: edge-x86
-          tf_scope: private
-          secrets: "DOWNLOAD_NODE=${{ secrets.DOWNLOAD_NODE }};OCP4_TOKEN=${{ secrets.OCP4_TOKEN }};QUAY_USERNAME=${{ secrets.QUAY_USERNAME }};QUAY_PASSWORD=${{ secrets.QUAY_PASSWORD }};DOCKERHUB_USERNAME=${{ secrets.DOCKERHUB_USERNAME }};DOCKERHUB_PASSWORD=${{ secrets.DOCKERHUB_PASSWORD }};AWS_ACCESS_KEY_ID=${{ secrets.AWS_ACCESS_KEY_ID }};AWS_SECRET_ACCESS_KEY=${{ secrets.AWS_SECRET_ACCESS_KEY }};GOVC_URL=${{ secrets.GOVC_URL }};GOVC_USERNAME=${{ secrets.GOVC_USERNAME }};GOVC_PASSWORD=${{ secrets.GOVC_PASSWORD }}"
-          variables: "ARCH=x86_64;AWS_DEFAULT_REGION=us-east-1;GOVC_INSECURE=1"
-
-  edge-rhel-93-arm:
-    needs: pr-info
-    if: ${{ needs.pr-info.outputs.allowed_user == 'true' && github.event.issue.pull_request }}
-    continue-on-error: true
-    runs-on: ubuntu-latest
-
-    steps:
-      - name: Clone repository
-        uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11  # v4
-        with:
-          ref: ${{ needs.pr-info.outputs.sha }}
-          fetch-depth: 0
-
-      - name: Run the tests
-        uses: sclorg/testing-farm-as-github-action@v2
-        with:
-          compose: RHEL-9.3.0-Nightly
-          arch: aarch64
-          api_key: ${{ secrets.TF_API_KEY }}
-          git_url: ${{ needs.pr-info.outputs.repo_url }}
-          git_ref: ${{ needs.pr-info.outputs.ref }}
-          update_pull_request_status: true
-          tmt_context: "arch=aarch64;distro=rhel-9-3"
-          pull_request_status_name: "edge-rhel-9.3-arm"
-          tmt_plan_regex: edge-arm
-          tf_scope: private
-          secrets: "DOWNLOAD_NODE=${{ secrets.DOWNLOAD_NODE }};OCP4_TOKEN=${{ secrets.OCP4_TOKEN }};QUAY_USERNAME=${{ secrets.QUAY_USERNAME }};QUAY_PASSWORD=${{ secrets.QUAY_PASSWORD }};DOCKERHUB_USERNAME=${{ secrets.DOCKERHUB_USERNAME }};DOCKERHUB_PASSWORD=${{ secrets.DOCKERHUB_PASSWORD }};AWS_ACCESS_KEY_ID=${{ secrets.AWS_ACCESS_KEY_ID }};AWS_SECRET_ACCESS_KEY=${{ secrets.AWS_SECRET_ACCESS_KEY }};GOVC_URL=${{ secrets.GOVC_URL }};GOVC_USERNAME=${{ secrets.GOVC_USERNAME }};GOVC_PASSWORD=${{ secrets.GOVC_PASSWORD }}"
-          variables: "ARCH=aarch64;AWS_DEFAULT_REGION=us-east-1;GOVC_INSECURE=1"
diff --git a/.github/workflows/trigger-adds-on.yml b/.github/workflows/trigger-adds-on.yml
deleted file mode 100644
index c93596752..000000000
--- a/.github/workflows/trigger-adds-on.yml
+++ /dev/null
@@ -1,135 +0,0 @@
----
-name: Customer case test trigger
-
-on: workflow_dispatch
-
-env:
-  COMPOSE_URL_95: "http://${{ secrets.DOWNLOAD_NODE }}/rhel-9/nightly/RHEL-9"
-
-jobs:
-  check-compose:
-    # Do not run this job on any fork repos
-    if: github.repository == 'virt-s1/rhel-edge'
-    runs-on: container-runner
-    container: quay.io/fedora/fedora:38-x86_64
-    steps:
-      - uses: actions/checkout@v3
-
-      - name: Check compose and PRMs
-        id: check_compose_and_rpms
-        run: |
-          curl -s ${COMPOSE_URL_95}/latest-RHEL-9.5.0/COMPOSE_ID --output COMPOSE_ID_95
-          COMPOSE_ID_95=$(cat COMPOSE_ID_95)
-          echo "rhel95_compose=$COMPOSE_ID_95" >> $GITHUB_OUTPUT
-
-          FAPOLICYD_VERSION_95=$(curl -s "${COMPOSE_URL_95}/${COMPOSE_ID_95}/compose/AppStream/x86_64/os/Packages/" | grep -ioE ">fapolicyd-[0-9].*<" | tr -d "><")
-          echo "fapolicyd_version_95=$FAPOLICYD_VERSION_95" >> $GITHUB_OUTPUT
-
-          GRAFANA_PCP_VERSION_95=$(curl -s "${COMPOSE_URL_95}/${COMPOSE_ID_95}/compose/AppStream/x86_64/os/Packages/" | grep -ioE ">grafana-pcp-[0-9].*<" | tr -d "><")
-          echo "grafana_pcp_version_95=$GRAFANA_PCP_VERSION_95" >> $GITHUB_OUTPUT
-
-          PCP_VERSION_95=$(curl -s "${COMPOSE_URL_95}/${COMPOSE_ID_95}/compose/AppStream/x86_64/os/Packages/" | grep -ioE ">pcp-[0-9].*.x86_64.rpm<" | tr -d "><")
-          echo "pcp_version_95=$PCP_VERSION_95" >> $GITHUB_OUTPUT
-
-    outputs:
-      rhel95_compose: ${{ steps.check_compose_and_rpms.outputs.rhel95_compose }}
-      fapolicyd_version_95: ${{ steps.check_compose_and_rpms.outputs.fapolicyd_version_95 }}
-      grafana_pcp_version_95: ${{ steps.check_compose_and_rpms.outputs.grafana_pcp_version_95 }}
-      pcp_version_95: ${{ steps.check_compose_and_rpms.outputs.pcp_version_95 }}
-
-  fapolicyd:
-    needs: check-compose
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@v3
-
-      - name: Make change for PR creating
-        run: |
-          echo "fapolicyd" > adds-on/fapolicyd.run
-
-      - 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.fapolicyd_version_95 }} - ${{ 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.fapolicyd_version_95 }} - ${{ steps.date.outputs.date }}"
-          labels: DO_NOT_MERGE,fapolicyd
-          body: |
-            RHEL compose ${{ needs.check-compose.outputs.rhel95_compose }}
-            - Date: ${{ steps.date.outputs.date }}
-            - fapolicyd package info:
-                - ${{ needs.check-compose.outputs.fapolicyd_version_95 }}
-
-      - 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-fapolicyd-rhel-9-5
-
-      - 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: Customer Case
-          column-name: fapolicyd
-          issue-number: ${{ steps.cpr.outputs.pull-request-number }}
-
-  grafana-pcp:
-    needs: check-compose
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@v3
-
-      - name: Make change for PR creating
-        run: |
-          echo "grafana-pcp" > adds-on/grafana-pcp.run
-
-      - 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.pcp_version_95 }} - ${{ 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.pcp_version_95 }} - ${{ steps.date.outputs.date }}"
-          labels: DO_NOT_MERGE,grafana-pcp,pcp
-          body: |
-            RHEL compose ${{ needs.check-compose.outputs.rhel95_compose }}
-            - Date: ${{ steps.date.outputs.date }}
-            - grafana and pcp package info:
-                - ${{ needs.check-compose.outputs.grafana_pcp_version_95 }}
-                - ${{ needs.check-compose.outputs.pcp_version_95 }}
-
-      - 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-grafana-pcp-rhel-9-5
-
-      - 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: Customer Case
-          column-name: grafana-pcp
-          issue-number: ${{ steps.cpr.outputs.pull-request-number }}
diff --git a/.github/workflows/trigger-package.yml b/.github/workflows/trigger-package.yml
deleted file mode 100644
index db6aa1092..000000000
--- a/.github/workflows/trigger-package.yml
+++ /dev/null
@@ -1,275 +0,0 @@
----
-name: Package trigger
-
-on:
-  # Triggered by UMB
-  repository_dispatch:
-    types: [package]
-
-jobs:
-  pr-info:
-    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
-    outputs:
-      allowed_user: ${{ steps.check_user_perm.outputs.allowed_user }}
-
-  rhel-8:
-    needs: pr-info
-    if: ${{ needs.pr-info.outputs.allowed_user == 'true' && contains(github.event.client_payload.distro, 'el8') }}
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@v3
-
-      - name: Prepare package test PR
-        run: |
-          package_rpm="${{ github.event.client_payload.rpms }}"
-          echo "PACKAGE_RPM_LIST=\"$package_rpm\"" > packages/package_ci_trigger
-          cat packages/package_ci_trigger
-
-      - 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: "${{ github.event.client_payload.package_nvr }} - ${{ 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: "${{ github.event.client_payload.package_nvr }} - ${{ steps.date.outputs.date }}"
-          labels: DO_NOT_MERGE,RHEL-8.10.0
-          body: |
-            Package ${{ github.event.client_payload.package_nvr }}
-            - Date: ${{ steps.date.outputs.date }}
-
-      - 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-10
-
-      - 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: Packages
-          column-name: ${{ github.event.client_payload.package_name }}
-          issue-number: ${{ steps.cpr.outputs.pull-request-number }}
-
-  rhel-9:
-    needs: pr-info
-    if: ${{ needs.pr-info.outputs.allowed_user == 'true' && github.event.client_payload.distro == 'el9' }}
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@v3
-
-      - name: Prepare package test PR
-        run: |
-          package_rpm="${{ github.event.client_payload.rpms }}"
-          echo "PACKAGE_RPM_LIST=\"$package_rpm\"" > packages/package_ci_trigger
-          cat packages/package_ci_trigger
-
-      - 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: "${{ github.event.client_payload.package_nvr }} - ${{ 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: "${{ github.event.client_payload.package_nvr }} - ${{ steps.date.outputs.date }}"
-          labels: DO_NOT_MERGE,RHEL-9.4.0
-          body: |
-            Package ${{ github.event.client_payload.package_nvr }}
-            - Date: ${{ steps.date.outputs.date }}
-
-      - 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-9-4
-
-      - 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: Packages
-          column-name: ${{ github.event.client_payload.package_name }}
-          issue-number: ${{ steps.cpr.outputs.pull-request-number }}
-
-  rhel-9-3:
-    needs: pr-info
-    if: ${{ needs.pr-info.outputs.allowed_user == 'true' && github.event.client_payload.distro == 'el9_3' }}
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@v3
-
-      - name: Prepare package test PR
-        run: |
-          package_rpm="${{ github.event.client_payload.rpms }}"
-          echo "PACKAGE_RPM_LIST=\"$package_rpm\"" > packages/package_ci_trigger
-          cat packages/package_ci_trigger
-
-      - 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: "${{ github.event.client_payload.package_nvr }} - ${{ 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: "${{ github.event.client_payload.package_nvr }} - ${{ steps.date.outputs.date }}"
-          labels: DO_NOT_MERGE,RHEL-9.3.0
-          body: |
-            Package ${{ github.event.client_payload.package_nvr }}
-            - Date: ${{ steps.date.outputs.date }}
-
-      - 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-9-3
-
-      - 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: Packages
-          column-name: ${{ github.event.client_payload.package_name }}
-          issue-number: ${{ steps.cpr.outputs.pull-request-number }}
-
-  rhel-9-2:
-    needs: pr-info
-    if: ${{ needs.pr-info.outputs.allowed_user == 'true' && github.event.client_payload.distro == 'el9_2' }}
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@v3
-
-      - name: Prepare package test PR
-        run: |
-          package_rpm="${{ github.event.client_payload.rpms }}"
-          echo "PACKAGE_RPM_LIST=\"$package_rpm\"" > packages/package_ci_trigger
-          cat packages/package_ci_trigger
-
-      - 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: "${{ github.event.client_payload.package_nvr }} - ${{ 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: "${{ github.event.client_payload.package_nvr }} - ${{ steps.date.outputs.date }}"
-          labels: DO_NOT_MERGE,RHEL-9.2.0
-          body: |
-            Package ${{ github.event.client_payload.package_nvr }}
-            - Date: ${{ steps.date.outputs.date }}
-
-      - 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-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: Packages
-          column-name: ${{ github.event.client_payload.package_name }}
-          issue-number: ${{ steps.cpr.outputs.pull-request-number }}
-
-  rhel-9-0:
-    needs: pr-info
-    if: ${{ needs.pr-info.outputs.allowed_user == 'true' && github.event.client_payload.distro == 'el9_0' }}
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@v3
-
-      - name: Prepare package test PR
-        run: |
-          package_rpm="${{ github.event.client_payload.rpms }}"
-          echo "PACKAGE_RPM_LIST=\"$package_rpm\"" > packages/package_ci_trigger
-          cat packages/package_ci_trigger
-
-      - 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: "${{ github.event.client_payload.package_nvr }} - ${{ 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: "${{ github.event.client_payload.package_nvr }} - ${{ steps.date.outputs.date }}"
-          labels: DO_NOT_MERGE,RHEL-9.0.0
-          body: |
-            Package ${{ github.event.client_payload.package_nvr }}
-            - Date: ${{ steps.date.outputs.date }}
-
-      - 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-9-0
-
-      - 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: Packages
-          column-name: ${{ github.event.client_payload.package_name }}
-          issue-number: ${{ steps.cpr.outputs.pull-request-number }}
diff --git a/adds-on/ansible.cfg b/adds-on/ansible.cfg
deleted file mode 100644
index 2ffc410a9..000000000
--- a/adds-on/ansible.cfg
+++ /dev/null
@@ -1,8 +0,0 @@
-[defaults]
-timeout = 30
-# human-readable stdout/stderr results display
-stdout_callback = yaml
-
-[ssh_connection]
-scp_if_ssh=True
-pipelining=False
diff --git a/adds-on/fapolicyd-ks.cfg b/adds-on/fapolicyd-ks.cfg
deleted file mode 100644
index 8842b55b2..000000000
--- a/adds-on/fapolicyd-ks.cfg
+++ /dev/null
@@ -1,18 +0,0 @@
-text
-network --bootproto=dhcp --device=link --activate --onboot=on
-zerombr
-clearpart --all --initlabel --disklabel=msdos
-autopart --nohome --noswap --type=plain
-rootpw --lock --iscrypted locked
-user --name=admin --uid=1000 --groups=wheel --iscrypted --password=\$6\$1LgwKw9aOoAi/Zy9\$Pn3ErY1E8/yEanJ98evqKEW.DZp24HTuqXPJl6GYCm8uuobAmwxLv7rGCvTRZhxtcYdmC0.XnYRSR9Sh6de3p0
-sshkey --username=admin "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABgQCzxo5dEcS+LDK/OFAfHo6740EyoDM8aYaCkBala0FnWfMMTOq7PQe04ahB0eFLS3IlQtK5bpgzxBdFGVqF6uT5z4hhaPjQec0G3+BD5Pxo6V+SxShKZo+ZNGU3HVrF9p2V7QH0YFQj5B8F6AicA3fYh2BVUFECTPuMpy5A52ufWu0r4xOFmbU7SIhRQRAQz2u4yjXqBsrpYptAvyzzoN4gjUhNnwOHSPsvFpWoBFkWmqn0ytgHg3Vv9DlHW+45P02QH1UFedXR2MqLnwRI30qqtaOkVS+9rE/dhnR+XPpHHG+hv2TgMDAuQ3IK7Ab5m/yCbN73cxFifH4LST0vVG3Jx45xn+GTeHHhfkAfBSCtya6191jixbqyovpRunCBKexI5cfRPtWOitM3m7Mq26r7LpobMM+oOLUm4p0KKNIthWcmK9tYwXWSuGGfUQ+Y8gt7E0G06ZGbCPHOrxJ8lYQqXsif04piONPA/c9Hq43O99KPNGShONCS9oPFdOLRT3U= ostree-image-test"
-ostreesetup --nogpg --osname=rhel-edge --remote=rhel-edge --url=http://192.168.100.1/repo/ --ref=rhel/9/x86_64/edge
-poweroff
-%post --log=/var/log/anaconda/post-install.log --erroronfail
-# no sudo password for user admin
-echo -e 'admin\tALL=(ALL)\tNOPASSWD: ALL' >> /etc/sudoers
-# fapolicyd workaround to allow ansible
-cat > /etc/fapolicyd/rules.d/05-ansible-users.rules << EOF
-allow uid=1000 dir=/tmp/ansible
-allow uid=1000 dir=/var/home/admin/.ansible/tmp/
-%end
diff --git a/adds-on/fapolicyd.toml b/adds-on/fapolicyd.toml
deleted file mode 100644
index c9365a22f..000000000
--- a/adds-on/fapolicyd.toml
+++ /dev/null
@@ -1,16 +0,0 @@
-name = "container"
-description = "A base rhel-edge container image"
-version = "0.0.1"
-modules = []
-groups = []
-
-[[packages]]
-name = "python3"
-version = "*"
-
-[[packages]]
-name = "fapolicyd"
-version = "*"
-
-[customizations.services]
-enabled = ["fapolicyd"]
diff --git a/adds-on/fapolicyd.yaml b/adds-on/fapolicyd.yaml
deleted file mode 100644
index 91b8fadb3..000000000
--- a/adds-on/fapolicyd.yaml
+++ /dev/null
@@ -1,88 +0,0 @@
----
-- hosts: ostree_guest
-  become: no
-  vars:
-    total_counter: "0"
-    failed_counter: "0"
-
-  tasks:
-    # case: check fapolicyd service
-    - name: service fapolicyd should be started
-      block:
-        - name: service fapolicyd should be started
-          command: systemctl is-active fapolicyd
-          register: result_fapolicyd_service
-
-        - assert:
-            that:
-              - result_fapolicyd_service.stdout == 'active'
-            fail_msg: "service fapolicyd is not started"
-            success_msg: "service fapolicyd is started"
-      always:
-        - set_fact:
-            total_counter: "{{ total_counter | int + 1 }}"
-      rescue:
-        - name: failed count + 1
-          set_fact:
-            failed_counter: "{{ failed_counter | int + 1 }}"
-
-    # case: check installed packages
-    - name: check installed package
-      shell: rpm -qa | sort
-      register: result_packages
-
-    # case: check running container with podman
-    - name: run ubi8 image with root
-      command: podman run ubi8-minimal:latest cat /etc/redhat-release
-      register: podman_result
-      become: yes
-      retries: 30  # due to https://github.com/osbuild/osbuild-composer/issues/2492
-      delay: 2
-      until: podman_result is success
-      ignore_errors: yes
-
-    - name: run container test
-      block:
-        - assert:
-            that:
-              - podman_result is succeeded
-              - "'Red Hat Enterprise Linux release' in podman_result.stdout"
-            fail_msg: "failed run container with podman (root)"
-            success_msg: "running container with podman (root) succeeded"
-      always:
-        - set_fact:
-            total_counter: "{{ total_counter | int + 1 }}"
-      rescue:
-        - name: failed count + 1
-          set_fact:
-            failed_counter: "{{ failed_counter | int + 1 }}"
-
-    - name: run ubi8 image with non-root
-      command: podman run ubi8:latest cat /etc/redhat-release
-      register: podman_result
-      retries: 30  # due to https://github.com/osbuild/osbuild-composer/issues/2492
-      delay: 2
-      until: podman_result is success
-      ignore_errors: yes
-
-    - name: run container test
-      block:
-        - assert:
-            that:
-              - podman_result is succeeded
-              - "'Red Hat Enterprise Linux release' in podman_result.stdout"
-            fail_msg: "failed run container with podman (non-root)"
-            success_msg: "running container with podman (non-root) succeeded"
-      always:
-        - set_fact:
-            total_counter: "{{ total_counter | int + 1 }}"
-      rescue:
-        - name: failed count + 1
-          set_fact:
-            failed_counter: "{{ failed_counter | int + 1 }}"
-
-    - assert:
-        that:
-          - failed_counter == "0"
-        fail_msg: "Run {{ total_counter }} tests, but {{ failed_counter }} of them failed"
-        success_msg: "Totally {{ total_counter }} test passed"
diff --git a/adds-on/grafana-pcp-ks.cfg b/adds-on/grafana-pcp-ks.cfg
deleted file mode 100644
index 13cf51d32..000000000
--- a/adds-on/grafana-pcp-ks.cfg
+++ /dev/null
@@ -1,42 +0,0 @@
-text
-network --bootproto=dhcp --device=link --activate --onboot=on
-zerombr
-clearpart --all --initlabel --disklabel=msdos
-autopart --nohome --noswap --type=plain
-rootpw --lock --iscrypted locked
-user --name=admin --uid=1000 --groups=wheel --iscrypted --password=\$6\$1LgwKw9aOoAi/Zy9\$Pn3ErY1E8/yEanJ98evqKEW.DZp24HTuqXPJl6GYCm8uuobAmwxLv7rGCvTRZhxtcYdmC0.XnYRSR9Sh6de3p0
-sshkey --username=admin "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABgQCzxo5dEcS+LDK/OFAfHo6740EyoDM8aYaCkBala0FnWfMMTOq7PQe04ahB0eFLS3IlQtK5bpgzxBdFGVqF6uT5z4hhaPjQec0G3+BD5Pxo6V+SxShKZo+ZNGU3HVrF9p2V7QH0YFQj5B8F6AicA3fYh2BVUFECTPuMpy5A52ufWu0r4xOFmbU7SIhRQRAQz2u4yjXqBsrpYptAvyzzoN4gjUhNnwOHSPsvFpWoBFkWmqn0ytgHg3Vv9DlHW+45P02QH1UFedXR2MqLnwRI30qqtaOkVS+9rE/dhnR+XPpHHG+hv2TgMDAuQ3IK7Ab5m/yCbN73cxFifH4LST0vVG3Jx45xn+GTeHHhfkAfBSCtya6191jixbqyovpRunCBKexI5cfRPtWOitM3m7Mq26r7LpobMM+oOLUm4p0KKNIthWcmK9tYwXWSuGGfUQ+Y8gt7E0G06ZGbCPHOrxJ8lYQqXsif04piONPA/c9Hq43O99KPNGShONCS9oPFdOLRT3U= ostree-image-test"
-ostreesetup --nogpg --osname=rhel-edge --remote=rhel-edge --url=http://192.168.100.1/repo/ --ref=rhel/9/x86_64/edge
-poweroff
-%post --log=/var/log/anaconda/post-install.log --erroronfail
-# no sudo password for user admin
-echo -e 'admin\tALL=(ALL)\tNOPASSWD: ALL' >> /etc/sudoers
-
-# rpm-ostree fix
-. /etc/pcp.env
-
-if [ `id -u` != 0 ]; then
-    echo >&2 "Error: this script must run as root"
-elif [ ! -w "$PCP_VAR_DIR" ]; then
-    echo >&2 "Error: $PCP_VAR_DIR is not writable"
-else
-    echo "Setting up PCP selinux policy ..."
-    $PCP_BINADM_DIR/selinux-setup $PCP_VAR_DIR/selinux install pcpupstream
-
-    echo "Preparing for service restart ..."
-    touch $PCP_LOG_DIR/pmlogger/.NeedRewrite
-    touch $PCP_PMNS_DIR/.NeedRebuild
-
-    if [ -d $PCP_SHARE_DIR/zeroconf ]; then
-        echo "Enabling zeroconf metrics ..."
-        for PMDA in dm nfsclient openmetrics
-        do
-            touch $PCP_PMDAS_DIR/$PMDA/.NeedInstall
-        done
-    fi
-
-    echo "Restarting services ..."
-    systemctl restart pmcd pmlogger
-    echo "Done.  Have a nice day!"
-fi
-%end
diff --git a/adds-on/grafana-pcp.toml b/adds-on/grafana-pcp.toml
deleted file mode 100644
index 0564ac5d4..000000000
--- a/adds-on/grafana-pcp.toml
+++ /dev/null
@@ -1,20 +0,0 @@
-name = "container"
-description = "A base rhel-edge container image"
-version = "0.0.1"
-modules = []
-groups = []
-
-[[packages]]
-name = "python3"
-version = "*"
-
-[[packages]]
-name = "grafana-pcp"
-version = "*"
-
-[[packages]]
-name = "pcp"
-version = "*"
-
-[customizations.services]
-enabled = ["pmproxy"]
diff --git a/adds-on/grafana-pcp.yaml b/adds-on/grafana-pcp.yaml
deleted file mode 100644
index 910cf6489..000000000
--- a/adds-on/grafana-pcp.yaml
+++ /dev/null
@@ -1,88 +0,0 @@
----
-- hosts: ostree_guest
-  become: no
-  vars:
-    total_counter: "0"
-    failed_counter: "0"
-
-  tasks:
-    # case: check pmproxy service
-    - name: service pmproxy should be started
-      block:
-        - name: service pmproxy should be started
-          command: systemctl is-active pmproxy
-          register: result_pmproxy_service
-
-        - assert:
-            that:
-              - result_pmproxy_service.stdout == 'active'
-            fail_msg: "service pmproxy is not started"
-            success_msg: "service pmproxy is started"
-      always:
-        - set_fact:
-            total_counter: "{{ total_counter | int + 1 }}"
-      rescue:
-        - name: failed count + 1
-          set_fact:
-            failed_counter: "{{ failed_counter | int + 1 }}"
-
-    # case: check installed packages
-    - name: check installed package
-      shell: rpm -qa | sort
-      register: result_packages
-
-    # case: check running container with podman
-    - name: run ubi8 image with root
-      command: podman run ubi8-minimal:latest cat /etc/redhat-release
-      register: podman_result
-      become: yes
-      retries: 30  # due to https://github.com/osbuild/osbuild-composer/issues/2492
-      delay: 2
-      until: podman_result is success
-      ignore_errors: yes
-
-    - name: run container test
-      block:
-        - assert:
-            that:
-              - podman_result is succeeded
-              - "'Red Hat Enterprise Linux release' in podman_result.stdout"
-            fail_msg: "failed run container with podman (root)"
-            success_msg: "running container with podman (root) succeeded"
-      always:
-        - set_fact:
-            total_counter: "{{ total_counter | int + 1 }}"
-      rescue:
-        - name: failed count + 1
-          set_fact:
-            failed_counter: "{{ failed_counter | int + 1 }}"
-
-    - name: run ubi8 image with non-root
-      command: podman run ubi8:latest cat /etc/redhat-release
-      register: podman_result
-      retries: 30  # due to https://github.com/osbuild/osbuild-composer/issues/2492
-      delay: 2
-      until: podman_result is success
-      ignore_errors: yes
-
-    - name: run container test
-      block:
-        - assert:
-            that:
-              - podman_result is succeeded
-              - "'Red Hat Enterprise Linux release' in podman_result.stdout"
-            fail_msg: "failed run container with podman (non-root)"
-            success_msg: "running container with podman (non-root) succeeded"
-      always:
-        - set_fact:
-            total_counter: "{{ total_counter | int + 1 }}"
-      rescue:
-        - name: failed count + 1
-          set_fact:
-            failed_counter: "{{ failed_counter | int + 1 }}"
-
-    - assert:
-        that:
-          - failed_counter == "0"
-        fail_msg: "Run {{ total_counter }} tests, but {{ failed_counter }} of them failed"
-        success_msg: "Totally {{ total_counter }} test passed"
diff --git a/build-image.yaml b/build-image.yaml
deleted file mode 100644
index 517a847fd..000000000
--- a/build-image.yaml
+++ /dev/null
@@ -1,400 +0,0 @@
----
-- hosts: builder
-  become: no
-  vars:
-    upgrade: "false"
-    rebase: "false"
-    image_type: ""
-    repo_url: ""
-    quay_repo: ""
-    parent_ref: ""
-
-  tasks:
-    - name: check partition size
-      command: df -h
-      ignore_errors: yes
-      become: yes
-
-    - name: check memory usage
-      command: free -mh
-      ignore_errors: yes
-      become: yes
-
-    - name: install required packages
-      dnf:
-        name:
-          - osbuild-composer
-          - weldr-client
-          - jq
-          - curl
-          - skopeo
-        state: latest
-      become: yes
-
-    # composer-cli output format changed since weldr-client 35.6
-    - name: check weldr-client version
-      shell: rpm -qa | grep weldr-client | awk -F '-' '{print $3}'
-      register: package_result
-
-    - set_fact:
-        weldr_client_version: "{{ package_result.stdout }}"
-
-    - name: create /etc/osbuild-composer/repositories folder
-      file:
-        path: /etc/osbuild-composer/repositories
-        state: directory
-      become: yes
-
-    - name: copy rhel-88.json to /etc/osbuild-composer/repositories
-      copy:
-        src: "{{ playbook_dir }}/files/rhel-8-7-0.json"
-        dest: /etc/osbuild-composer/repositories/rhel-87.json
-      become: yes
-      when: ansible_facts['distribution_version'] == "8.7"
-
-    - name: copy rhel-88.json to /etc/osbuild-composer/repositories
-      copy:
-        src: "{{ playbook_dir }}/files/rhel-8-8-0.json"
-        dest: /etc/osbuild-composer/repositories/rhel-88.json
-      become: yes
-      when: ansible_facts['distribution_version'] == "8.8"
-
-    - name: copy rhel-92.json to /etc/osbuild-composer/repositories
-      copy:
-        src: "{{ playbook_dir }}/files/rhel-9-1-0.json"
-        dest: /etc/osbuild-composer/repositories/rhel-91.json
-      become: yes
-      when: ansible_facts['distribution_version'] == "9.1"
-
-    - name: copy rhel-92.json to /etc/osbuild-composer/repositories
-      copy:
-        src: "{{ playbook_dir }}/files/rhel-9-2-0.json"
-        dest: /etc/osbuild-composer/repositories/rhel-92.json
-      become: yes
-      when: ansible_facts['distribution_version'] == "9.2"
-
-    - name: copy rhel-88.json to /etc/osbuild-composer/repositories for rebase test
-      copy:
-        src: "{{ playbook_dir }}/files/rhel-8-8-0-sha512.json"
-        dest: /etc/osbuild-composer/repositories/rhel-88.json
-      become: yes
-      when: ansible_facts['distribution_version'] == "9.2"
-
-    - name: copy rhel-91.json to /etc/osbuild-composer/repositories for upgrade test
-      copy:
-        src: "{{ playbook_dir }}/files/rhel-9-1-0.json"
-        dest: /etc/osbuild-composer/repositories/rhel-91.json
-      become: yes
-      when: ansible_facts['distribution_version'] == "9.2"
-
-    - name: copy rhel-93.json to /etc/osbuild-composer/repositories
-      copy:
-        src: "{{ playbook_dir }}/files/rhel-9-3-0.json"
-        dest: /etc/osbuild-composer/repositories/rhel-93.json
-      become: yes
-      when: ansible_facts['distribution_version'] == "9.3"
-
-    - name: copy centos-stream-8.json to /etc/osbuild-composer/repositories
-      copy:
-        src: "{{ playbook_dir }}/files/centos-stream-8.json"
-        dest: /etc/osbuild-composer/repositories/centos-8.json
-      become: yes
-      when: ansible_facts['distribution_version'] == "8"
-
-    - name: copy centos-stream-8.json to /etc/osbuild-composer/repositories for rebase test
-      copy:
-        src: "{{ playbook_dir }}/files/centos-stream-8.json"
-        dest: /etc/osbuild-composer/repositories/centos-8.json
-      become: yes
-      when: ansible_facts['distribution_version'] == "9"
-
-    - name: copy centos-stream-9.json to /etc/osbuild-composer/repositories
-      copy:
-        src: "{{ playbook_dir }}/files/centos-stream-9.json"
-        dest: /etc/osbuild-composer/repositories/centos-9.json
-      become: yes
-      when: ansible_facts['distribution_version'] == "9"
-
-    - name: start osbuild-composer.socket
-      systemd:
-        name: osbuild-composer.socket
-        state: started
-      become: yes
-
-    - name: check fdo-admin-cli
-      shell: rpm -qa | grep fdo-admin-cli
-      register: fdo_installed
-      ignore_errors: True
-      check_mode: False
-      changed_when: False
-
-    - block:
-        # install fdo-client and fdo-init as a workaround of bug
-        # https://bugzilla.redhat.com/show_bug.cgi?id=2230537
-        - name: install fdo-admin-cli and pip
-          dnf:
-            name:
-              - fdo-admin-cli
-              - fdo-client
-              - fdo-init
-              - python3-pip
-            state: latest
-          become: yes
-
-        - name: install yq
-          pip:
-            name: yq
-          become: yes
-
-        - name: start fdo service
-          systemd:
-            name: fdo-aio
-            state: started
-          become: yes
-
-        - name: config re-encrypt
-          command: '/usr/local/bin/yq -iy ".service_info.diskencryption_clevis |= [{disk_label: \"/dev/vda3\", reencrypt: true, binding: {pin: \"tpm2\", config: \"{}\"}}]" /etc/fdo/aio/configs/serviceinfo_api_server.yml'
-          become: yes
-
-        - name: restart fdo-aio service
-          systemd:
-            name: fdo-aio
-            state: restarted
-          become: yes
-
-      when:
-        - fdo_installed.rc == 1
-        - image_type == "edge-simplified-installer" or image_type == "iot-simplified-installer"
-
-    # Change to /etc/fdo folder to workaround issue https://bugzilla.redhat.com/show_bug.cgi?id=2026795#c24
-    - name: config fdo user onboarding
-      shell: |
-        /usr/local/bin/yq -iy '.service_info.initial_user |= {username: "fdouser", sshkeys: ["ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABgQCzxo5dEcS+LDK/OFAfHo6740EyoDM8aYaCkBala0FnWfMMTOq7PQe04ahB0eFLS3IlQtK5bpgzxBdFGVqF6uT5z4hhaPjQec0G3+BD5Pxo6V+SxShKZo+ZNGU3HVrF9p2V7QH0YFQj5B8F6AicA3fYh2BVUFECTPuMpy5A52ufWu0r4xOFmbU7SIhRQRAQz2u4yjXqBsrpYptAvyzzoN4gjUhNnwOHSPsvFpWoBFkWmqn0ytgHg3Vv9DlHW+45P02QH1UFedXR2MqLnwRI30qqtaOkVS+9rE/dhnR+XPpHHG+hv2TgMDAuQ3IK7Ab5m/yCbN73cxFifH4LST0vVG3Jx45xn+GTeHHhfkAfBSCtya6191jixbqyovpRunCBKexI5cfRPtWOitM3m7Mq26r7LpobMM+oOLUm4p0KKNIthWcmK9tYwXWSuGGfUQ+Y8gt7E0G06ZGbCPHOrxJ8lYQqXsif04piONPA/c9Hq43O99KPNGShONCS9oPFdOLRT3U= ostree-image-test"]}' /etc/fdo/aio/configs/serviceinfo_api_server.yml
-        echo "fdouser ALL=(ALL) NOPASSWD: ALL" > /etc/fdo/fdouser
-        /usr/local/bin/yq -iy '.service_info.files |= [{path: "/etc/sudoers.d/fdouser", source_path: "/etc/fdo/fdouser"}]' /etc/fdo/aio/configs/serviceinfo_api_server.yml
-      become: yes
-      when:
-        - fdo_installed.rc == 1
-        - image_type == "edge-simplified-installer" or image_type == "iot-simplified-installer"
-        - (ansible_facts['distribution'] == 'RedHat' and ansible_facts ['distribution_version'] is version('9.2', '>=')) or (ansible_facts['distribution'] == 'CentOS' or ansible_facts ['distribution_version'] is version('9', '=='))
-
-    # disable selinux as a workaround of bug https://bugzilla.redhat.com/show_bug.cgi?id=2026795
-    - name: disable selinux
-      command: setenforce 0
-      become: yes
-      when:
-        - fdo_installed.rc == 1
-        - image_type == "edge-simplified-installer" or image_type == "iot-simplified-installer"
-        - (ansible_facts['distribution'] == 'RedHat' and ansible_facts ['distribution_version'] is version('9.3', '==')) or (ansible_facts['distribution'] == 'CentOS' or ansible_facts ['distribution_version'] is version('9', '=='))
-
-    - name: restart fdo service
-      systemd:
-        name: fdo-aio
-        state: restarted
-      become: yes
-      when:
-        - fdo_installed.rc == 1
-        - image_type == "edge-simplified-installer" or image_type == "iot-simplified-installer"
-        - (ansible_facts['distribution'] == 'RedHat' and ansible_facts ['distribution_version'] is version('9.2', '>=')) or (ansible_facts['distribution'] == 'CentOS' or ansible_facts ['distribution_version'] is version('9', '=='))
-
-    - name: get current date and time
-      command: date +'%Y-%m-%d %H:%M:%S'
-      register: date_result
-
-    - set_fact:
-        start_time: "{{ date_result.stdout }}"
-
-    - name: copy blueprint.toml to builder
-      copy:
-        src: /tmp/blueprint.toml
-        dest: /tmp/blueprint.toml
-
-    - name: push blueprint
-      command: composer-cli blueprints push /tmp/blueprint.toml
-      become: yes
-
-    - name: get blueprint name
-      command: composer-cli blueprints list
-      become: yes
-      register: bp_name_result
-
-    - set_fact:
-        bp_name: "{{ bp_name_result.stdout }}"
-
-    - name: depsolve blueprint
-      command: "composer-cli blueprints depsolve {{ bp_name }}"
-      become: yes
-
-    - name: start commit image or fedora container image building
-      shell: "composer-cli --json compose start-ostree --ref {{ ostree_ref }} {{ bp_name }} {{ image_type }} | tee /tmp/{{ image_type }}-compose-start"
-      become: yes
-      when:
-        - image_type == "edge-commit" or image_type == "iot-commit" or ((image_type == "edge-container" or image_type == "iot-container") and quay_repo == "")
-        - upgrade == "false"
-        - rebase == "false"
-
-    - name: copy quay_config.toml to builder
-      copy:
-        src: /tmp/quay_config.toml
-        dest: /tmp/quay_config.toml
-      when:
-        - image_type == "edge-container"
-        - quay_repo != ""
-        - upgrade == "false"
-
-    - name: start container image building with auto-upload enabled
-      shell: "composer-cli --json compose start-ostree --ref {{ ostree_ref }} {{ bp_name }} {{ image_type }} {{ quay_repo }} /tmp/quay_config.toml | tee /tmp/{{ image_type }}-compose-start"
-      become: yes
-      when:
-        - image_type == "edge-container"
-        - quay_repo != ""
-        - upgrade == "false"
-
-    - name: start installer or raw image building
-      shell: "composer-cli --json compose start-ostree --ref {{ ostree_ref }} --url {{ repo_url }} {{ bp_name }} {{ image_type }} | tee /tmp/{{ image_type }}-compose-start"
-      become: yes
-      when:
-        - image_type == "edge-installer" or image_type == "iot-installer" or image_type == "edge-raw-image" or image_type == "iot-raw-image" or image_type == "edge-simplified-installer" or image_type == "iot-simplified-installer"
-        - upgrade == "false"
-
-    - name: start upgrade image building
-      shell: "composer-cli --json compose start-ostree --ref {{ ostree_ref }} --url {{ repo_url }} {{ bp_name }} {{ image_type }} | tee /tmp/{{ image_type }}-compose-start"
-      become: yes
-      when: upgrade == "true"
-
-    - name: start rebase image building
-      shell: "composer-cli --json compose start-ostree --ref {{ ostree_ref }} --parent {{ parent_ref }} --url {{ repo_url }} {{ bp_name }} {{ image_type }} | tee /tmp/{{ image_type }}-compose-start"
-      become: yes
-      when: rebase == "true"
-
-    - name: start minimal raw image building
-      shell: "composer-cli --json compose start {{ bp_name }} {{ image_type }} | tee /tmp/{{ image_type }}-compose-start"
-      become: yes
-      when: image_type == "minimal-raw"
-
-    - name: get compose uuid for new weldr-client
-      command: jq -r '.[0].body.build_id' "/tmp/{{ image_type }}-compose-start"
-      register: compose_uuid_result
-      when: weldr_client_version is version('35.6', '>=')
-
-    - set_fact:
-        compose_uuid: "{{ compose_uuid_result.stdout }}"
-      when: weldr_client_version is version('35.6', '>=')
-
-    - name: get compose uuid for old weldr-client
-      command: jq -r '.body.build_id' "/tmp/{{ image_type }}-compose-start"
-      register: compose_uuid_result
-      when: weldr_client_version is version('35.6', '<')
-
-    - set_fact:
-        compose_uuid: "{{ compose_uuid_result.stdout }}"
-      when: weldr_client_version is version('35.6', '<')
-
-    - name: collect image building log no matter success or fail
-      block:
-        - name: wait until image building finished
-          command: composer-cli compose status
-          become: yes
-          register: compose_status
-          retries: 60
-          delay: 50
-          until: "'FINISHED' in compose_status.stdout"
-      always:
-        - name: check partition size
-          command: df -h
-          ignore_errors: yes
-          become: yes
-
-        - name: check memory usage
-          command: free -mh
-          ignore_errors: yes
-          become: yes
-
-        - name: show worker log
-          command: "journalctl -a --no-pager --since '{{ start_time }}' -u osbuild-worker@1.service"
-          become: yes
-
-        - name: collect compose log
-          shell: "composer-cli compose log {{ compose_uuid }} | tee /tmp/osbuild-{{ ansible_facts['distribution'] }}-{{ ansible_facts['distribution_version'] }}-{{ compose_uuid }}.log > /dev/null"
-          become: yes
-
-        - name: fetch log file back
-          fetch:
-            src: "/tmp/osbuild-{{ ansible_facts['distribution'] }}-{{ ansible_facts['distribution_version'] }}-{{ compose_uuid }}.log"
-            dest: "/tmp/osbuild-{{ ansible_facts['distribution'] }}-{{ ansible_facts['distribution_version'] }}-{{ compose_uuid }}.log"
-            flat: yes
-
-    - name: download ostree image
-      command: "composer-cli compose image {{ compose_uuid }}"
-      args:
-        chdir: /home/admin
-      become: yes
-      when: quay_repo == ""
-
-    - name: grant read permission to commit image file
-      file:
-        path: "/home/admin/{{ compose_uuid }}-commit.tar"
-        owner: admin
-        group: admin
-        mode: '0644'
-      become: yes
-      when: image_type == "edge-commit" or image_type == "iot-commit"
-
-    - name: grant read permission to container image file
-      file:
-        path: "/home/admin/{{ compose_uuid }}-container.tar"
-        owner: admin
-        group: admin
-        mode: '0644'
-      become: yes
-      when:
-        - quay_repo == ""
-        - image_type == "edge-container" or image_type == "iot-container"
-
-    - name: grant read permission to installer image file
-      file:
-        path: "/home/admin/{{ compose_uuid }}-installer.iso"
-        owner: admin
-        group: admin
-        mode: '0644'
-      become: yes
-      when:
-        - image_type == "edge-installer" or image_type == "iot-installer"
-
-    - name: grant read permission to raw image file
-      file:
-        path: "/home/admin/{{ compose_uuid }}-image.raw.xz"
-        owner: admin
-        group: admin
-        mode: '0644'
-      become: yes
-      when:
-        - image_type == "edge-raw-image" or image_type == "iot-raw-image"
-
-    - name: grant read permission to simplified installer image file
-      file:
-        path: "/home/admin/{{ compose_uuid }}-simplified-installer.iso"
-        owner: admin
-        group: admin
-        mode: '0644'
-      become: yes
-      when:
-        - image_type == "edge-simplified-installer" or image_type == "iot-simplified-installer"
-
-    - name: grant read permission to minimal raw image file
-      file:
-        path: "/home/admin/{{ compose_uuid }}-raw.img"
-        owner: admin
-        group: admin
-        mode: '0644'
-      become: yes
-      when:
-        - image_type == "minimal-raw"
-
-    - name: remove image
-      command: "composer-cli compose delete {{ compose_uuid }}"
-      become: yes
-
-    - name: remove blueprint
-      command: "composer-cli blueprints delete {{ bp_name }}"
-      become: yes
diff --git a/compose/compose.86 b/compose/compose.86
deleted file mode 100644
index ee7121344..000000000
--- a/compose/compose.86
+++ /dev/null
@@ -1,10 +0,0 @@
-RHEL-8.6.0-updates-20240517.67
-RHEL-8.6.0-updates-20240518.59
-RHEL-8.6.0-updates-20240520.71
-RHEL-8.6.0-updates-20240521.40
-RHEL-8.6.0-updates-20240521.74
-RHEL-8.6.0-updates-20240522.68
-RHEL-8.6.0-updates-20240528.1
-RHEL-8.6.0-updates-20240530.5
-RHEL-8.6.0-updates-20240531.2
-RHEL-8.6.0-updates-20240604.4
diff --git a/compose/compose.87 b/compose/compose.87
deleted file mode 100644
index 4e2ae1fb5..000000000
--- a/compose/compose.87
+++ /dev/null
@@ -1,10 +0,0 @@
-RHEL-8.7.0-updates-20230322.15
-RHEL-8.7.0-updates-20230323.23
-RHEL-8.7.0-updates-20230324.15
-RHEL-8.7.0-updates-20230325.18
-RHEL-8.7.0-updates-20230326.10
-RHEL-8.7.0-updates-20230327.13
-RHEL-8.7.0-updates-20230328.14
-RHEL-8.7.0-updates-20230401.19
-RHEL-8.7.0-updates-20230402.9
-RHEL-8.7.0-updates-20230403.13
diff --git a/compose/compose.88 b/compose/compose.88
deleted file mode 100644
index 7caabad5e..000000000
--- a/compose/compose.88
+++ /dev/null
@@ -1,16 +0,0 @@
-RHEL-8.8.0-updates-20240905.1
-RHEL-8.8.0-updates-20240908.1
-RHEL-8.8.0-updates-20240909.1
-RHEL-8.8.0-updates-20240916.1
-RHEL-8.8.0-updates-20240917.1
-RHEL-8.8.0-updates-20240918.1
-RHEL-8.8.0-updates-20240922.1
-RHEL-8.8.0-updates-20240923.1
-RHEL-8.8.0-updates-20240926.1
-RHEL-8.8.0-updates-20240930.1
-RHEL-8.8.0-updates-20240930.3
-RHEL-8.8.0-updates-20241001.1
-RHEL-8.8.0-updates-20241002.1
-RHEL-8.8.0-updates-20241006.1
-RHEL-8.8.0-updates-20241008.2
-RHEL-8.8.0-updates-20241012.1
diff --git a/compose/compose.89 b/compose/compose.89
deleted file mode 100644
index ebba912da..000000000
--- a/compose/compose.89
+++ /dev/null
@@ -1,10 +0,0 @@
-RHEL-8.9.0-updates-20240308.9
-RHEL-8.9.0-updates-20240310.10
-RHEL-8.9.0-updates-20240311.11
-RHEL-8.9.0-updates-20240312.11
-RHEL-8.9.0-updates-20240313.11
-RHEL-8.9.0-updates-20240314.11
-RHEL-8.9.0-updates-20240327.4
-RHEL-8.9.0-updates-20240329.4
-RHEL-8.9.0-updates-20240330.4
-RHEL-8.9.0-updates-20240331.4
diff --git a/compose/compose.90 b/compose/compose.90
deleted file mode 100644
index 848c1bdad..000000000
--- a/compose/compose.90
+++ /dev/null
@@ -1,10 +0,0 @@
-RHEL-9.0.0-updates-20240521.39
-RHEL-9.0.0-updates-20240521.81
-RHEL-9.0.0-updates-20240522.75
-RHEL-9.0.0-updates-20240523.71
-RHEL-9.0.0-updates-20240524.44
-RHEL-9.0.0-updates-20240525.39
-RHEL-9.0.0-updates-20240528.7
-RHEL-9.0.0-updates-20240604.12
-RHEL-9.0.0-updates-20240603.7
-RHEL-9.0.0-updates-20240609.7
diff --git a/compose/compose.91 b/compose/compose.91
deleted file mode 100644
index 63661afff..000000000
--- a/compose/compose.91
+++ /dev/null
@@ -1,10 +0,0 @@
-RHEL-9.1.0-updates-20230330.53
-RHEL-9.1.0-updates-20230401.52
-RHEL-9.1.0-updates-20230403.53
-RHEL-9.1.0-updates-20230404.39
-RHEL-9.1.0-updates-20230404.54
-RHEL-9.1.0-updates-20230405.48
-RHEL-9.1.0-updates-20230407.42
-RHEL-9.1.0-updates-20230408.44
-RHEL-9.1.0-updates-20230409.49
-RHEL-9.1.0-updates-20230410.43
diff --git a/compose/compose.92 b/compose/compose.92
deleted file mode 100644
index 1a4284903..000000000
--- a/compose/compose.92
+++ /dev/null
@@ -1,10 +0,0 @@
-RHEL-9.2.0-updates-20240504.2
-RHEL-9.2.0-updates-20240507.2
-RHEL-9.2.0-updates-20240511.4
-RHEL-9.2.0-updates-20240512.1
-RHEL-9.2.0-updates-20240518.3
-RHEL-9.2.0-updates-20240521.93
-RHEL-9.2.0-updates-20240526.41
-RHEL-9.2.0-updates-20240528.17
-RHEL-9.2.0-updates-20240603.16
-RHEL-9.2.0-updates-20240606.15
diff --git a/compose/compose.93 b/compose/compose.93
deleted file mode 100644
index cf11d3fea..000000000
--- a/compose/compose.93
+++ /dev/null
@@ -1,10 +0,0 @@
-RHEL-9.3.0-updates-20240205.32
-RHEL-9.3.0-updates-20240206.37
-RHEL-9.3.0-updates-20240207.34
-RHEL-9.3.0-updates-20240212.33
-RHEL-9.3.0-updates-20240215.46
-RHEL-9.3.0-updates-20240218.42
-RHEL-9.3.0-updates-20240219.44
-RHEL-9.3.0-updates-20240220.34
-RHEL-9.3.0-updates-20240229.27
-RHEL-9.3.0-updates-20240304.30
diff --git a/compose/compose.cs8 b/compose/compose.cs8
deleted file mode 100644
index 84e4c6610..000000000
--- a/compose/compose.cs8
+++ /dev/null
@@ -1,10 +0,0 @@
-CentOS-Stream-8-20240401.0
-CentOS-Stream-8-20240405.0
-CentOS-Stream-8-20240408.0
-CentOS-Stream-8-20240415.0
-CentOS-Stream-8-20240424.0
-CentOS-Stream-8-20240429.0
-CentOS-Stream-8-20240506.0
-CentOS-Stream-8-20240513.0
-CentOS-Stream-8-20240520.0
-CentOS-Stream-8-20240527.0
diff --git a/packages/Jenkinsfile.fido-device-onboard b/packages/Jenkinsfile.fido-device-onboard
deleted file mode 100644
index 7aa9878a0..000000000
--- a/packages/Jenkinsfile.fido-device-onboard
+++ /dev/null
@@ -1,42 +0,0 @@
-pipeline {
-    agent {
-        node {
-            label 'jslave-libguestfs'
-        }
-    }
-    stages {
-        stage("Trigger github workflow") {
-            steps {
-                script {
-                    print env.CI_MESSAGE
-                    sh('printenv')
-
-                    // Package NVR
-                    env.NVR=sh(returnStdout: true, script: "echo \$CI_MESSAGE | jq '.info.request[0]' --raw-output | grep -ioE 'fido-device-onboard.*.rpm\$' | sed 's/.src//'").trim()
-                    print env.NVR
-
-                    // Build name
-                    currentBuild.displayName = "${env.BUILD_NUMBER} - Package: ${env.NVR}"
-
-                    // Trigger github workflow
-                    withCredentials([string(credentialsId: 'github-cloudkitbot-pat', variable: 'GITHUB_PAT')]) {
-                        sh '''#!/bin/bash
-                            package_list=$(echo $CI_MESSAGE | jq -r '.info.result.rpms | join(",")')
-                            package_nvr=$(echo $CI_MESSAGE | jq '.info.request[0]' --raw-output | grep -ioE 'fido-device-onboard.*.rpm$' | sed 's/.src//')
-                            echo $package_list
-                            echo $package_nvr
-
-                            echo "{\\"event_type\\": \\"package\\",\\"client_payload\\": {\\"distro\\": \\"$TEST_OS\\",\\"package_name\\": \\"fido-device-onboard\\",\\"package_nvr\\": \\"$package_nvr\\",\\"rpms\\": \\"$package_list\\"}}"
-                            curl -X POST -H "Accept: application/vnd.github.v3+json" -H "authorization: Bearer $GITHUB_PAT" https://api.github.com/repos/virt-s1/rhel-edge/dispatches -d "{\\"event_type\\": \\"package\\",\\"client_payload\\": {\\"distro\\": \\"$TEST_OS\\",\\"package_name\\": \\"fido-device-onboard\\",\\"package_nvr\\": \\"$package_nvr\\",\\"rpms\\": \\"$package_list\\"}}"
-                        '''
-                    }
-                }
-            }
-        }
-    }
-    post {
-        always {
-            cleanWs()
-        }
-    }
-}
diff --git a/packages/Jenkinsfile.greenboot b/packages/Jenkinsfile.greenboot
deleted file mode 100644
index f72fdc676..000000000
--- a/packages/Jenkinsfile.greenboot
+++ /dev/null
@@ -1,42 +0,0 @@
-pipeline {
-    agent {
-        node {
-            label 'jslave-libguestfs'
-        }
-    }
-    stages {
-        stage("Trigger github workflow") {
-            steps {
-                script {
-                    print env.CI_MESSAGE
-                    sh('printenv')
-
-                    // Package NVR
-                    env.NVR=sh(returnStdout: true, script: "echo \$CI_MESSAGE | jq '.info.request[0]' --raw-output | grep -ioE 'greenboot.*.rpm\$' | sed 's/.src//'").trim()
-                    print env.NVR
-
-                    // Build name
-                    currentBuild.displayName = "${env.BUILD_NUMBER} - Package: ${env.NVR}"
-
-                    // Trigger github workflow
-                    withCredentials([string(credentialsId: 'github-cloudkitbot-pat', variable: 'GITHUB_PAT')]) {
-                        sh '''#!/bin/bash
-                            package_list=$(echo $CI_MESSAGE | jq -r '.info.result.rpms | join(",")')
-                            package_nvr=$(echo $CI_MESSAGE | jq '.info.request[0]' --raw-output | grep -ioE 'greenboot.*.rpm$' | sed 's/.src//')
-                            echo $package_list
-                            echo $package_nvr
-
-                            echo "{\\"event_type\\": \\"package\\",\\"client_payload\\": {\\"distro\\": \\"$TEST_OS\\",\\"package_name\\": \\"greenboot\\",\\"package_nvr\\": \\"$package_nvr\\",\\"rpms\\": \\"$package_list\\"}}"
-                            curl -X POST -H "Accept: application/vnd.github.v3+json" -H "authorization: Bearer $GITHUB_PAT" https://api.github.com/repos/virt-s1/rhel-edge/dispatches -d "{\\"event_type\\": \\"package\\",\\"client_payload\\": {\\"distro\\": \\"$TEST_OS\\",\\"package_name\\": \\"greenboot\\",\\"package_nvr\\": \\"$package_nvr\\",\\"rpms\\": \\"$package_list\\"}}"
-                        '''
-                    }
-                }
-            }
-        }
-    }
-    post {
-        always {
-            cleanWs()
-        }
-    }
-}
diff --git a/packages/Jenkinsfile.ostree b/packages/Jenkinsfile.ostree
deleted file mode 100644
index eca256eb7..000000000
--- a/packages/Jenkinsfile.ostree
+++ /dev/null
@@ -1,42 +0,0 @@
-pipeline {
-    agent {
-        node {
-            label 'jslave-libguestfs'
-        }
-    }
-    stages {
-        stage("Trigger github workflow") {
-            steps {
-                script {
-                    print env.CI_MESSAGE
-                    sh('printenv')
-
-                    // Package NVR
-                    env.NVR=sh(returnStdout: true, script: "echo \$CI_MESSAGE | jq '.info.request[0]' --raw-output | grep -ioE 'ostree.*.rpm\$' | sed 's/.src//'").trim()
-                    print env.NVR
-
-                    // Build name
-                    currentBuild.displayName = "${env.BUILD_NUMBER} - Package: ${env.NVR}"
-
-                    // Trigger github workflow
-                    withCredentials([string(credentialsId: 'github-cloudkitbot-pat', variable: 'GITHUB_PAT')]) {
-                        sh '''#!/bin/bash
-                            package_list=$(echo $CI_MESSAGE | jq -r '.info.result.rpms | join(",")')
-                            package_nvr=$(echo $CI_MESSAGE | jq '.info.request[0]' --raw-output | grep -ioE 'ostree.*.rpm$' | sed 's/.src//')
-                            echo $package_list
-                            echo $package_nvr
-
-                            echo "{\\"event_type\\": \\"package\\",\\"client_payload\\": {\\"distro\\": \\"$TEST_OS\\",\\"package_name\\": \\"ostree\\",\\"package_nvr\\": \\"$package_nvr\\",\\"rpms\\": \\"$package_list\\"}}"
-                            curl -X POST -H "Accept: application/vnd.github.v3+json" -H "authorization: Bearer $GITHUB_PAT" https://api.github.com/repos/virt-s1/rhel-edge/dispatches -d "{\\"event_type\\": \\"package\\",\\"client_payload\\": {\\"distro\\": \\"$TEST_OS\\",\\"package_name\\": \\"ostree\\",\\"package_nvr\\": \\"$package_nvr\\",\\"rpms\\": \\"$package_list\\"}}"
-                        '''
-                    }
-                }
-            }
-        }
-    }
-    post {
-        always {
-            cleanWs()
-        }
-    }
-}
diff --git a/packages/Jenkinsfile.rpm-ostree b/packages/Jenkinsfile.rpm-ostree
deleted file mode 100644
index 101b81c7b..000000000
--- a/packages/Jenkinsfile.rpm-ostree
+++ /dev/null
@@ -1,42 +0,0 @@
-pipeline {
-    agent {
-        node {
-            label 'jslave-libguestfs'
-        }
-    }
-    stages {
-        stage("Trigger github workflow") {
-            steps {
-                script {
-                    print env.CI_MESSAGE
-                    sh('printenv')
-
-                    // Package NVR
-                    env.NVR=sh(returnStdout: true, script: "echo \$CI_MESSAGE | jq '.info.request[0]' --raw-output | grep -ioE 'rpm-ostree.*.rpm\$' | sed 's/.src//'").trim()
-                    print env.NVR
-
-                    // Build name
-                    currentBuild.displayName = "${env.BUILD_NUMBER} - Package: ${env.NVR}"
-
-                    // Trigger github workflow
-                    withCredentials([string(credentialsId: 'github-cloudkitbot-pat', variable: 'GITHUB_PAT')]) {
-                        sh '''#!/bin/bash
-                            package_list=$(echo $CI_MESSAGE | jq -r '.info.result.rpms | join(",")')
-                            package_nvr=$(echo $CI_MESSAGE | jq '.info.request[0]' --raw-output | grep -ioE 'rpm-ostree.*.rpm$' | sed 's/.src//')
-                            echo $package_list
-                            echo $package_nvr
-
-                            echo "{\\"event_type\\": \\"package\\",\\"client_payload\\": {\\"distro\\": \\"$TEST_OS\\",\\"package_name\\": \\"rpm-ostree\\",\\"package_nvr\\": \\"$package_nvr\\",\\"rpms\\": \\"$package_list\\"}}"
-                            curl -X POST -H "Accept: application/vnd.github.v3+json" -H "authorization: Bearer $GITHUB_PAT" https://api.github.com/repos/virt-s1/rhel-edge/dispatches -d "{\\"event_type\\": \\"package\\",\\"client_payload\\": {\\"distro\\": \\"$TEST_OS\\",\\"package_name\\": \\"rpm-ostree\\",\\"package_nvr\\": \\"$package_nvr\\",\\"rpms\\": \\"$package_list\\"}}"
-                        '''
-                    }
-                }
-            }
-        }
-    }
-    post {
-        always {
-            cleanWs()
-        }
-    }
-}
diff --git a/packages/Jenkinsfile.rust-coreos-installer b/packages/Jenkinsfile.rust-coreos-installer
deleted file mode 100644
index e9fd5208a..000000000
--- a/packages/Jenkinsfile.rust-coreos-installer
+++ /dev/null
@@ -1,42 +0,0 @@
-pipeline {
-    agent {
-        node {
-            label 'jslave-libguestfs'
-        }
-    }
-    stages {
-        stage("Trigger github workflow") {
-            steps {
-                script {
-                    print env.CI_MESSAGE
-                    sh('printenv')
-
-                    // Package NVR
-                    env.NVR=sh(returnStdout: true, script: "echo \$CI_MESSAGE | jq '.info.request[0]' --raw-output | grep -ioE 'rust-coreos-installer.*.rpm\$' | sed 's/.src//'").trim()
-                    print env.NVR
-
-                    // Build name
-                    currentBuild.displayName = "${env.BUILD_NUMBER} - Package: ${env.NVR}"
-
-                    // Trigger github workflow
-                    withCredentials([string(credentialsId: 'github-cloudkitbot-pat', variable: 'GITHUB_PAT')]) {
-                        sh '''#!/bin/bash
-                            package_list=$(echo $CI_MESSAGE | jq -r '.info.result.rpms | join(",")')
-                            package_nvr=$(echo $CI_MESSAGE | jq '.info.request[0]' --raw-output | grep -ioE 'rust-coreos-installer.*.rpm$' | sed 's/.src//')
-                            echo $package_list
-                            echo $package_nvr
-
-                            echo "{\\"event_type\\": \\"package\\",\\"client_payload\\": {\\"distro\\": \\"$TEST_OS\\",\\"package_name\\": \\"rust-coreos-installer\\",\\"package_nvr\\": \\"$package_nvr\\",\\"rpms\\": \\"$package_list\\"}}"
-                            curl -X POST -H "Accept: application/vnd.github.v3+json" -H "authorization: Bearer $GITHUB_PAT" https://api.github.com/repos/virt-s1/rhel-edge/dispatches -d "{\\"event_type\\": \\"package\\",\\"client_payload\\": {\\"distro\\": \\"$TEST_OS\\",\\"package_name\\": \\"rust-coreos-installer\\",\\"package_nvr\\": \\"$package_nvr\\",\\"rpms\\": \\"$package_list\\"}}"
-                        '''
-                    }
-                }
-            }
-        }
-    }
-    post {
-        always {
-            cleanWs()
-        }
-    }
-}
diff --git a/tools/Dockerfile.ansible.aarch64 b/tools/Dockerfile.ansible.aarch64
deleted file mode 100644
index 82ef50fe2..000000000
--- a/tools/Dockerfile.ansible.aarch64
+++ /dev/null
@@ -1,19 +0,0 @@
-FROM quay.io/fedora/fedora:37-aarch64
-
-LABEL name="ansible_runner" \
-      maintainer="xiaofwan@redhat.com" \
-      version="1" \
-      release="1" \
-      description="Run Ansible inside container"
-
-RUN dnf -y update && \
-    dnf -y install \
-        openssh-clients \
-        ansible-core \
-        curl \
-        net-tools \
-        python3 && \
-    dnf clean all && \
-    ansible-galaxy collection install community.general
-
-WORKDIR /work
diff --git a/tools/Dockerfile.ansible.x86_64 b/tools/Dockerfile.ansible.x86_64
deleted file mode 100644
index 49d6e329e..000000000
--- a/tools/Dockerfile.ansible.x86_64
+++ /dev/null
@@ -1,19 +0,0 @@
-FROM quay.io/fedora/fedora:37-x86_64
-
-LABEL name="ansible_runner" \
-      maintainer="xiaofwan@redhat.com" \
-      version="1" \
-      release="1" \
-      description="Run Ansible inside container"
-
-RUN dnf -y update && \
-    dnf -y install \
-        openssh-clients \
-        ansible-core \
-        curl \
-        net-tools \
-        python3 && \
-    dnf clean all && \
-    ansible-galaxy collection install community.general
-
-WORKDIR /work
diff --git a/tools/README.md b/tools/README.md
deleted file mode 100644
index b8658bf5f..000000000
--- a/tools/README.md
+++ /dev/null
@@ -1,41 +0,0 @@
-# Edge Toolset
-
-## Setup osbuild and osbuild-composer mock repo
-
-        $ ./mock_repo.sh <osbuild-composer commit sha> <osbuild commit sha>
-
-## Download and Upload OpenStack CentOS Stream image
-
-        $ cd playbook
-        $ TEST_OS=centos-stream-8 ARCH=x86_64 ansible-playbook -v -i inventory image-build.yaml
-
-## Deploy OpenStack VM for Edge testing
-
-        $ cd playbook
-        $ TEST_OS=centos-stream-8 ARCH=x86_64 ansible-playbook -v -i inventory vm-deploy.yaml
-
-## Deploy Edge container image on OpenShift 4
-
-        $ oc login --token=<token> --server=https://api.ocp4.prod.psi.redhat.com:6443
-        $ oc oc process -f tools/edge-stage-server-template.yaml | oc apply -f -
-
-## Setup RPM repo for source import
-
-        # Please copy or move all RPM packages, which are used by source, into /tmp/rpms
-        $ ./mock_source.sh
-
-## Configuration
-
-You can set these environment variables to run test
-
-    TEST_OS            The OS to run the tests in.  Currently supported values:
-                           "rhel-8-6"
-                           "rhel-8-7"
-                           "rhel-9-0"
-                           "rhel-9-1"
-                           "centos-stream-8"
-                           "centos-stream-9"
-                           "fedora-34"
-                           "fedora-35"
-    ARCH               The arch to build image and run test on.  Currently supported values:
-                           "x86_64"
diff --git a/arm-commit.sh b/tools/arm-commit.sh
similarity index 100%
rename from arm-commit.sh
rename to tools/arm-commit.sh
diff --git a/arm-ignition.sh b/tools/arm-ignition.sh
similarity index 100%
rename from arm-ignition.sh
rename to tools/arm-ignition.sh
diff --git a/arm-installer.sh b/tools/arm-installer.sh
similarity index 100%
rename from arm-installer.sh
rename to tools/arm-installer.sh
diff --git a/arm-minimal.sh b/tools/arm-minimal.sh
similarity index 100%
rename from arm-minimal.sh
rename to tools/arm-minimal.sh
diff --git a/arm-raw.sh b/tools/arm-raw.sh
similarity index 100%
rename from arm-raw.sh
rename to tools/arm-raw.sh
diff --git a/arm-rebase.sh b/tools/arm-rebase.sh
similarity index 100%
rename from arm-rebase.sh
rename to tools/arm-rebase.sh
diff --git a/arm-simplified.sh b/tools/arm-simplified.sh
similarity index 100%
rename from arm-simplified.sh
rename to tools/arm-simplified.sh
diff --git a/tools/deploy_bare.sh b/tools/deploy_bare.sh
deleted file mode 100755
index 331bc892c..000000000
--- a/tools/deploy_bare.sh
+++ /dev/null
@@ -1,142 +0,0 @@
-#!/bin/bash
-set -euox pipefail
-
-# Dumps details about the instance running the CI job.
-CPUS=$(nproc)
-MEM=$(free -m | grep -oP '\d+' | head -n 1)
-DISK=$(df --output=size -h / | sed '1d;s/[^0-9]//g')
-HOSTNAME=$(uname -n)
-USER=$(whoami)
-ARCH=$(uname -m)
-KERNEL=$(uname -r)
-
-echo -e "\033[0;36m"
-cat << EOF
-------------------------------------------------------------------------------
-CI MACHINE SPECS
-------------------------------------------------------------------------------
-     Hostname: ${HOSTNAME}
-         User: ${USER}
-         CPUs: ${CPUS}
-          RAM: ${MEM} MB
-         DISK: ${DISK} GB
-         ARCH: ${ARCH}
-       KERNEL: ${KERNEL}
-------------------------------------------------------------------------------
-EOF
-echo "CPU info"
-lscpu
-echo -e "\033[0m"
-
-# Colorful output.
-function greenprint {
-    echo -e "\033[1;32m${1}\033[0m"
-}
-
-# set locale to en_US.UTF-8
-sudo dnf install -y glibc-langpack-en
-sudo localectl set-locale LANG=en_US.UTF-8
-
-# Install required packages
-# openssl is required by simplified install test
-greenprint "Install required packages"
-sudo dnf install -y --nogpgcheck httpd xorriso podman wget firewalld curl jq lorax qemu-img qemu-kvm libvirt-client libvirt-daemon-kvm virt-install ostree rpm-ostree openssl
-
-# Start httpd server as prod ostree repo
-greenprint "Start httpd service"
-sudo systemctl enable --now httpd.service
-
-# Start firewalld
-greenprint "Start firewalld"
-sudo systemctl enable --now firewalld
-
-# Start libvirtd and test it.
-greenprint "🚀 Starting libvirt daemon"
-sudo systemctl start libvirtd
-sudo virsh list --all > /dev/null
-
-# Set a customized dnsmasq configuration for libvirt so we always get the same address on boot-up.
-greenprint "💡 Setup libvirt network"
-if [ "$ARCH" == "aarch64" ]; then
-    # code 00024 comes from https://www.mail-archive.com/edk2-devel@lists.01.org/msg14683.html
-    sudo tee /tmp/integration.xml > /dev/null << EOF
-<network xmlns:dnsmasq='http://libvirt.org/schemas/network/dnsmasq/1.0'>
-<name>integration</name>
-<uuid>1c8fe98c-b53a-4ca4-bbdb-deb0f26b3579</uuid>
-<forward mode='nat'>
-    <nat>
-    <port start='1024' end='65535'/>
-    </nat>
-</forward>
-<bridge name='integration' zone='trusted' stp='on' delay='0'/>
-<mac address='52:54:00:36:46:ef'/>
-<ip address='192.168.100.1' netmask='255.255.255.0'>
-    <dhcp>
-    <range start='192.168.100.2' end='192.168.100.254'/>
-    </dhcp>
-</ip>
-<dnsmasq:options>
-    <dnsmasq:option value='dhcp-vendorclass=set:efi-http,HTTPClient:Arch:00024'/>
-    <dnsmasq:option value='dhcp-option-force=tag:efi-http,60,HTTPClient'/>
-    <dnsmasq:option value='dhcp-boot=tag:efi-http,&quot;http://192.168.100.1/httpboot/EFI/BOOT/BOOTAA64.EFI&quot;'/>
-</dnsmasq:options>
-</network>
-EOF
-else
-    sudo tee /tmp/integration.xml > /dev/null << EOF
-<network xmlns:dnsmasq='http://libvirt.org/schemas/network/dnsmasq/1.0'>
-  <name>integration</name>
-  <uuid>1c8fe98c-b53a-4ca4-bbdb-deb0f26b3579</uuid>
-  <forward mode='nat'>
-    <nat>
-      <port start='1024' end='65535'/>
-    </nat>
-  </forward>
-  <bridge name='integration' zone='trusted' stp='on' delay='0'/>
-  <mac address='52:54:00:36:46:ef'/>
-  <ip address='192.168.100.1' netmask='255.255.255.0'>
-    <dhcp>
-      <range start='192.168.100.2' end='192.168.100.254'/>
-      <host mac='34:49:22:B0:83:30' name='vm-1' ip='192.168.100.50'/>
-      <host mac='34:49:22:B0:83:31' name='vm-2' ip='192.168.100.51'/>
-      <host mac='34:49:22:B0:83:32' name='vm-3' ip='192.168.100.52'/>
-    </dhcp>
-  </ip>
-  <dnsmasq:options>
-    <dnsmasq:option value='dhcp-vendorclass=set:efi-http,HTTPClient:Arch:00016'/>
-    <dnsmasq:option value='dhcp-option-force=tag:efi-http,60,HTTPClient'/>
-    <dnsmasq:option value='dhcp-boot=tag:efi-http,&quot;http://192.168.100.1/httpboot/EFI/BOOT/BOOTX64.EFI&quot;'/>
-  </dnsmasq:options>
-</network>
-EOF
-fi
-if ! sudo virsh net-info integration > /dev/null 2>&1; then
-    sudo virsh net-define /tmp/integration.xml
-fi
-if [[ $(sudo virsh net-info integration | grep 'Active' | awk '{print $2}') == 'no' ]]; then
-    sudo virsh net-start integration
-fi
-
-# Allow anyone in the wheel group to talk to libvirt.
-greenprint "🚪 Allowing users in wheel group to talk to libvirt"
-sudo tee /etc/polkit-1/rules.d/50-libvirt.rules > /dev/null << EOF
-polkit.addRule(function(action, subject) {
-    if (action.id == "org.libvirt.unix.manage" &&
-        subject.isInGroup("adm")) {
-            return polkit.Result.YES;
-    }
-});
-EOF
-
-# For bare metal server only
-if [ "$(systemd-detect-virt)" == "none" ]; then
-    # Extend the logical volume "/", because "/" partition only has 15G in beaker
-    LV_ROOT_NAME=$(df | grep "/$" | awk '{print $1}')
-    sudo lvextend -l +100%FREE "$LV_ROOT_NAME"
-    sudo xfs_growfs -d "$LV_ROOT_NAME"
-    df -h
-fi
-
-# Prepare rhel-edge container network
-greenprint "Prepare container network"
-sudo podman network inspect edge >/dev/null 2>&1 || sudo podman network create --driver=bridge --subnet=192.168.200.0/24 --gateway=192.168.200.254 edge
diff --git a/tools/edge-installer-hyper-v.sh b/tools/edge-installer-hyper-v.sh
deleted file mode 100755
index 879238f20..000000000
--- a/tools/edge-installer-hyper-v.sh
+++ /dev/null
@@ -1,391 +0,0 @@
-#!/bin/bash
-set -euox pipefail
-
-# Dumps details about the instance running the CI job.
-
-CPUS=$(nproc)
-MEM=$(free -m | grep -oP '\d+' | head -n 1)
-DISK=$(df --output=size -h / | sed '1d;s/[^0-9]//g')
-HOSTNAME=$(uname -n)
-USER=$(whoami)
-ARCH=$(uname -m)
-KERNEL=$(uname -r)
-
-echo -e "\033[0;36m"
-cat << EOF
-------------------------------------------------------------------------------
-CI MACHINE SPECS
-------------------------------------------------------------------------------
-     Hostname: ${HOSTNAME}
-         User: ${USER}
-         CPUs: ${CPUS}
-          RAM: ${MEM} MB
-         DISK: ${DISK} GB
-         ARCH: ${ARCH}
-       KERNEL: ${KERNEL}
-------------------------------------------------------------------------------
-EOF
-echo -e "\033[0m"
-
-# Get OS data.
-source /etc/os-release
-
-# Customize repository
-sudo mkdir -p /etc/osbuild-composer/repositories
-
-# Set up variables.
-ARCH=$(uname -m)
-TEST_UUID=$(uuidgen)
-IMAGE_KEY="rhel-edge-test-${TEST_UUID}"
-PROD_REPO=/var/www/html/repo
-STAGE_REPO_ADDRESS=192.168.200.1
-
-# Set up temporary files.
-TEMPDIR=$(mktemp -d)
-BLUEPRINT_FILE=${TEMPDIR}/blueprint.toml
-COMPOSE_START=${TEMPDIR}/compose-start-${IMAGE_KEY}.json
-COMPOSE_INFO=${TEMPDIR}/compose-info-${IMAGE_KEY}.json
-
-case "${ID}-${VERSION_ID}" in
-    "rhel-8.4")
-        CONTAINER_IMAGE_TYPE=rhel-edge-container
-        INSTALLER_IMAGE_TYPE=rhel-edge-installer
-        CONTAINER_FILENAME=rhel84-container.tar
-        INSTALLER_FILENAME=rhel84-boot.iso
-        OSTREE_REF="rhel/8/${ARCH}/edge"
-        PROD_REPO_URL=http://192.168.100.1/repo/
-        PROD_REPO_URL_2=$PROD_REPO_URL
-        RT_TO_RT="true"
-        STAGE_REPO_URL="http://${STAGE_REPO_ADDRESS}/repo/"
-        sudo cp files/rhel-8-4-0.json /etc/osbuild-composer/repositories/rhel-8-beta.json
-        sudo ln -sf /etc/osbuild-composer/repositories/rhel-8-beta.json /etc/osbuild-composer/repositories/rhel-8.json;;
-    "rhel-8.5")
-        CONTAINER_IMAGE_TYPE=edge-container
-        INSTALLER_IMAGE_TYPE=edge-installer
-        CONTAINER_FILENAME=container.tar
-        INSTALLER_FILENAME=installer.iso
-        OSTREE_REF="rhel/8/${ARCH}/edge"
-        PROD_REPO_URL=http://192.168.100.1/repo
-        PROD_REPO_URL_2="${PROD_REPO_URL}/"
-        RT_TO_RT="false"
-        STAGE_REPO_URL="http://${STAGE_REPO_ADDRESS}:8080/repo/"
-        sudo cp files/rhel-8-5-0.json /etc/osbuild-composer/repositories/rhel-85.json;;
-    *)
-        echo "unsupported distro: ${ID}-${VERSION_ID}"
-        exit 1;;
-esac
-
-# Colorful output.
-function greenprint {
-    echo -e "\033[1;32m${1}\033[0m"
-}
-
-# Install required packages
-greenprint "Install required packages"
-sudo dnf install -y --nogpgcheck httpd osbuild osbuild-composer composer-cli podman wget firewalld
-
-# Start httpd server as prod ostree repo
-greenprint "Start httpd service"
-sudo systemctl enable --now httpd.service
-
-# Start osbuild-composer.socket
-greenprint "Start osbuild-composer.socket"
-sudo systemctl enable --now osbuild-composer.socket
-
-# Start firewalld
-greenprint "Start firewalld"
-sudo systemctl enable --now firewalld
-
-# modify existing kickstart by prepending and appending commands
-function modksiso {
-    sudo dnf install -y lorax  # for mkksiso
-    isomount=$(mktemp -d)
-    kspath=$(mktemp -d)
-
-    iso="$1"
-    newiso="$2"
-
-    echo "Mounting ${iso} -> ${isomount}"
-    sudo mount -v -o ro "${iso}" "${isomount}"
-
-    cleanup() {
-        sudo umount -v "${isomount}"
-        rmdir -v "${isomount}"
-        rm -rv "${kspath}"
-    }
-
-    trap cleanup RETURN
-
-    ksfiles=("${isomount}"/*.ks)
-    ksfile="${ksfiles[0]}"  # there shouldn't be more than one anyway
-    echo "Found kickstart file ${ksfile}"
-
-    ksbase=$(basename "${ksfile}")
-    newksfile="${kspath}/${ksbase}"
-    oldks=$(cat "${ksfile}")
-    echo "Preparing modified kickstart file"
-    cat > "${newksfile}" << EOFKS
-text
-network --bootproto=dhcp --device=link --activate --onboot=on
-zerombr
-clearpart --all --initlabel --disklabel=msdos
-autopart --nohome --noswap --type=plain
-${oldks}
-poweroff
-%post --log=/var/log/anaconda/post-install.log --erroronfail
-# no sudo password for user admin and installeruser
-echo -e 'admin\tALL=(ALL)\tNOPASSWD: ALL' >> /etc/sudoers
-echo -e 'installeruser\tALL=(ALL)\tNOPASSWD: ALL' >> /etc/sudoers
-# add remote prod edge repo
-ostree remote delete rhel
-ostree remote add --no-gpg-verify --no-sign-verify rhel ${PROD_REPO_URL}
-%end
-EOFKS
-
-    echo "Writing new ISO"
-    sudo mkksiso -c "console=ttyS0,115200" "${newksfile}" "${iso}" "${newiso}"
-
-    echo "==== NEW KICKSTART FILE ===="
-    cat "${newksfile}"
-    echo "============================"
-}
-
-# Get the compose log.
-get_compose_log () {
-    COMPOSE_ID=$1
-    LOG_FILE=osbuild-${ID}-${VERSION_ID}-ng-${COMPOSE_ID}.log
-
-    # Download the logs.
-    sudo composer-cli compose log "$COMPOSE_ID" | tee "$LOG_FILE" > /dev/null
-}
-
-# Get the compose metadata.
-get_compose_metadata () {
-    COMPOSE_ID=$1
-    METADATA_FILE=osbuild-${ID}-${VERSION_ID}-ng-${COMPOSE_ID}.json
-
-    # Download the metadata.
-    sudo composer-cli compose metadata "$COMPOSE_ID" > /dev/null
-
-    # Find the tarball and extract it.
-    TARBALL=$(basename "$(find . -maxdepth 1 -type f -name "*-metadata.tar")")
-    tar -xf "$TARBALL" -C "${TEMPDIR}"
-    rm -f "$TARBALL"
-
-    # Move the JSON file into place.
-    cat "${TEMPDIR}"/"${COMPOSE_ID}".json | jq -M '.' | tee "$METADATA_FILE" > /dev/null
-}
-
-# Build ostree image.
-build_image() {
-    blueprint_name=$1
-    image_type=$2
-
-    # Get worker unit file so we can watch the journal.
-    WORKER_UNIT=$(sudo systemctl list-units | grep -o -E "osbuild.*worker.*\.socket")
-    sudo journalctl -af -n 1 -u "${WORKER_UNIT}" &
-    WORKER_JOURNAL_PID=$!
-
-    # Start the compose.
-    greenprint "🚀 Starting compose"
-    if [ $# -eq 3 ]; then
-        repo_url=$3
-        sudo composer-cli --json compose start-ostree --ref "$OSTREE_REF" --url "$repo_url" "$blueprint_name" "$image_type" | tee "$COMPOSE_START"
-    else
-        sudo composer-cli --json compose start-ostree --ref "$OSTREE_REF" "$blueprint_name" "$image_type" | tee "$COMPOSE_START"
-    fi
-    COMPOSE_ID=$(jq -r '.build_id' "$COMPOSE_START")
-
-    # Wait for the compose to finish.
-    greenprint "⏱ Waiting for compose to finish: ${COMPOSE_ID}"
-    while true; do
-        sudo composer-cli --json compose info "${COMPOSE_ID}" | tee "$COMPOSE_INFO" > /dev/null
-        COMPOSE_STATUS=$(jq -r '.queue_status' "$COMPOSE_INFO")
-
-        # Is the compose finished?
-        if [[ $COMPOSE_STATUS != RUNNING ]] && [[ $COMPOSE_STATUS != WAITING ]]; then
-            break
-        fi
-
-        # Wait 30 seconds and try again.
-        sleep 5
-    done
-
-    # Capture the compose logs from osbuild.
-    greenprint "💬 Getting compose log and metadata"
-    get_compose_log "$COMPOSE_ID"
-    get_compose_metadata "$COMPOSE_ID"
-
-    # Did the compose finish with success?
-    if [[ $COMPOSE_STATUS != FINISHED ]]; then
-        echo "Something went wrong with the compose. 😢"
-        exit 1
-    fi
-
-    # Stop watching the worker journal.
-    sudo kill ${WORKER_JOURNAL_PID}
-}
-
-# Clean up our mess.
-clean_up () {
-    greenprint "🧼 Cleaning up"
-
-    # Remove all the containers and images if exist
-    sudo podman system reset --force
-
-    # Remove prod repo.
-    sudo rm -rf "$PROD_REPO"
-
-    # Remomve tmp dir.
-    sudo rm -rf "$TEMPDIR"
-
-    # Stop httpd
-    sudo systemctl disable httpd --now
-}
-
-###########################################################
-##
-## Prepare ostree prod repo and configure stage repo
-##
-###########################################################
-greenprint "Prepare ostree prod repo and configure stage repo"
-sudo rm -rf "$PROD_REPO"
-sudo mkdir -p "$PROD_REPO"
-sudo ostree --repo="$PROD_REPO" init --mode=archive
-sudo ostree --repo="$PROD_REPO" remote add --no-gpg-verify edge-stage "$STAGE_REPO_URL"
-
-###########################################################
-##
-## rhel-edge container image for building installer image
-##
-###########################################################
-
-# Write a blueprint for ostree image.
-tee "$BLUEPRINT_FILE" > /dev/null << EOF
-name = "container"
-description = "A base rhel-edge container image"
-version = "0.0.1"
-modules = []
-groups = []
-
-[[packages]]
-name = "hyperv-daemons"
-version = "*"
-
-[[packages]]
-name = "python36"
-version = "*"
-
-[[customizations.user]]
-name = "admin"
-description = "Administrator account"
-password = "\$6\$GRmb7S0p8vsYmXzH\$o0E020S.9JQGaHkszoog4ha4AQVs3sk8q0DvLjSMxoxHBKnB2FBXGQ/OkwZQfW/76ktHd0NX5nls2LPxPuUdl."
-key = "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABgQCzxo5dEcS+LDK/OFAfHo6740EyoDM8aYaCkBala0FnWfMMTOq7PQe04ahB0eFLS3IlQtK5bpgzxBdFGVqF6uT5z4hhaPjQec0G3+BD5Pxo6V+SxShKZo+ZNGU3HVrF9p2V7QH0YFQj5B8F6AicA3fYh2BVUFECTPuMpy5A52ufWu0r4xOFmbU7SIhRQRAQz2u4yjXqBsrpYptAvyzzoN4gjUhNnwOHSPsvFpWoBFkWmqn0ytgHg3Vv9DlHW+45P02QH1UFedXR2MqLnwRI30qqtaOkVS+9rE/dhnR+XPpHHG+hv2TgMDAuQ3IK7Ab5m/yCbN73cxFifH4LST0vVG3Jx45xn+GTeHHhfkAfBSCtya6191jixbqyovpRunCBKexI5cfRPtWOitM3m7Mq26r7LpobMM+oOLUm4p0KKNIthWcmK9tYwXWSuGGfUQ+Y8gt7E0G06ZGbCPHOrxJ8lYQqXsif04piONPA/c9Hq43O99KPNGShONCS9oPFdOLRT3U= ostree-image-test"
-home = "/home/admin/"
-groups = ["wheel"]
-EOF
-
-if [[ "${RT_TO_RT}" == "true" ]]; then
-    tee -a "$BLUEPRINT_FILE" > /dev/null << EOF
-[customizations.kernel]
-name = "kernel-rt"
-EOF
-fi
-
-greenprint "📄 Which blueprint are we using"
-cat "$BLUEPRINT_FILE"
-
-# Prepare the blueprint for the compose.
-greenprint "📋 Preparing blueprint"
-sudo composer-cli blueprints push "$BLUEPRINT_FILE"
-sudo composer-cli blueprints depsolve container
-
-# Build container image.
-build_image container "${CONTAINER_IMAGE_TYPE}"
-
-# Download the image
-greenprint "📥 Downloading the image"
-sudo composer-cli compose image "${COMPOSE_ID}" > /dev/null
-
-# Clear container running env
-greenprint "🧹 Clearing container running env"
-# Remove any status containers if exist
-sudo podman ps -a -q --format "{{.ID}}" | sudo xargs --no-run-if-empty podman rm -f
-# Remove all images
-sudo podman rmi -f -a
-
-# Prepare rhel-edge container network
-greenprint "Prepare container network"
-sudo podman network inspect edge >/dev/null 2>&1 || sudo podman network create --driver=bridge --subnet=192.168.200.0/24 --gateway=192.168.200.254 edge
-
-# Deal with stage repo image
-greenprint "🗜 Starting container"
-IMAGE_FILENAME="${COMPOSE_ID}-${CONTAINER_FILENAME}"
-sudo podman pull "oci-archive:${IMAGE_FILENAME}"
-sudo podman images
-
-# Run edge stage repo
-greenprint "🛰 Running edge stage repo"
-# Get image id to run image
-EDGE_IMAGE_ID=$(sudo podman images --filter "dangling=true" --format "{{.ID}}")
-sudo podman run -d --name rhel-edge --network edge --ip "$STAGE_REPO_ADDRESS" "$EDGE_IMAGE_ID"
-# Clear image file
-sudo rm -f "$IMAGE_FILENAME"
-
-# Wait for container to be running
-until [ "$(sudo podman inspect -f '{{.State.Running}}' rhel-edge)" == "true" ]; do
-    sleep 1;
-done;
-
-# Sync installer ostree content
-greenprint "Sync ostree repo with stage repo"
-sudo ostree --repo="$PROD_REPO" pull --mirror edge-stage "$OSTREE_REF"
-
-
-# Clean compose and blueprints.
-greenprint "🧹 Clean up compose"
-sudo composer-cli compose delete "${COMPOSE_ID}" > /dev/null
-sudo composer-cli blueprints delete container > /dev/null
-
-########################################################
-##
-## rhel-edge installer image building from container image
-##
-########################################################
-
-# Write a blueprint for installer image.
-tee "$BLUEPRINT_FILE" > /dev/null << EOF
-name = "installer"
-description = "A base rhel-edge installer image"
-version = "0.0.1"
-modules = []
-groups = []
-EOF
-
-greenprint "📄 Which blueprint are we using"
-cat "$BLUEPRINT_FILE"
-
-# Prepare the blueprint for the compose.
-greenprint "📋 Preparing blueprint"
-sudo composer-cli blueprints push "$BLUEPRINT_FILE"
-sudo composer-cli blueprints depsolve installer
-
-# Build installer image.
-# Test --url arg following by URL with tailling slash for bz#1942029
-build_image installer "${INSTALLER_IMAGE_TYPE}" "${PROD_REPO_URL_2}"
-
-# Download the image
-greenprint "📥 Downloading the image"
-sudo composer-cli compose image "${COMPOSE_ID}" > /dev/null
-ISO_FILENAME="${COMPOSE_ID}-${INSTALLER_FILENAME}"
-modksiso "${ISO_FILENAME}" "hyper-v-${ISO_FILENAME}"
-sudo rm "${ISO_FILENAME}"
-
-# Clean compose and blueprints.
-greenprint "🧹 Clean up compose"
-sudo composer-cli compose delete "${COMPOSE_ID}" > /dev/null
-sudo composer-cli blueprints delete installer > /dev/null
-
-clean_up
-
-exit 0
diff --git a/edge-raw.sh b/tools/edge-raw.sh
similarity index 100%
rename from edge-raw.sh
rename to tools/edge-raw.sh
diff --git a/tools/edge-stage-server-template.yaml b/tools/edge-stage-server-template.yaml
deleted file mode 100644
index e7463f7a2..000000000
--- a/tools/edge-stage-server-template.yaml
+++ /dev/null
@@ -1,88 +0,0 @@
----
-apiVersion: template.openshift.io/v1
-kind: Template
-labels:
-  app: ${EDGE_STAGE_SERVER_NAME}-${EDGE_STAGE_REPO_TAG}
-  template: ${EDGE_STAGE_SERVER_NAME}-${EDGE_STAGE_REPO_TAG}
-metadata:
-  annotations:
-    description: edge stage repo server
-  name: edge-stage-server
-
-objects:
-  - kind: Route
-    apiVersion: v1
-    metadata:
-      name: ${EDGE_STAGE_SERVER_NAME}-${EDGE_STAGE_REPO_TAG}
-      annotations:
-        template.openshift.io/expose-uri: http://{.spec.host}{.spec.path}
-    spec:
-      to:
-        kind: Service
-        name: ${EDGE_STAGE_SERVER_NAME}-${EDGE_STAGE_REPO_TAG}
-# file server deployment
-  - kind: DeploymentConfig
-    apiVersion: v1
-    metadata:
-      name: ${EDGE_STAGE_SERVER_NAME}-${EDGE_STAGE_REPO_TAG}
-    spec:
-      replicas: 1
-      selector:
-        name: ${EDGE_STAGE_SERVER_NAME}-${EDGE_STAGE_REPO_TAG}
-      strategy:
-        type: Recreate
-      template:
-        metadata:
-          labels:
-            name: ${EDGE_STAGE_SERVER_NAME}-${EDGE_STAGE_REPO_TAG}
-        spec:
-          containers:
-            - name: ${EDGE_STAGE_SERVER_NAME}-${EDGE_STAGE_REPO_TAG}
-              image: quay.io/rhel-edge/edge-containers:${EDGE_STAGE_REPO_TAG}
-              imagePullPolicy: IfNotPresent
-              resources:
-                limits:
-                  memory: "1Gi"
-                  cpu: "1"
-                requests:
-                  memory: "512Mi"
-                  cpu: "50m"
-              securityContext:
-                capabilities: {}
-                privileged: false
-              terminationMessagePath: /dev/termination-log
-          dnsPolicy: ClusterFirst
-          restartPolicy: Always
-      triggers:
-        - type: "ConfigChange"
-  # Listening on TCP port 80
-  - kind: Service
-    apiVersion: v1
-    metadata:
-      name: "${EDGE_STAGE_SERVER_NAME}-${EDGE_STAGE_REPO_TAG}"
-      annotations:
-        service.alpha.openshift.io/dependencies: '[{"name": "${EDGE_STAGE_SERVER_NAME}-${EDGE_STAGE_REPO_TAG}",
-          "namespace": "", "kind": "Service"}]'
-        service.openshift.io/infrastructure: 'true'
-      creationTimestamp:
-    spec:
-      ports:
-        - name: web
-          protocol: TCP
-          port: 80
-          targetPort: 8080
-          nodePort: 0
-      selector:
-        name: "${EDGE_STAGE_SERVER_NAME}-${EDGE_STAGE_REPO_TAG}"
-      type: ClusterIP
-      sessionAffinity: None
-
-parameters:
-  - description: Edge stage repo server.
-    displayName: Edge stage repo server
-    name: EDGE_STAGE_SERVER_NAME
-    value: edge-stage-server
-  - description: Edge stage repo tag.
-    displayName: Edge stage repo tag
-    name: EDGE_STAGE_REPO_TAG
-    value: latest
diff --git a/tools/meta-data b/tools/meta-data
deleted file mode 100644
index d2e8b7c95..000000000
--- a/tools/meta-data
+++ /dev/null
@@ -1,2 +0,0 @@
-instance-id: nocloud
-local-hostname: vm
diff --git a/tools/mock_repo.sh b/tools/mock_repo.sh
deleted file mode 100755
index 986ddb64a..000000000
--- a/tools/mock_repo.sh
+++ /dev/null
@@ -1,33 +0,0 @@
-#!/bin/bash
-set -euox pipefail
-
-# Get OS data.
-source /etc/os-release
-ARCH=$(uname -m)
-
-# work with mock osbuild-composer repo
-if [[ $# -eq 1 || $# -eq 2 ]]; then
-    osbuild_composer_commit_sha=$1
-    sudo tee "/etc/yum.repos.d/osbuild-composer.repo" > /dev/null << EOF
-[osbuild-composer]
-name=osbuild-composer ${osbuild_composer_commit_sha}
-baseurl=http://osbuild-composer-repos.s3-website.us-east-2.amazonaws.com/osbuild-composer/${ID}-${VERSION_ID}/${ARCH}/${osbuild_composer_commit_sha}
-enabled=1
-gpgcheck=0
-priority=5
-EOF
-fi
-
-if [[ $# -eq 2 ]]; then
-    osbuild_commit_sha=$2
-    sudo tee "/etc/yum.repos.d/osbuild.repo" > /dev/null << EOF
-[osbuild]
-name=osbuild ${osbuild_commit_sha}
-baseurl=http://osbuild-composer-repos.s3-website.us-east-2.amazonaws.com/osbuild/${ID}-${VERSION_ID}/${ARCH}/${osbuild_commit_sha}
-enabled=1
-gpgcheck=0
-priority=10
-EOF
-fi
-
-sudo dnf clean all
diff --git a/tools/mock_source.sh b/tools/mock_source.sh
deleted file mode 100755
index f6d9ccd09..000000000
--- a/tools/mock_source.sh
+++ /dev/null
@@ -1,34 +0,0 @@
-#!/bin/bash
-set -exuo pipefail
-
-TEMPDIR=$(mktemp -d)
-# Create repo folder for httpd
-sudo mkdir -p /var/www/html/mock_source
-
-# Copy all rpm files in TEMPDIR into mock_source folder
-sudo cp "/tmp/rpms/*.rpm" /var/www/html/mock_source
-
-# Install createrepo_c and httpd
-sudo dnf install -y createrepo_c httpd
-
-# Create a repo for mock source
-sudo createrepo_c /var/www/html/mock_source
-
-# Start httpd
-sudo systemctl enable --now httpd.service
-
-# Add a new source
-sudo tee "$TEMPDIR/source.toml" > /dev/null << EOF
-id = "source01"
-name = "source01"
-type = "yum-baseurl"
-url = "http://192.168.100.1/mock_source"
-check_gpg = false
-check_ssl = false
-system = false
-EOF
-
-sudo composer-cli sources add "$TEMPDIR/source.toml"
-for SOURCE in $(sudo composer-cli sources list); do
-    sudo composer-cli sources info "$SOURCE"
-done
diff --git a/tools/ocp4_sa_edit_token.yaml b/tools/ocp4_sa_edit_token.yaml
deleted file mode 100644
index 91dd7fc3c..000000000
--- a/tools/ocp4_sa_edit_token.yaml
+++ /dev/null
@@ -1,26 +0,0 @@
----
-kind: Template
-apiVersion: v1
-labels:
-  app: ocp4-sa-edit-token
-  template: ocp4-sa-edit-token-template
-metadata:
-  name: ocp4-sa-edit-token
-  annotations:
-    tags: token, ocp4
-
-objects:
-  - kind: ServiceAccount
-    apiVersion: v1
-    metadata:
-      name: sa-edit-token
-  - kind: RoleBinding
-    apiVersion: v1
-    metadata:
-      name: sa-edit-token-edit
-    groupNames:
-    subjects:
-      - kind: ServiceAccount
-        name: sa-edit-token
-    roleRef:
-      name: edit
diff --git a/tools/playbook/ansible.cfg b/tools/playbook/ansible.cfg
deleted file mode 100644
index 2ffc410a9..000000000
--- a/tools/playbook/ansible.cfg
+++ /dev/null
@@ -1,8 +0,0 @@
-[defaults]
-timeout = 30
-# human-readable stdout/stderr results display
-stdout_callback = yaml
-
-[ssh_connection]
-scp_if_ssh=True
-pipelining=False
diff --git a/tools/playbook/files/azure-cli.repo b/tools/playbook/files/azure-cli.repo
deleted file mode 100644
index 0fee27460..000000000
--- a/tools/playbook/files/azure-cli.repo
+++ /dev/null
@@ -1,6 +0,0 @@
-[azure-cli]
-name=Azure CLI
-baseurl=https://packages.microsoft.com/yumrepos/azure-cli
-enabled=1
-gpgcheck=1
-gpgkey=https://packages.microsoft.com/keys/microsoft.asc
diff --git a/tools/playbook/files/google-cloud-sdk.repo b/tools/playbook/files/google-cloud-sdk.repo
deleted file mode 100644
index ced4c9350..000000000
--- a/tools/playbook/files/google-cloud-sdk.repo
+++ /dev/null
@@ -1,8 +0,0 @@
-[google-cloud-sdk]
-name=Google Cloud SDK
-baseurl=https://packages.cloud.google.com/yum/repos/cloud-sdk-el8-x86_64
-enabled=1
-gpgcheck=1
-repo_gpgcheck=1
-gpgkey=https://packages.cloud.google.com/yum/doc/yum-key.gpg
-       https://packages.cloud.google.com/yum/doc/rpm-package-key.gpg
diff --git a/tools/playbook/files/startup-script.sh b/tools/playbook/files/startup-script.sh
deleted file mode 100755
index 51bb59bc3..000000000
--- a/tools/playbook/files/startup-script.sh
+++ /dev/null
@@ -1,19 +0,0 @@
-#!/bin/bash
-
-echo -e 'admin\tALL=(ALL)\tNOPASSWD: ALL' >> /etc/sudoers
-
-source /etc/os-release
-
-# All Fedora GCP images do not support auto resize root disk
-if [[ "$ID" == "fedora" ]]; then
-    growpart /dev/sda 5
-    btrfs filesystem resize 1:+70G /
-fi
-
-# Enable CRB repo on Centos Stream
-if [[ "${ID}-${VERSION_ID}" == "centos-9" ]]; then
-    dnf config-manager --set-enabled crb
-fi
-if [[ "${ID}-${VERSION_ID}" == "centos-8" ]]; then
-    dnf config-manager --set-enabled powertools
-fi
diff --git a/tools/playbook/gcp-deploy.yaml b/tools/playbook/gcp-deploy.yaml
deleted file mode 100644
index ba2b4575d..000000000
--- a/tools/playbook/gcp-deploy.yaml
+++ /dev/null
@@ -1,64 +0,0 @@
----
-- hosts: localhost
-  gather_facts: no
-  become: no
-  vars:
-    ansible_python_interpreter: /usr/bin/python3
-    ansible_connection: local
-    os: "fedora-37"
-    flavor:
-      gcp:
-        medium: "n2-standard-2"
-        large: "n2-standard-4"
-        xlarge: "n2-standard-8"
-    images:
-      centos-stream-8: edge-centos-stream-8
-      centos-stream-9: edge-centos-stream-9
-      fedora-35: Fedora-Cloud-Base-35
-      fedora-36: edge-fedora-36
-      fedora-rawhide: edge-fedora-rawhide
-    image_family:
-      centos-stream-8: centos-stream-8
-      centos-stream-9: centos-stream-9
-    image_project:
-      centos-stream-8: centos-cloud
-      centos-stream-9: centos-cloud
-    gcp_images:
-      fedora-rawhide: kite-image-fedora-rawhide
-      fedora-36: kite-image-fedora-36
-      fedora-37: kite-image-fedora-37
-      fedora-38: kite-image-fedora-38
-
-  tasks:
-    - set_fact:
-        random_num: "{{ 9999 | random(start=1001) }}"
-    - set_fact:
-        instance_name: "debug-gcp-{{ os }}-{{ flavor_type }}-{{ random_num }}"
-
-    - name: gcloud/gsutil - authorizing with a service account
-      command: /usr/bin/gcloud auth activate-service-account --key-file="{{ lookup('env', 'GCP_SERVICE_ACCOUNT_FILE') }}"
-
-    - set_fact:
-        image_args: "--image-family={{ image_family[os] }} --image-project={{ image_project[os] }}"
-      when: "'centos' in os"
-
-    - set_fact:
-        image_args: --image="{{ gcp_images[os] }}"
-      when: "'fedora' in os"
-
-    - name: create gcp instance
-      command: /usr/bin/gcloud compute instances create "{{ instance_name }}" --zone=us-central1-a --machine-type="{{ flavor['gcp'][flavor_type] }}" --boot-disk-auto-delete --boot-disk-size=80GB --boot-disk-type=pd-ssd --metadata-from-file=ssh-keys="{{ playbook_dir }}/key/gcp_key",startup-script="{{ playbook_dir }}/files/startup-script.sh" --metadata=block-project-ssh-keys=TRUE --provisioning-model=SPOT {{ image_args }} --enable-nested-virtualization --service-account="{{ lookup('env', 'GCP_SERVICE_ACCOUNT_NAME') }}" --project="{{ lookup('env', 'GCP_PROJECT') }}" --format=json
-      register: result_instance
-
-    - set_fact:
-        instance_ip: "{{ result_instance.stdout | from_json | json_query('[0].networkInterfaces[0].accessConfigs[0].natIP') }}"
-
-    - name: Waits until instance is reachable
-      wait_for:
-        host: "{{ instance_ip }}"
-        port: 22
-        search_regex: OpenSSH
-        delay: 10
-      retries: 30
-      register: result_ssh_check
-      until: result_ssh_check is success
diff --git a/tools/playbook/group_vars/all b/tools/playbook/group_vars/all
deleted file mode 100644
index 12a6db985..000000000
--- a/tools/playbook/group_vars/all
+++ /dev/null
@@ -1,82 +0,0 @@
-os: "{{ lookup('env', 'TEST_OS') }}"
-arch: "{{ lookup('env', 'ARCH') | default('x86_64', true) }}"
-download_node: "{{ lookup('env', 'DOWNLOAD_NODE') }}"
-
-repos:
-  centos-stream-8:
-    baseos: http://msync.centos.org/centos/8-stream/BaseOS/x86_64/os
-    appstream: http://msync.centos.org/centos/8-stream/AppStream/x86_64/os
-  centos-stream-9:
-    baseos: https://composes.stream.centos.org/production/latest-CentOS-Stream/compose/BaseOS/x86_64/os/
-    appstream: https://composes.stream.centos.org/production/latest-CentOS-Stream/compose/AppStream/x86_64/os/
-  rhel-8-6:
-    baseos: "http://{{ download_node }}/rhel-8/nightly/updates/RHEL-8/latest-RHEL-8.6.0/compose/BaseOS/x86_64/os/"
-    appstream: "http://{{ download_node }}/rhel-8/nightly/updates/RHEL-8/latest-RHEL-8.6.0/compose/AppStream/x86_64/os/"
-    crb: "http://{{ download_node }}/rhel-8/nightly/updates/RHEL-8/latest-RHEL-8.6.0/compose/CRB/x86_64/os/"
-  rhel-8-8:
-    baseos: "http://{{ download_node }}/rhel-8/nightly/updates/RHEL-8/latest-RHEL-8.8.0/compose/BaseOS/x86_64/os/"
-    appstream: "http://{{ download_node }}/rhel-8/nightly/updates/RHEL-8/latest-RHEL-8.8.0/compose/AppStream/x86_64/os/"
-    crb: "http://{{ download_node }}/rhel-8/nightly/updates/RHEL-8/latest-RHEL-8.8.0/compose/CRB/x86_64/os/"
-  rhel-8-9:
-    baseos: "http://{{ download_node }}/rhel-8/nightly/updates/RHEL-8/latest-RHEL-8.9.0/compose/BaseOS/x86_64/os/"
-    appstream: "http://{{ download_node }}/rhel-8/nightly/updates/RHEL-8/latest-RHEL-8.9.0/compose/AppStream/x86_64/os/"
-    crb: "http://{{ download_node }}/rhel-8/nightly/updates/RHEL-8/latest-RHEL-8.9.0/compose/CRB/x86_64/os/"
-  rhel-8-10:
-    baseos: "http://{{ download_node }}/rhel-8/nightly/RHEL-8/latest-RHEL-8.10.0/compose/BaseOS/x86_64/os/"
-    appstream: "http://{{ download_node }}/rhel-8/nightly/RHEL-8/latest-RHEL-8.10.0/compose/AppStream/x86_64/os/"
-    crb: "http://{{ download_node }}/rhel-8/nightly/RHEL-8/latest-RHEL-8.10.0/compose/CRB/x86_64/os/"
-  rhel-9-0:
-    baseos: "http://{{ download_node }}/rhel-9/nightly/updates/RHEL-9/latest-RHEL-9.0.0/compose/BaseOS/x86_64/os/"
-    appstream: "http://{{ download_node }}/rhel-9/nightly/updates/RHEL-9/latest-RHEL-9.0.0/compose/AppStream/x86_64/os/"
-    crb: "http://{{ download_node }}/rhel-9/nightly/updates/RHEL-9/latest-RHEL-9.0.0/compose/CRB/x86_64/os/"
-  rhel-9-2:
-    baseos: "http://{{ download_node }}/rhel-9/nightly/updates/RHEL-9/latest-RHEL-9.2.0/compose/BaseOS/x86_64/os/"
-    appstream: "http://{{ download_node }}/rhel-9/nightly/updates/RHEL-9/latest-RHEL-9.2.0/compose/AppStream/x86_64/os/"
-    crb: "http://{{ download_node }}/rhel-9/nightly/updates/RHEL-9/latest-RHEL-9.2.0/compose/CRB/x86_64/os/"
-  rhel-9-3:
-    baseos: "http://{{ download_node }}/rhel-9/nightly/updates/RHEL-9/latest-RHEL-9.3.0/compose/BaseOS/x86_64/os/"
-    appstream: "http://{{ download_node }}/rhel-9/nightly/updates/RHEL-9/latest-RHEL-9.3.0/compose/AppStream/x86_64/os/"
-    crb: "http://{{ download_node }}/rhel-9/nightly/updates/RHEL-9/latest-RHEL-9.3.0/compose/CRB/x86_64/os/"
-  rhel-9-4:
-    baseos: "http://{{ download_node }}/rhel-9/nightly/RHEL-9/latest-RHEL-9.4.0/compose/BaseOS/x86_64/os/"
-    appstream: "http://{{ download_node }}/rhel-9/nightly/RHEL-9/latest-RHEL-9.4.0/compose/AppStream/x86_64/os/"
-    crb: "http://{{ download_node }}/rhel-9/nightly/RHEL-9/latest-RHEL-9.4.0/compose/CRB/x86_64/os/"
-
-images:
-  centos-stream-8: edge-centos-stream-8
-  centos-stream-9: CentOS-Stream-9-latest
-  rhel-8-6: RHEL-8.6.0-x86_64-nightly-latest
-  rhel-8-8: RHEL-8.8.0-x86_64-nightly-latest
-  rhel-8-9: RHEL-8.9.0-x86_64-nightly-latest
-  rhel-8-10: RHEL-8.10.0-x86_64-nightly-latest
-  rhel-9-0: RHEL-9.0.0-x86_64-nightly-latest
-  rhel-9-2: RHEL-9.2.0-x86_64-nightly-latest
-  rhel-9-3: RHEL-9.3.0-x86_64-nightly-latest
-  rhel-9-4: RHEL-9.4.0-x86_64-nightly-latest
-  remote-35: Fedora-Cloud-Base-35
-  fedora-37: edge-fedora-37
-  fedora-38: edge-fedora-38
-  fedora-39: edge-fedora-39
-  fedora-40: edge-fedora-40
-  fedora-41: edge-fedora-41
-  fedora-rawhide: edge-fedora-rawhide
-
-image_url:
-  centos-stream-9: https://composes.stream.centos.org/production/latest-CentOS-Stream/compose/BaseOS/x86_64/images
-  centos-stream-8: https://cloud.centos.org/centos/8-stream/x86_64/images
-  fedora-37: https://dl.fedoraproject.org/pub/fedora/linux/releases/37/Cloud/x86_64/images
-  fedora-38: https://dl.fedoraproject.org/pub/fedora/linux/releases/38/Cloud/x86_64/images
-  fedora-39: https://dl.fedoraproject.org/pub/fedora/linux/releases/39/Cloud/x86_64/images
-  fedora-40: https://dl.fedoraproject.org/pub/fedora/linux/development/40/Cloud/x86_64/images
-  fedora-41: https://dl.fedoraproject.org/pub/fedora/linux/development/41/Cloud/x86_64/images
-  fedora-rawhide: https://dl.fedoraproject.org/pub/fedora/linux/development/rawhide/Cloud/x86_64/images
-
-os_distro:
-  centos-stream-9: centos
-  centos-stream-8: centos
-  fedora-37: fedora
-  fedora-38: fedora
-  fedora-39: fedora
-  fedora-40: fedora
-  fedora-41: fedora
-  fedora-rawhide: fedora
diff --git a/tools/playbook/inventory b/tools/playbook/inventory
deleted file mode 100644
index 99e45c1f7..000000000
--- a/tools/playbook/inventory
+++ /dev/null
@@ -1,29 +0,0 @@
-[openstack]
-localhost
-
-[builder]
-
-[guest]
-
-[cloud:children]
-openstack
-
-[remote:children]
-builder
-guest
-
-[cloud:vars]
-ansible_connection=local
-
-[remote:vars]
-ansible_user=admin
-ansible_private_key_file="{{ playbook_dir }}/key/ostree_key"
-ansible_ssh_common_args="-o StrictHostKeyChecking=no -o UserKnownHostsFile=/dev/null"
-
-[builder:vars]
-ansible_user=fedora
-ansible_private_key_file="{{ playbook_dir }}/key/ostree_key"
-ansible_ssh_common_args="-o StrictHostKeyChecking=no -o UserKnownHostsFile=/dev/null"
-
-[all:vars]
-ansible_python_interpreter=/usr/bin/python3
diff --git a/tools/playbook/key/gcp_key b/tools/playbook/key/gcp_key
deleted file mode 100644
index 329ffb4df..000000000
--- a/tools/playbook/key/gcp_key
+++ /dev/null
@@ -1 +0,0 @@
-admin:ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABgQCzxo5dEcS+LDK/OFAfHo6740EyoDM8aYaCkBala0FnWfMMTOq7PQe04ahB0eFLS3IlQtK5bpgzxBdFGVqF6uT5z4hhaPjQec0G3+BD5Pxo6V+SxShKZo+ZNGU3HVrF9p2V7QH0YFQj5B8F6AicA3fYh2BVUFECTPuMpy5A52ufWu0r4xOFmbU7SIhRQRAQz2u4yjXqBsrpYptAvyzzoN4gjUhNnwOHSPsvFpWoBFkWmqn0ytgHg3Vv9DlHW+45P02QH1UFedXR2MqLnwRI30qqtaOkVS+9rE/dhnR+XPpHHG+hv2TgMDAuQ3IK7Ab5m/yCbN73cxFifH4LST0vVG3Jx45xn+GTeHHhfkAfBSCtya6191jixbqyovpRunCBKexI5cfRPtWOitM3m7Mq26r7LpobMM+oOLUm4p0KKNIthWcmK9tYwXWSuGGfUQ+Y8gt7E0G06ZGbCPHOrxJ8lYQqXsif04piONPA/c9Hq43O99KPNGShONCS9oPFdOLRT3U= ostree-image-test
diff --git a/tools/playbook/key/ostree_key b/tools/playbook/key/ostree_key
deleted file mode 100644
index 716fd87cc..000000000
--- a/tools/playbook/key/ostree_key
+++ /dev/null
@@ -1,38 +0,0 @@
------BEGIN OPENSSH PRIVATE KEY-----
-b3BlbnNzaC1rZXktdjEAAAAABG5vbmUAAAAEbm9uZQAAAAAAAAABAAABlwAAAAdzc2gtcn
-NhAAAAAwEAAQAAAYEAs8aOXRHEviwyvzhQHx6Ou+NBMqAzPGmGgpAWpWtBZ1nzDEzquz0H
-tOGoQdHhS0tyJULSuW6YM8QXRRlaherk+c+IYWj40HnNBt/gQ+T8aOlfksUoSmaPmTRlNx
-1axfadle0B9GBUI+QfBegInAN32IdgVVBRAkz7jKcuQOdrn1rtK+MThZm1O0iIUUEQEM9r
-uMo16gbK6WKbQL8s86DeII1ITZ8Dh0j7LxaVqARZFpqp9MrYB4N1b/Q5R1vuOT9NkB9VBX
-nV0djKi58ESN9KqrWjpFUvvaxP3YZ0flz6Rxxvob9k4DAwLkNyCuwG+Zv8gmze93MRYnx+
-C0k9L1RtyceOcZ/hk3hx4X5AHwUgrcmutfdY4sW6sqL6UbpwgSnsSOXH0T7VjorTN5uzKt
-uq+y6aGzDPqDi1JuKdCijSLYVnJivbWMF1krhhn1EPmPILexNBtOmRmwjxzq8SfJWEKl7I
-n9OKYjjTwP3PR6uNzvfSjzRkoTjQkvaDxXTi0U91AAAFiBiBlykYgZcpAAAAB3NzaC1yc2
-EAAAGBALPGjl0RxL4sMr84UB8ejrvjQTKgMzxphoKQFqVrQWdZ8wxM6rs9B7ThqEHR4UtL
-ciVC0rlumDPEF0UZWoXq5PnPiGFo+NB5zQbf4EPk/GjpX5LFKEpmj5k0ZTcdWsX2nZXtAf
-RgVCPkHwXoCJwDd9iHYFVQUQJM+4ynLkDna59a7SvjE4WZtTtIiFFBEBDPa7jKNeoGyuli
-m0C/LPOg3iCNSE2fA4dI+y8WlagEWRaaqfTK2AeDdW/0OUdb7jk/TZAfVQV51dHYyoufBE
-jfSqq1o6RVL72sT92GdH5c+kccb6G/ZOAwMC5DcgrsBvmb/IJs3vdzEWJ8fgtJPS9UbcnH
-jnGf4ZN4ceF+QB8FIK3JrrX3WOLFurKi+lG6cIEp7Ejlx9E+1Y6K0zebsyrbqvsumhswz6
-g4tSbinQoo0i2FZyYr21jBdZK4YZ9RD5jyC3sTQbTpkZsI8c6vEnyVhCpeyJ/TimI408D9
-z0erjc730o80ZKE40JL2g8V04tFPdQAAAAMBAAEAAAGBAJIAmtQ5PwiXyqsD6AYuAgvTt7
-qO4q2YojZdIRc9MUPniH2f5i8klKKxdb3m30sQPebHC26vxAqeoatruNnz9/xuMLuzzgc6
-NGn13iQlz1zA0+7WEi/CdbMeG2mUfIk0Da2aa7D1nr/7X7qjRIK4SlffMjx3WyM8NDt59x
-WdHQmxhdbTt6IUQFyiPpuG9K5CVqEgEIM8+wRqId6GpNJD/sJ/G452qx3vBpiqheaLiXLT
-L15wctw/RlwjA3XR0npJzq6g066BMKYAnyT5wiCWisVFKxIudT0dphj4qmz74yC967U6ji
-AB9hZ8j9OhBDA/pypXbb781Lo4iBqM6auoZqbieOE+v9v6uDozmfxtQO5y2kFP7mBMsGwG
-L8oEfEPqWRTIXgvDVuBwoqdsmYzFP8SiyUDkOfcHcK924FzvyJ2LWlpNp9POXYdjTDm/oB
-k1xs9UkhCImavqUnKiAplLnzMNuYbLmofoesI/2LnuYc2BOx9zub3pru6AdGi6N2EWzQAA
-AMEAjbtZe+6sW5yepxKOEb0wOAmZhRGL7d50fuPuJYsljU+nQaI7NMAAZ+G3kAiaTd8npb
-A5MKZ2oW++YXjJNAD+Bifnz8LojjmCqCuJL52+VNwpordW23XxRNQdoEvdN516qLyMI4i7
-i1AxNbU73SUrSCkSb1ngrhiHHQz986VciRU4X13ENbUSzPYInLoP9wTt+5CUtgiQnxe5PF
-K125TVwnFaDMPUKHMhKFIkMJuAkCSKQT7n11wwO2uH9k48LxW6AAAAwQDelZf6e+Un0s1A
-jLTG+r8VLG2kClXtECrRQjlzwMfc+lKOB00jBEdBLgIg3h2ECPOqh3OD9S0SU2Ja/+zb0r
-wrkyzWdndhh0IOEJCqzdlJe9JBJEWwQTr9MH9s1ORyIA1XGp5GPMFIZhT393Zkichzfyoz
-aACW+glGfsw27THJvI5PGJkPiuzKvwGixRcBpf72bk/30Q/qkekErdxtT3Kea41X9QOYjb
-jwrWKHARpSmLP1dJrOmYh8HWzpAKghIX8AAADBAM7DunVgA++cHvG/8B5Nodb/S0D7MvOb
-OtaHMfUdIIiczwOEvyoRsPyAMEGMtAMHy2YIGQYsK6CZEYP7x3sOmDOocmwjcMpjywN0b/
-g895R16d19MDzUU/SnfUsQgbEXV9KxBGa9mDiyoEiP/QduQU/YlJdQjQXvYjrTRzV6AHQo
-PCE/JIQfRcvypKQU1XOdLhSIFDbvAcVgvULwe08robTn2ooR/on4+MHOE0q9RyA4lKS7CQ
-77li4GQONWrqyhCwAAABFvc3RyZWUtaW1hZ2UtdGVzdA==
------END OPENSSH PRIVATE KEY-----
diff --git a/tools/playbook/key/ostree_key.pub b/tools/playbook/key/ostree_key.pub
deleted file mode 100644
index 184fb50b8..000000000
--- a/tools/playbook/key/ostree_key.pub
+++ /dev/null
@@ -1 +0,0 @@
-ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABgQCzxo5dEcS+LDK/OFAfHo6740EyoDM8aYaCkBala0FnWfMMTOq7PQe04ahB0eFLS3IlQtK5bpgzxBdFGVqF6uT5z4hhaPjQec0G3+BD5Pxo6V+SxShKZo+ZNGU3HVrF9p2V7QH0YFQj5B8F6AicA3fYh2BVUFECTPuMpy5A52ufWu0r4xOFmbU7SIhRQRAQz2u4yjXqBsrpYptAvyzzoN4gjUhNnwOHSPsvFpWoBFkWmqn0ytgHg3Vv9DlHW+45P02QH1UFedXR2MqLnwRI30qqtaOkVS+9rE/dhnR+XPpHHG+hv2TgMDAuQ3IK7Ab5m/yCbN73cxFifH4LST0vVG3Jx45xn+GTeHHhfkAfBSCtya6191jixbqyovpRunCBKexI5cfRPtWOitM3m7Mq26r7LpobMM+oOLUm4p0KKNIthWcmK9tYwXWSuGGfUQ+Y8gt7E0G06ZGbCPHOrxJ8lYQqXsif04piONPA/c9Hq43O99KPNGShONCS9oPFdOLRT3U= ostree-image-test
diff --git a/tools/playbook/new-os-deploy.yaml b/tools/playbook/new-os-deploy.yaml
deleted file mode 100644
index 3f0b869b1..000000000
--- a/tools/playbook/new-os-deploy.yaml
+++ /dev/null
@@ -1,337 +0,0 @@
----
-- hosts: openstack
-  gather_facts: no
-  become: no
-  vars:
-    date_label: "{{ lookup('pipe', 'date +%y%m%d%H%M%S') }}"
-    flavor: "ci.standard.large"
-    cloud_profile: "rhos-01"
-    os_network:
-      rhos-01: "shared_net_9"
-      rhos-0x: "shared_net_9"
-
-  tasks:
-    - name: "deploy RHEL instance"
-      openstack.cloud.server:
-        cloud: "{{ cloud_profile }}"
-        name: "{{ os }}-{{ date_label }}"
-        image: "{{ images[os] }}"
-        flavor: "{{ flavor }}"
-        network: "{{ os_network[cloud_profile] }}"
-        key_name: xiaofwan
-        security_groups: debug_vm
-        auto_ip: yes
-        config_drive: yes
-        wait: yes
-        timeout: 600
-        userdata: |
-          #cloud-config
-          users:
-            - default
-            - name: admin
-              gecos: Administrator
-              groups: users,wheel
-              sudo: ALL=(ALL) NOPASSWD:ALL
-              ssh_authorized_keys:
-                - ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABgQCzxo5dEcS+LDK/OFAfHo6740EyoDM8aYaCkBala0FnWfMMTOq7PQe04ahB0eFLS3IlQtK5bpgzxBdFGVqF6uT5z4hhaPjQec0G3+BD5Pxo6V+SxShKZo+ZNGU3HVrF9p2V7QH0YFQj5B8F6AicA3fYh2BVUFECTPuMpy5A52ufWu0r4xOFmbU7SIhRQRAQz2u4yjXqBsrpYptAvyzzoN4gjUhNnwOHSPsvFpWoBFkWmqn0ytgHg3Vv9DlHW+45P02QH1UFedXR2MqLnwRI30qqtaOkVS+9rE/dhnR+XPpHHG+hv2TgMDAuQ3IK7Ab5m/yCbN73cxFifH4LST0vVG3Jx45xn+GTeHHhfkAfBSCtya6191jixbqyovpRunCBKexI5cfRPtWOitM3m7Mq26r7LpobMM+oOLUm4p0KKNIthWcmK9tYwXWSuGGfUQ+Y8gt7E0G06ZGbCPHOrxJ8lYQqXsif04piONPA/c9Hq43O99KPNGShONCS9oPFdOLRT3U= ostree-image-test
-              ssh_pwauth: True
-              chpasswd:
-                list: |
-                  root:foobar
-                  admin:foobar
-                expire: False
-          yum_repos:
-            baseos:
-              name: rhel-baseos
-              baseurl: "{{ repos[os]['baseos'] }}"
-              enabled: true
-              gpgcheck: false
-              sslverify: false
-            appstream:
-              name: rhel-appstream
-              baseurl: "{{ repos[os]['appstream'] }}"
-              enabled: true
-              gpgcheck: false
-              sslverify: false
-            crb:
-              name: rhel-appstream
-              baseurl: "{{ repos[os]['crb'] }}"
-              enabled: true
-              gpgcheck: false
-              sslverify: false
-          packages:
-            - python3
-            - python3-dnf
-      register: tmp_instance_result
-      when: "'rhel' in os"
-
-    # avoid registering a variable when a “when” condition is *not* met
-    - set_fact:
-        instance_result: "{{ tmp_instance_result }}"
-      when: tmp_instance_result.changed
-
-    - name: "deploy CentOS Stream instance"
-      openstack.cloud.server:
-        cloud: "{{ cloud_profile }}"
-        name: "{{ os }}-{{ date_label }}"
-        image: "{{ images[os] }}"
-        flavor: "{{ flavor }}"
-        network: "{{ os_network[cloud_profile] }}"
-        key_name: xiaofwan
-        security_groups: debug_vm
-        auto_ip: yes
-        config_drive: yes
-        wait: yes
-        timeout: 600
-        userdata: |
-          #cloud-config
-          packages:
-            - python3
-            - python3-dnf
-          users:
-            - default
-            - name: admin
-              gecos: Administrator
-              groups: users,wheel
-              sudo: ALL=(ALL) NOPASSWD:ALL
-              ssh_authorized_keys:
-                - ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABgQCzxo5dEcS+LDK/OFAfHo6740EyoDM8aYaCkBala0FnWfMMTOq7PQe04ahB0eFLS3IlQtK5bpgzxBdFGVqF6uT5z4hhaPjQec0G3+BD5Pxo6V+SxShKZo+ZNGU3HVrF9p2V7QH0YFQj5B8F6AicA3fYh2BVUFECTPuMpy5A52ufWu0r4xOFmbU7SIhRQRAQz2u4yjXqBsrpYptAvyzzoN4gjUhNnwOHSPsvFpWoBFkWmqn0ytgHg3Vv9DlHW+45P02QH1UFedXR2MqLnwRI30qqtaOkVS+9rE/dhnR+XPpHHG+hv2TgMDAuQ3IK7Ab5m/yCbN73cxFifH4LST0vVG3Jx45xn+GTeHHhfkAfBSCtya6191jixbqyovpRunCBKexI5cfRPtWOitM3m7Mq26r7LpobMM+oOLUm4p0KKNIthWcmK9tYwXWSuGGfUQ+Y8gt7E0G06ZGbCPHOrxJ8lYQqXsif04piONPA/c9Hq43O99KPNGShONCS9oPFdOLRT3U= ostree-image-test
-              ssh_pwauth: True
-      register: tmp_instance_result
-      when: "'centos' in os"
-
-    # avoid registering a variable when a “when” condition is *not* met
-    - set_fact:
-        instance_result: "{{ tmp_instance_result }}"
-      when: tmp_instance_result.changed
-
-    - name: "deploy Fedora instance"
-      openstack.cloud.server:
-        cloud: "{{ cloud_profile }}"
-        name: "{{ os }}-{{ date_label }}"
-        image: "{{ images[os] }}"
-        flavor: "{{ flavor }}"
-        network: "{{ os_network[cloud_profile] }}"
-        key_name: xiaofwan
-        security_groups: debug_vm
-        auto_ip: yes
-        config_drive: yes
-        wait: yes
-        timeout: 600
-        userdata: |
-          #cloud-config
-          packages:
-            - python3
-            - python3-dnf
-          users:
-            - default
-            - name: admin
-              gecos: Administrator
-              groups: users,wheel
-              sudo: ALL=(ALL) NOPASSWD:ALL
-              ssh_authorized_keys:
-                - ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABgQCzxo5dEcS+LDK/OFAfHo6740EyoDM8aYaCkBala0FnWfMMTOq7PQe04ahB0eFLS3IlQtK5bpgzxBdFGVqF6uT5z4hhaPjQec0G3+BD5Pxo6V+SxShKZo+ZNGU3HVrF9p2V7QH0YFQj5B8F6AicA3fYh2BVUFECTPuMpy5A52ufWu0r4xOFmbU7SIhRQRAQz2u4yjXqBsrpYptAvyzzoN4gjUhNnwOHSPsvFpWoBFkWmqn0ytgHg3Vv9DlHW+45P02QH1UFedXR2MqLnwRI30qqtaOkVS+9rE/dhnR+XPpHHG+hv2TgMDAuQ3IK7Ab5m/yCbN73cxFifH4LST0vVG3Jx45xn+GTeHHhfkAfBSCtya6191jixbqyovpRunCBKexI5cfRPtWOitM3m7Mq26r7LpobMM+oOLUm4p0KKNIthWcmK9tYwXWSuGGfUQ+Y8gt7E0G06ZGbCPHOrxJ8lYQqXsif04piONPA/c9Hq43O99KPNGShONCS9oPFdOLRT3U= ostree-image-test
-              ssh_pwauth: True
-      register: tmp_instance_result
-      when: "'fedora' in os"
-
-    # avoid registering a variable when a “when” condition is *not* met
-    - set_fact:
-        instance_result: "{{ tmp_instance_result }}"
-      when: tmp_instance_result.changed
-
-    - name: "deploy remote instance"
-      openstack.cloud.server:
-        cloud: "{{ cloud_profile }}"
-        name: "{{ os }}-{{ date_label }}"
-        image: "{{ images[os] }}"
-        flavor: "{{ flavor }}"
-        network: "{{ os_network[cloud_profile] }}"
-        key_name: xiaofwan
-        security_groups: debug_vm
-        auto_ip: yes
-        config_drive: yes
-        wait: yes
-        timeout: 600
-        userdata: |
-          #cloud-config
-          users:
-            - default
-            - name: admin
-              gecos: Administrator
-              groups: users,wheel
-              sudo: ALL=(ALL) NOPASSWD:ALL
-              ssh_authorized_keys:
-                - ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABgQCzxo5dEcS+LDK/OFAfHo6740EyoDM8aYaCkBala0FnWfMMTOq7PQe04ahB0eFLS3IlQtK5bpgzxBdFGVqF6uT5z4hhaPjQec0G3+BD5Pxo6V+SxShKZo+ZNGU3HVrF9p2V7QH0YFQj5B8F6AicA3fYh2BVUFECTPuMpy5A52ufWu0r4xOFmbU7SIhRQRAQz2u4yjXqBsrpYptAvyzzoN4gjUhNnwOHSPsvFpWoBFkWmqn0ytgHg3Vv9DlHW+45P02QH1UFedXR2MqLnwRI30qqtaOkVS+9rE/dhnR+XPpHHG+hv2TgMDAuQ3IK7Ab5m/yCbN73cxFifH4LST0vVG3Jx45xn+GTeHHhfkAfBSCtya6191jixbqyovpRunCBKexI5cfRPtWOitM3m7Mq26r7LpobMM+oOLUm4p0KKNIthWcmK9tYwXWSuGGfUQ+Y8gt7E0G06ZGbCPHOrxJ8lYQqXsif04piONPA/c9Hq43O99KPNGShONCS9oPFdOLRT3U= ostree-image-test
-              ssh_pwauth: True
-              chpasswd:
-                list: |
-                  root:foobar
-                  admin:foobar
-                expire: False
-          packages:
-            - python3
-            - python3-dnf
-      register: tmp_instance_result
-      when: "'remote' in os"
-
-    # avoid registering a variable when a “when” condition is *not* met
-    - set_fact:
-        instance_result: "{{ tmp_instance_result }}"
-      when: tmp_instance_result.changed
-
-    - set_fact:
-        instance_ip_addr: "{{ instance_result.server.addresses.shared_net_9[0].addr }}"
-      when: cloud_profile == "rhos-01" or cloud_profile == "rhos-0x"
-
-    - set_fact:
-        instance_ip_addr: "{{ instance_result.server.addresses.provider_net_shared_2[0].addr }}"
-      when: cloud_profile == "rhos-d"
-
-    - name: waits until instance is reachable
-      wait_for:
-        host: "{{ instance_ip_addr }}"
-        port: 22
-        search_regex: OpenSSH
-        delay: 10
-
-    - name: add instance ip into host group guest
-      add_host:
-        name: "{{ instance_ip_addr }}"
-        groups: guest
-
-    - name: keep private key permission to 600
-      file:
-        path: "key/ostree_key"
-        mode: "0600"
-
-    - name: ensure cloud-init has finished
-      raw: test -f /var/lib/cloud/instance/boot-finished
-      retries: 60
-      register: cloud_init_check
-      changed_when: false
-      until: cloud_init_check is success
-      delegate_to: "{{ instance_ip_addr }}"
-
-- hosts: guest
-  gather_facts: yes
-  become: yes
-
-  tasks:
-    - name: Upgrade all packages
-      dnf:
-        name: '*'
-        state: latest
-
-    - name: Install test required packages
-      dnf:
-        name:
-          - curl
-          - expect
-          - firewalld
-          - git
-          - jq
-          - libvirt-client
-          - libvirt-daemon-kvm
-          - podman
-          - qemu-img
-          - qemu-kvm
-          - skopeo
-          - unzip
-          - vim
-          - virt-install
-          - wget
-        disable_gpg_check: yes
-        state: present
-
-    - block:
-        - name: Install dependency packages
-          dnf:
-            name:
-              - gcc
-              - python3-devel
-              - python3-pip
-
-        - name: Import the Microsoft repository key
-          rpm_key:
-            state: present
-            key: https://packages.microsoft.com/keys/microsoft.asc
-
-        - name: Copy Azure-cli repo file
-          copy:
-            src: azure-cli.repo
-            dest: /etc/yum.repos.d/azure-cli.repo
-
-        - name: Copy google-cloud-sdk repo file
-          copy:
-            src: google-cloud-sdk.repo
-            dest: /etc/yum.repos.d/google-cloud-sdk.repo
-
-        - name: Install ansible-core, az cli and gcloud cli
-          dnf:
-            name:
-              - beaker-client
-              - ansible-core
-              - azure-cli
-              - google-cloud-sdk
-            state: present
-
-        - name: Install required ansible modules
-          community.general.ansible_galaxy_install:
-            type: collection
-            name: "{{ item }}"
-          loop:
-            - "community.general"
-            - "openstack.cloud"
-            - "amazon.aws"
-            - "community.aws"
-            - "azure.azcollection"
-            - "community.vmware"
-            - "google.cloud"
-            - "ansible.posix"
-          become_user: fedora
-        # installing community.aws is for community.aws.aws_ssm_parameter_store
-
-        - name: Download AWS cli zip file and unzip it
-          unarchive:
-            src: https://awscli.amazonaws.com/awscli-exe-linux-x86_64.zip
-            dest: /tmp
-            remote_src: yes
-
-        - name: Install AWS cli
-          command: /tmp/aws/install
-          become: yes
-
-        - name: "Check versions"
-          command: "{{ item }}"
-          loop:
-            - "ansible --version"
-            - "ansible-galaxy collection list"
-            - "aws --version"
-            - "az --version"
-            - "gcloud --version"
-
-        - name: Delete AWS folder
-          file:
-            path: /tmp/aws
-            state: absent
-
-        - name: Install ansible module required packages
-          pip:
-            name:
-              # required by openstack
-              - openstacksdk
-              # required by gcloud
-              - google-auth
-              # required by vmware
-              - pyvmomi
-              # required by aws
-              - boto3
-              - botocore
-          become_user: fedora
-
-        - name: Install azure module required packages
-          pip:
-            requirements: /home/fedora/.ansible/collections/ansible_collections/azure/azcollection/requirements-azure.txt
-          become_user: fedora
-      when: "'remote' in os"
diff --git a/tools/playbook/psi-openstack-setup.yaml b/tools/playbook/psi-openstack-setup.yaml
deleted file mode 100644
index c3494562f..000000000
--- a/tools/playbook/psi-openstack-setup.yaml
+++ /dev/null
@@ -1,87 +0,0 @@
----
-- hosts: openstack
-  gather_facts: no
-  become: no
-
-  tasks:
-    - name: create keypair for xiaofwan
-      openstack.cloud.keypair:
-        cloud: rhos-01
-        state: present
-        name: "xiaofwan"
-        public_key_file: "/var/home/xiaofwan/.ssh/id_rsa.pub"
-
-    - name: create keypair for jenkins slave
-      openstack.cloud.keypair:
-        cloud: rhos-01
-        state: present
-        name: "jslave_key"
-        public_key: "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABgQCjT6VkfcyzUflY3n95oKIuqAOuCN5bJDBzfu0t62DabzcNjpCuK0fiKyx0B+UiLJJhprXnFmxmSly2vHApdwwIjLd09WRepcG8p6WdUTv3LfKljNf/iZrfaNeEC0+zjxyCxXc5a3ePYYi/cIcYy1sZIwe3/Q+q4LHU/rqN7eTG6RkxJ71wN3jP3lrkTQm/Uc+qIHGR3kGQuY+4ARZg08zEtpM2EWWxDvZJWGlhvYxt86mdKy/ngNxbK4fYaq1DRAhJyFxekEaoGSDE+gADNAxknzoslxpqul530Zk/E+umEIxWlYWWFSXppxRk/g1Ue03FKzJ7/bU1y39iCUsMdGJxMpRktWQAWnr1rfQAltgbyePmbk/sXhjHgkDlvkSRQbGJKZ534jXJJaSPmwnUHq8iKr1dBMLo55qK8aBglj/MZUAq7/Y5354cPze2lLtVrOS4IO3UErNLb+H4AZ+suD5OMjUZ3sP6F2FeA/j7wGxv6yUvrVpT4Quc4SVhJOuDRdU= jslave-psi-openstack"
-
-    - name: create security group jslave_security_group for jenkins slave
-      openstack.cloud.security_group:
-        cloud: rhos-01
-        name: "jslave_security_group"
-        state: present
-        description: security group for jenkins slave
-
-    - name: permit ssh in security group jslave_security_group
-      openstack.cloud.security_group_rule:
-        cloud: rhos-01
-        security_group: "jslave_security_group"
-        protocol: tcp
-        port_range_min: 22
-        port_range_max: 22
-        remote_ip_prefix: 0.0.0.0/0
-
-    - name: create security group debug_vm
-      openstack.cloud.security_group:
-        cloud: rhos-01
-        name: "debug_vm"
-        state: present
-        description: security group for debug_vm
-
-    - name: permit ssh in security group debug_vm
-      openstack.cloud.security_group_rule:
-        cloud: rhos-01
-        security_group: "debug_vm"
-        protocol: tcp
-        port_range_min: 22
-        port_range_max: 22
-        remote_ip_prefix: 0.0.0.0/0
-
-    - name: permit http in security group debug_vm
-      openstack.cloud.security_group_rule:
-        cloud: rhos-01
-        security_group: "debug_vm"
-        protocol: tcp
-        port_range_min: 80
-        port_range_max: 80
-        remote_ip_prefix: 0.0.0.0/0
-
-    - name: permit https in security group debug_vm
-      openstack.cloud.security_group_rule:
-        cloud: rhos-01
-        security_group: "debug_vm"
-        protocol: tcp
-        port_range_min: 443
-        port_range_max: 443
-        remote_ip_prefix: 0.0.0.0/0
-
-    - name: permit squid proxy in security group debug_vm
-      openstack.cloud.security_group_rule:
-        cloud: rhos-01
-        security_group: "debug_vm"
-        protocol: tcp
-        port_range_min: 8080
-        port_range_max: 8080
-        remote_ip_prefix: 0.0.0.0/0
-
-    - name: permit cockpit web in security group debug_vm
-      openstack.cloud.security_group_rule:
-        cloud: rhos-01
-        security_group: "debug_vm"
-        protocol: tcp
-        port_range_min: 9090
-        port_range_max: 9090
-        remote_ip_prefix: 0.0.0.0/0
diff --git a/tools/playbook/vm-deploy.yaml b/tools/playbook/vm-deploy.yaml
deleted file mode 100644
index 177c2ef70..000000000
--- a/tools/playbook/vm-deploy.yaml
+++ /dev/null
@@ -1,332 +0,0 @@
----
-- hosts: openstack
-  gather_facts: no
-  become: no
-  vars:
-    date_label: "{{ lookup('pipe', 'date +%y%m%d') }}"
-    flavor: "ci.standard.large"
-
-  tasks:
-    - name: create keypair for rhel-edge test
-      openstack.cloud.keypair:
-        cloud: rhos-01
-        state: present
-        name: "debugging"
-        public_key_file: key/ostree_key.pub
-
-    - name: "deploy RHEL instance"
-      openstack.cloud.server:
-        cloud: rhos-01
-        name: "{{ os }}-{{ date_label }}"
-        image: "{{ images[os] }}"
-        flavor: "{{ flavor }}"
-        network: "shared_net_9"
-        key_name: xiaofwan
-        security_groups: debug_vm
-        auto_ip: yes
-        config_drive: yes
-        wait: yes
-        timeout: 600
-        userdata: |
-          #cloud-config
-          users:
-            - default
-            - name: admin
-              gecos: Administrator
-              groups: users,wheel
-              sudo: ALL=(ALL) NOPASSWD:ALL
-              ssh_authorized_keys:
-                - ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABgQCzxo5dEcS+LDK/OFAfHo6740EyoDM8aYaCkBala0FnWfMMTOq7PQe04ahB0eFLS3IlQtK5bpgzxBdFGVqF6uT5z4hhaPjQec0G3+BD5Pxo6V+SxShKZo+ZNGU3HVrF9p2V7QH0YFQj5B8F6AicA3fYh2BVUFECTPuMpy5A52ufWu0r4xOFmbU7SIhRQRAQz2u4yjXqBsrpYptAvyzzoN4gjUhNnwOHSPsvFpWoBFkWmqn0ytgHg3Vv9DlHW+45P02QH1UFedXR2MqLnwRI30qqtaOkVS+9rE/dhnR+XPpHHG+hv2TgMDAuQ3IK7Ab5m/yCbN73cxFifH4LST0vVG3Jx45xn+GTeHHhfkAfBSCtya6191jixbqyovpRunCBKexI5cfRPtWOitM3m7Mq26r7LpobMM+oOLUm4p0KKNIthWcmK9tYwXWSuGGfUQ+Y8gt7E0G06ZGbCPHOrxJ8lYQqXsif04piONPA/c9Hq43O99KPNGShONCS9oPFdOLRT3U= ostree-image-test
-              ssh_pwauth: True
-              chpasswd:
-                list: |
-                  root:foobar
-                  admin:foobar
-                expire: False
-          yum_repos:
-            baseos:
-              name: rhel-baseos
-              baseurl: "{{ repos[os]['baseos'] }}"
-              enabled: true
-              gpgcheck: false
-              sslverify: false
-            appstream:
-              name: rhel-appstream
-              baseurl: "{{ repos[os]['appstream'] }}"
-              enabled: true
-              gpgcheck: false
-              sslverify: false
-            crb:
-              name: rhel-appstream
-              baseurl: "{{ repos[os]['crb'] }}"
-              enabled: true
-              gpgcheck: false
-              sslverify: false
-          packages:
-            - python3
-            - python3-dnf
-      register: tmp_instance_result
-      when: "'rhel' in os"
-
-    # avoid registering a variable when a “when” condition is *not* met
-    - set_fact:
-        instance_result: "{{ tmp_instance_result }}"
-      when: tmp_instance_result.changed
-
-    - name: "deploy CentOS Stream instance"
-      openstack.cloud.server:
-        cloud: rhos-01
-        name: "{{ os }}-{{ date_label }}"
-        image: "{{ images[os] }}"
-        flavor: "{{ flavor }}"
-        network: "shared_net_9"
-        key_name: xiaofwan
-        security_groups: debug_vm
-        auto_ip: yes
-        config_drive: yes
-        wait: yes
-        timeout: 600
-        userdata: |
-          #cloud-config
-          packages:
-            - python3
-            - python3-dnf
-          users:
-            - default
-            - name: admin
-              gecos: Administrator
-              groups: users,wheel
-              sudo: ALL=(ALL) NOPASSWD:ALL
-              ssh_authorized_keys:
-                - ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABgQCzxo5dEcS+LDK/OFAfHo6740EyoDM8aYaCkBala0FnWfMMTOq7PQe04ahB0eFLS3IlQtK5bpgzxBdFGVqF6uT5z4hhaPjQec0G3+BD5Pxo6V+SxShKZo+ZNGU3HVrF9p2V7QH0YFQj5B8F6AicA3fYh2BVUFECTPuMpy5A52ufWu0r4xOFmbU7SIhRQRAQz2u4yjXqBsrpYptAvyzzoN4gjUhNnwOHSPsvFpWoBFkWmqn0ytgHg3Vv9DlHW+45P02QH1UFedXR2MqLnwRI30qqtaOkVS+9rE/dhnR+XPpHHG+hv2TgMDAuQ3IK7Ab5m/yCbN73cxFifH4LST0vVG3Jx45xn+GTeHHhfkAfBSCtya6191jixbqyovpRunCBKexI5cfRPtWOitM3m7Mq26r7LpobMM+oOLUm4p0KKNIthWcmK9tYwXWSuGGfUQ+Y8gt7E0G06ZGbCPHOrxJ8lYQqXsif04piONPA/c9Hq43O99KPNGShONCS9oPFdOLRT3U= ostree-image-test
-              ssh_pwauth: True
-      register: tmp_instance_result
-      when: "'centos' in os"
-
-    # avoid registering a variable when a “when” condition is *not* met
-    - set_fact:
-        instance_result: "{{ tmp_instance_result }}"
-      when: tmp_instance_result.changed
-
-    - name: "deploy Fedora instance"
-      openstack.cloud.server:
-        cloud: rhos-01
-        name: "{{ os }}-{{ date_label }}"
-        image: "{{ images[os] }}"
-        flavor: "{{ flavor }}"
-        network: "shared_net_9"
-        key_name: xiaofwan
-        security_groups: debug_vm
-        auto_ip: yes
-        config_drive: yes
-        wait: yes
-        timeout: 600
-        userdata: |
-          #cloud-config
-          packages:
-            - python3
-            - python3-dnf
-          users:
-            - default
-            - name: admin
-              gecos: Administrator
-              groups: users,wheel
-              sudo: ALL=(ALL) NOPASSWD:ALL
-              ssh_authorized_keys:
-                - ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABgQCzxo5dEcS+LDK/OFAfHo6740EyoDM8aYaCkBala0FnWfMMTOq7PQe04ahB0eFLS3IlQtK5bpgzxBdFGVqF6uT5z4hhaPjQec0G3+BD5Pxo6V+SxShKZo+ZNGU3HVrF9p2V7QH0YFQj5B8F6AicA3fYh2BVUFECTPuMpy5A52ufWu0r4xOFmbU7SIhRQRAQz2u4yjXqBsrpYptAvyzzoN4gjUhNnwOHSPsvFpWoBFkWmqn0ytgHg3Vv9DlHW+45P02QH1UFedXR2MqLnwRI30qqtaOkVS+9rE/dhnR+XPpHHG+hv2TgMDAuQ3IK7Ab5m/yCbN73cxFifH4LST0vVG3Jx45xn+GTeHHhfkAfBSCtya6191jixbqyovpRunCBKexI5cfRPtWOitM3m7Mq26r7LpobMM+oOLUm4p0KKNIthWcmK9tYwXWSuGGfUQ+Y8gt7E0G06ZGbCPHOrxJ8lYQqXsif04piONPA/c9Hq43O99KPNGShONCS9oPFdOLRT3U= ostree-image-test
-              ssh_pwauth: True
-      register: tmp_instance_result
-      when: "'fedora' in os"
-
-    # avoid registering a variable when a “when” condition is *not* met
-    - set_fact:
-        instance_result: "{{ tmp_instance_result }}"
-      when: tmp_instance_result.changed
-
-    - name: "deploy remote instance"
-      openstack.cloud.server:
-        cloud: rhos-01
-        name: "{{ os }}-{{ date_label }}"
-        image: "{{ images[os] }}"
-        flavor: "{{ flavor }}"
-        network: "shared_net_9"
-        key_name: xiaofwan
-        security_groups: debug_vm
-        auto_ip: yes
-        config_drive: yes
-        wait: yes
-        timeout: 600
-        userdata: |
-          #cloud-config
-          users:
-            - default
-            - name: admin
-              gecos: Administrator
-              groups: users,wheel
-              sudo: ALL=(ALL) NOPASSWD:ALL
-              ssh_authorized_keys:
-                - ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABgQCzxo5dEcS+LDK/OFAfHo6740EyoDM8aYaCkBala0FnWfMMTOq7PQe04ahB0eFLS3IlQtK5bpgzxBdFGVqF6uT5z4hhaPjQec0G3+BD5Pxo6V+SxShKZo+ZNGU3HVrF9p2V7QH0YFQj5B8F6AicA3fYh2BVUFECTPuMpy5A52ufWu0r4xOFmbU7SIhRQRAQz2u4yjXqBsrpYptAvyzzoN4gjUhNnwOHSPsvFpWoBFkWmqn0ytgHg3Vv9DlHW+45P02QH1UFedXR2MqLnwRI30qqtaOkVS+9rE/dhnR+XPpHHG+hv2TgMDAuQ3IK7Ab5m/yCbN73cxFifH4LST0vVG3Jx45xn+GTeHHhfkAfBSCtya6191jixbqyovpRunCBKexI5cfRPtWOitM3m7Mq26r7LpobMM+oOLUm4p0KKNIthWcmK9tYwXWSuGGfUQ+Y8gt7E0G06ZGbCPHOrxJ8lYQqXsif04piONPA/c9Hq43O99KPNGShONCS9oPFdOLRT3U= ostree-image-test
-              ssh_pwauth: True
-              chpasswd:
-                list: |
-                  root:foobar
-                  admin:foobar
-                expire: False
-          packages:
-            - python3
-            - python3-dnf
-      register: tmp_instance_result
-      when: "'remote' in os"
-
-    # avoid registering a variable when a “when” condition is *not* met
-    - set_fact:
-        instance_result: "{{ tmp_instance_result }}"
-      when: tmp_instance_result.changed
-
-    - name: waits until instance is reachable
-      wait_for:
-        host: "{{ instance_result.openstack.public_v4 }}"
-        port: 22
-        search_regex: OpenSSH
-        delay: 10
-
-    - name: add instance ip into host group guest
-      add_host:
-        name: "{{ instance_result.openstack.public_v4 }}"
-        groups: guest
-
-    - name: keep private key permission to 600
-      file:
-        path: "key/ostree_key"
-        mode: "0600"
-
-    - name: ensure cloud-init has finished
-      raw: test -f /var/lib/cloud/instance/boot-finished
-      retries: 60
-      register: cloud_init_check
-      changed_when: false
-      until: cloud_init_check is success
-      delegate_to: "{{ instance_result.openstack.public_v4 }}"
-
-- hosts: guest
-  gather_facts: yes
-  become: yes
-
-  tasks:
-    - name: Upgrade all packages
-      dnf:
-        name: '*'
-        state: latest
-
-    - name: Install test required packages
-      dnf:
-        name:
-          - curl
-          - expect
-          - firewalld
-          - git
-          - jq
-          - libvirt-client
-          - libvirt-daemon-kvm
-          - podman
-          - qemu-img
-          - qemu-kvm
-          - skopeo
-          - unzip
-          - vim
-          - virt-install
-          - wget
-        disable_gpg_check: yes
-        state: present
-
-    - block:
-        - name: Install dependency packages
-          dnf:
-            name:
-              - gcc
-              - python3-devel
-              - python3-pip
-
-        - name: Import the Microsoft repository key
-          rpm_key:
-            state: present
-            key: https://packages.microsoft.com/keys/microsoft.asc
-
-        - name: Copy Azure-cli repo file
-          copy:
-            src: azure-cli.repo
-            dest: /etc/yum.repos.d/azure-cli.repo
-
-        - name: Copy google-cloud-sdk repo file
-          copy:
-            src: google-cloud-sdk.repo
-            dest: /etc/yum.repos.d/google-cloud-sdk.repo
-
-        - name: Install ansible-core, az cli and gcloud cli
-          dnf:
-            name:
-              - beaker-client
-              - ansible-core
-              - azure-cli
-              - google-cloud-sdk
-            state: present
-
-        - name: Install required ansible modules
-          community.general.ansible_galaxy_install:
-            type: collection
-            name: "{{ item }}"
-          loop:
-            - "community.general"
-            - "openstack.cloud"
-            - "amazon.aws"
-            - "community.aws"
-            - "azure.azcollection"
-            - "community.vmware"
-            - "google.cloud"
-            - "ansible.posix"
-          become_user: fedora
-        # installing community.aws is for community.aws.aws_ssm_parameter_store
-
-        - name: Download AWS cli zip file and unzip it
-          unarchive:
-            src: https://awscli.amazonaws.com/awscli-exe-linux-x86_64.zip
-            dest: /tmp
-            remote_src: yes
-
-        - name: Install AWS cli
-          command: /tmp/aws/install
-          become: yes
-
-        - name: "Check versions"
-          command: "{{ item }}"
-          loop:
-            - "ansible --version"
-            - "ansible-galaxy collection list"
-            - "aws --version"
-            - "az --version"
-            - "gcloud --version"
-
-        - name: Delete AWS folder
-          file:
-            path: /tmp/aws
-            state: absent
-
-        - name: Install ansible module required packages
-          pip:
-            name:
-              # required by openstack
-              - openstacksdk
-              # required by gcloud
-              - google-auth
-              # required by vmware
-              - pyvmomi
-              # required by aws
-              - boto3
-              - botocore
-          become_user: fedora
-
-        - name: Install azure module required packages
-          pip:
-            requirements: /home/fedora/.ansible/collections/ansible_collections/azure/azcollection/requirements-azure.txt
-          become_user: fedora
-      when: "'remote' in os"
diff --git a/tools/user-data b/tools/user-data
deleted file mode 100644
index fd1d64ed4..000000000
--- a/tools/user-data
+++ /dev/null
@@ -1,14 +0,0 @@
-#cloud-config
-
-users:
-  - name: admin
-    gecos: Administrator
-    groups: users, wheel
-    sudo: ALL=(ALL) NOPASSWD:ALL
-    lock_passwd: false
-    passwd: $6$rounds=4096$LOrEHmgTz.6NcoJ1$RMkylzuJzdbti2.1p2Nfa3ZtqqzTP.fbtbvsKV71ByyRNlIATcOB8jsxTdM5MlgZvcTCY5nZdLAoohKpn7Fqw/
-    ssh_authorized_keys:
-      - ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABgQCzxo5dEcS+LDK/OFAfHo6740EyoDM8aYaCkBala0FnWfMMTOq7PQe04ahB0eFLS3IlQtK5bpgzxBdFGVqF6uT5z4hhaPjQec0G3+BD5Pxo6V+SxShKZo+ZNGU3HVrF9p2V7QH0YFQj5B8F6AicA3fYh2BVUFECTPuMpy5A52ufWu0r4xOFmbU7SIhRQRAQz2u4yjXqBsrpYptAvyzzoN4gjUhNnwOHSPsvFpWoBFkWmqn0ytgHg3Vv9DlHW+45P02QH1UFedXR2MqLnwRI30qqtaOkVS+9rE/dhnR+XPpHHG+hv2TgMDAuQ3IK7Ab5m/yCbN73cxFifH4LST0vVG3Jx45xn+GTeHHhfkAfBSCtya6191jixbqyovpRunCBKexI5cfRPtWOitM3m7Mq26r7LpobMM+oOLUm4p0KKNIthWcmK9tYwXWSuGGfUQ+Y8gt7E0G06ZGbCPHOrxJ8lYQqXsif04piONPA/c9Hq43O99KPNGShONCS9oPFdOLRT3U= ostree-image-test
-packages:
-  - python3
-  - python3-dnf
diff --git a/tools/user-data.88 b/tools/user-data.88
deleted file mode 100644
index a2bcc710d..000000000
--- a/tools/user-data.88
+++ /dev/null
@@ -1,30 +0,0 @@
-#cloud-config
-
-users:
-  - name: admin
-    gecos: Administrator
-    groups: users, wheel
-    sudo: ALL=(ALL) NOPASSWD:ALL
-    lock_passwd: false
-    passwd: $6$rounds=4096$LOrEHmgTz.6NcoJ1$RMkylzuJzdbti2.1p2Nfa3ZtqqzTP.fbtbvsKV71ByyRNlIATcOB8jsxTdM5MlgZvcTCY5nZdLAoohKpn7Fqw/
-    ssh_authorized_keys:
-      - ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABgQCzxo5dEcS+LDK/OFAfHo6740EyoDM8aYaCkBala0FnWfMMTOq7PQe04ahB0eFLS3IlQtK5bpgzxBdFGVqF6uT5z4hhaPjQec0G3+BD5Pxo6V+SxShKZo+ZNGU3HVrF9p2V7QH0YFQj5B8F6AicA3fYh2BVUFECTPuMpy5A52ufWu0r4xOFmbU7SIhRQRAQz2u4yjXqBsrpYptAvyzzoN4gjUhNnwOHSPsvFpWoBFkWmqn0ytgHg3Vv9DlHW+45P02QH1UFedXR2MqLnwRI30qqtaOkVS+9rE/dhnR+XPpHHG+hv2TgMDAuQ3IK7Ab5m/yCbN73cxFifH4LST0vVG3Jx45xn+GTeHHhfkAfBSCtya6191jixbqyovpRunCBKexI5cfRPtWOitM3m7Mq26r7LpobMM+oOLUm4p0KKNIthWcmK9tYwXWSuGGfUQ+Y8gt7E0G06ZGbCPHOrxJ8lYQqXsif04piONPA/c9Hq43O99KPNGShONCS9oPFdOLRT3U= ostree-image-test
-packages:
-  - python3
-  - python3-dnf
-yum_repos:
-  baseos:
-    name: rhel-baseos
-    baseurl: http://REPLACE_ME_HERE/rhel-8/nightly/RHEL-8/latest-RHEL-8.8.0/compose/BaseOS/aarch64/os/
-    enabled: true
-    gpgcheck: false
-  appstream:
-    name: rhel-baseos
-    baseurl: http://REPLACE_ME_HERE/rhel-8/nightly/RHEL-8/latest-RHEL-8.8.0/compose/AppStream/aarch64/os/
-    enabled: true
-    gpgcheck: false
-  crb:
-    name: rhel-crb
-    baseurl: http://REPLACE_ME_HERE/rhel-8/nightly/RHEL-8/latest-RHEL-8.8.0/compose/CRB/aarch64/os/
-    enabled: true
-    gpgcheck: false
diff --git a/tools/user-data.92 b/tools/user-data.92
deleted file mode 100644
index 27b13b523..000000000
--- a/tools/user-data.92
+++ /dev/null
@@ -1,30 +0,0 @@
-#cloud-config
-
-users:
-  - name: admin
-    gecos: Administrator
-    groups: users, wheel
-    sudo: ALL=(ALL) NOPASSWD:ALL
-    lock_passwd: false
-    passwd: $6$rounds=4096$LOrEHmgTz.6NcoJ1$RMkylzuJzdbti2.1p2Nfa3ZtqqzTP.fbtbvsKV71ByyRNlIATcOB8jsxTdM5MlgZvcTCY5nZdLAoohKpn7Fqw/
-    ssh_authorized_keys:
-      - ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABgQCzxo5dEcS+LDK/OFAfHo6740EyoDM8aYaCkBala0FnWfMMTOq7PQe04ahB0eFLS3IlQtK5bpgzxBdFGVqF6uT5z4hhaPjQec0G3+BD5Pxo6V+SxShKZo+ZNGU3HVrF9p2V7QH0YFQj5B8F6AicA3fYh2BVUFECTPuMpy5A52ufWu0r4xOFmbU7SIhRQRAQz2u4yjXqBsrpYptAvyzzoN4gjUhNnwOHSPsvFpWoBFkWmqn0ytgHg3Vv9DlHW+45P02QH1UFedXR2MqLnwRI30qqtaOkVS+9rE/dhnR+XPpHHG+hv2TgMDAuQ3IK7Ab5m/yCbN73cxFifH4LST0vVG3Jx45xn+GTeHHhfkAfBSCtya6191jixbqyovpRunCBKexI5cfRPtWOitM3m7Mq26r7LpobMM+oOLUm4p0KKNIthWcmK9tYwXWSuGGfUQ+Y8gt7E0G06ZGbCPHOrxJ8lYQqXsif04piONPA/c9Hq43O99KPNGShONCS9oPFdOLRT3U= ostree-image-test
-packages:
-  - python3
-  - python3-dnf
-yum_repos:
-  baseos:
-    name: rhel-baseos
-    baseurl: http://REPLACE_ME_HERE/rhel-9/nightly/RHEL-9/latest-RHEL-9.2.0/compose/BaseOS/aarch64/os/
-    enabled: true
-    gpgcheck: false
-  appstream:
-    name: rhel-baseos
-    baseurl: http://REPLACE_ME_HERE/rhel-9/nightly/RHEL-9/latest-RHEL-9.2.0/compose/AppStream/aarch64/os/
-    enabled: true
-    gpgcheck: false
-  crb:
-    name: rhel-crb
-    baseurl: http://REPLACE_ME_HERE/rhel-9/nightly/RHEL-9/latest-RHEL-9.2.0/compose/CRB/aarch64/os/
-    enabled: true
-    gpgcheck: false
diff --git a/tools/user-data.arch.87 b/tools/user-data.arch.87
deleted file mode 100644
index d871c4410..000000000
--- a/tools/user-data.arch.87
+++ /dev/null
@@ -1,30 +0,0 @@
-#cloud-config
-
-users:
-  - name: admin
-    gecos: Administrator
-    groups: users, wheel
-    sudo: ALL=(ALL) NOPASSWD:ALL
-    lock_passwd: false
-    passwd: $6$rounds=4096$LOrEHmgTz.6NcoJ1$RMkylzuJzdbti2.1p2Nfa3ZtqqzTP.fbtbvsKV71ByyRNlIATcOB8jsxTdM5MlgZvcTCY5nZdLAoohKpn7Fqw/
-    ssh_authorized_keys:
-      - ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABgQCzxo5dEcS+LDK/OFAfHo6740EyoDM8aYaCkBala0FnWfMMTOq7PQe04ahB0eFLS3IlQtK5bpgzxBdFGVqF6uT5z4hhaPjQec0G3+BD5Pxo6V+SxShKZo+ZNGU3HVrF9p2V7QH0YFQj5B8F6AicA3fYh2BVUFECTPuMpy5A52ufWu0r4xOFmbU7SIhRQRAQz2u4yjXqBsrpYptAvyzzoN4gjUhNnwOHSPsvFpWoBFkWmqn0ytgHg3Vv9DlHW+45P02QH1UFedXR2MqLnwRI30qqtaOkVS+9rE/dhnR+XPpHHG+hv2TgMDAuQ3IK7Ab5m/yCbN73cxFifH4LST0vVG3Jx45xn+GTeHHhfkAfBSCtya6191jixbqyovpRunCBKexI5cfRPtWOitM3m7Mq26r7LpobMM+oOLUm4p0KKNIthWcmK9tYwXWSuGGfUQ+Y8gt7E0G06ZGbCPHOrxJ8lYQqXsif04piONPA/c9Hq43O99KPNGShONCS9oPFdOLRT3U= ostree-image-test
-packages:
-  - python3
-  - python3-dnf
-yum_repos:
-  baseos:
-    name: rhel-baseos
-    baseurl: http://REPLACE_ME_HERE/rhel-8/nightly/updates/RHEL-8/latest-RHEL-8.7.0/compose/BaseOS/REPLACE_ARCH_HERE/os/
-    enabled: true
-    gpgcheck: false
-  appstream:
-    name: rhel-baseos
-    baseurl: http://REPLACE_ME_HERE/rhel-8/nightly/updates/RHEL-8/latest-RHEL-8.7.0/compose/AppStream/REPLACE_ARCH_HERE/os/
-    enabled: true
-    gpgcheck: false
-  crb:
-    name: rhel-crb
-    baseurl: http://REPLACE_ME_HERE/rhel-8/nightly/updates/RHEL-8/latest-RHEL-8.7.0/compose/CRB/REPLACE_ARCH_HERE/os/
-    enabled: true
-    gpgcheck: false
diff --git a/tools/user-data.arch.88 b/tools/user-data.arch.88
deleted file mode 100644
index c88aff73d..000000000
--- a/tools/user-data.arch.88
+++ /dev/null
@@ -1,30 +0,0 @@
-#cloud-config
-
-users:
-  - name: admin
-    gecos: Administrator
-    groups: users, wheel
-    sudo: ALL=(ALL) NOPASSWD:ALL
-    lock_passwd: false
-    passwd: $6$rounds=4096$LOrEHmgTz.6NcoJ1$RMkylzuJzdbti2.1p2Nfa3ZtqqzTP.fbtbvsKV71ByyRNlIATcOB8jsxTdM5MlgZvcTCY5nZdLAoohKpn7Fqw/
-    ssh_authorized_keys:
-      - ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABgQCzxo5dEcS+LDK/OFAfHo6740EyoDM8aYaCkBala0FnWfMMTOq7PQe04ahB0eFLS3IlQtK5bpgzxBdFGVqF6uT5z4hhaPjQec0G3+BD5Pxo6V+SxShKZo+ZNGU3HVrF9p2V7QH0YFQj5B8F6AicA3fYh2BVUFECTPuMpy5A52ufWu0r4xOFmbU7SIhRQRAQz2u4yjXqBsrpYptAvyzzoN4gjUhNnwOHSPsvFpWoBFkWmqn0ytgHg3Vv9DlHW+45P02QH1UFedXR2MqLnwRI30qqtaOkVS+9rE/dhnR+XPpHHG+hv2TgMDAuQ3IK7Ab5m/yCbN73cxFifH4LST0vVG3Jx45xn+GTeHHhfkAfBSCtya6191jixbqyovpRunCBKexI5cfRPtWOitM3m7Mq26r7LpobMM+oOLUm4p0KKNIthWcmK9tYwXWSuGGfUQ+Y8gt7E0G06ZGbCPHOrxJ8lYQqXsif04piONPA/c9Hq43O99KPNGShONCS9oPFdOLRT3U= ostree-image-test
-packages:
-  - python3
-  - python3-dnf
-yum_repos:
-  baseos:
-    name: rhel-baseos
-    baseurl: http://REPLACE_ME_HERE/rhel-8/nightly/updates/RHEL-8/latest-RHEL-8.8.0/compose/BaseOS/REPLACE_ARCH_HERE/os/
-    enabled: true
-    gpgcheck: false
-  appstream:
-    name: rhel-baseos
-    baseurl: http://REPLACE_ME_HERE/rhel-8/nightly/updates/RHEL-8/latest-RHEL-8.8.0/compose/AppStream/REPLACE_ARCH_HERE/os/
-    enabled: true
-    gpgcheck: false
-  crb:
-    name: rhel-crb
-    baseurl: http://REPLACE_ME_HERE/rhel-8/nightly/updates/RHEL-8/latest-RHEL-8.8.0/compose/CRB/REPLACE_ARCH_HERE/os/
-    enabled: true
-    gpgcheck: false
diff --git a/tools/user-data.arch.89 b/tools/user-data.arch.89
deleted file mode 100644
index 8d75b5c2f..000000000
--- a/tools/user-data.arch.89
+++ /dev/null
@@ -1,30 +0,0 @@
-#cloud-config
-
-users:
-  - name: admin
-    gecos: Administrator
-    groups: users, wheel
-    sudo: ALL=(ALL) NOPASSWD:ALL
-    lock_passwd: false
-    passwd: $6$rounds=4096$LOrEHmgTz.6NcoJ1$RMkylzuJzdbti2.1p2Nfa3ZtqqzTP.fbtbvsKV71ByyRNlIATcOB8jsxTdM5MlgZvcTCY5nZdLAoohKpn7Fqw/
-    ssh_authorized_keys:
-      - ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABgQCzxo5dEcS+LDK/OFAfHo6740EyoDM8aYaCkBala0FnWfMMTOq7PQe04ahB0eFLS3IlQtK5bpgzxBdFGVqF6uT5z4hhaPjQec0G3+BD5Pxo6V+SxShKZo+ZNGU3HVrF9p2V7QH0YFQj5B8F6AicA3fYh2BVUFECTPuMpy5A52ufWu0r4xOFmbU7SIhRQRAQz2u4yjXqBsrpYptAvyzzoN4gjUhNnwOHSPsvFpWoBFkWmqn0ytgHg3Vv9DlHW+45P02QH1UFedXR2MqLnwRI30qqtaOkVS+9rE/dhnR+XPpHHG+hv2TgMDAuQ3IK7Ab5m/yCbN73cxFifH4LST0vVG3Jx45xn+GTeHHhfkAfBSCtya6191jixbqyovpRunCBKexI5cfRPtWOitM3m7Mq26r7LpobMM+oOLUm4p0KKNIthWcmK9tYwXWSuGGfUQ+Y8gt7E0G06ZGbCPHOrxJ8lYQqXsif04piONPA/c9Hq43O99KPNGShONCS9oPFdOLRT3U= ostree-image-test
-packages:
-  - python3
-  - python3-dnf
-yum_repos:
-  baseos:
-    name: rhel-baseos
-    baseurl: http://REPLACE_ME_HERE/rhel-8/nightly/RHEL-8/latest-RHEL-8.9.0/compose/BaseOS/REPLACE_ARCH_HERE/os/
-    enabled: true
-    gpgcheck: false
-  appstream:
-    name: rhel-baseos
-    baseurl: http://REPLACE_ME_HERE/rhel-8/nightly/RHEL-8/latest-RHEL-8.9.0/compose/AppStream/REPLACE_ARCH_HERE/os/
-    enabled: true
-    gpgcheck: false
-  crb:
-    name: rhel-crb
-    baseurl: http://REPLACE_ME_HERE/rhel-8/nightly/RHEL-8/latest-RHEL-8.9.0/compose/CRB/REPLACE_ARCH_HERE/os/
-    enabled: true
-    gpgcheck: false
diff --git a/tools/user-data.arch.91 b/tools/user-data.arch.91
deleted file mode 100644
index 00485f70a..000000000
--- a/tools/user-data.arch.91
+++ /dev/null
@@ -1,30 +0,0 @@
-#cloud-config
-
-users:
-  - name: admin
-    gecos: Administrator
-    groups: users, wheel
-    sudo: ALL=(ALL) NOPASSWD:ALL
-    lock_passwd: false
-    passwd: $6$rounds=4096$LOrEHmgTz.6NcoJ1$RMkylzuJzdbti2.1p2Nfa3ZtqqzTP.fbtbvsKV71ByyRNlIATcOB8jsxTdM5MlgZvcTCY5nZdLAoohKpn7Fqw/
-    ssh_authorized_keys:
-      - ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABgQCzxo5dEcS+LDK/OFAfHo6740EyoDM8aYaCkBala0FnWfMMTOq7PQe04ahB0eFLS3IlQtK5bpgzxBdFGVqF6uT5z4hhaPjQec0G3+BD5Pxo6V+SxShKZo+ZNGU3HVrF9p2V7QH0YFQj5B8F6AicA3fYh2BVUFECTPuMpy5A52ufWu0r4xOFmbU7SIhRQRAQz2u4yjXqBsrpYptAvyzzoN4gjUhNnwOHSPsvFpWoBFkWmqn0ytgHg3Vv9DlHW+45P02QH1UFedXR2MqLnwRI30qqtaOkVS+9rE/dhnR+XPpHHG+hv2TgMDAuQ3IK7Ab5m/yCbN73cxFifH4LST0vVG3Jx45xn+GTeHHhfkAfBSCtya6191jixbqyovpRunCBKexI5cfRPtWOitM3m7Mq26r7LpobMM+oOLUm4p0KKNIthWcmK9tYwXWSuGGfUQ+Y8gt7E0G06ZGbCPHOrxJ8lYQqXsif04piONPA/c9Hq43O99KPNGShONCS9oPFdOLRT3U= ostree-image-test
-packages:
-  - python3
-  - python3-dnf
-yum_repos:
-  baseos:
-    name: rhel-baseos
-    baseurl: http://REPLACE_ME_HERE/rhel-9/nightly/updates/RHEL-9/latest-RHEL-9.1.0/compose/BaseOS/REPLACE_ARCH_HERE/os/
-    enabled: true
-    gpgcheck: false
-  appstream:
-    name: rhel-baseos
-    baseurl: http://REPLACE_ME_HERE/rhel-9/nightly/updates/RHEL-9/latest-RHEL-9.1.0/compose/AppStream/REPLACE_ARCH_HERE/os/
-    enabled: true
-    gpgcheck: false
-  crb:
-    name: rhel-crb
-    baseurl: http://REPLACE_ME_HERE/rhel-9/nightly/updates/RHEL-9/latest-RHEL-9.1.0/compose/CRB/REPLACE_ARCH_HERE/os/
-    enabled: true
-    gpgcheck: false
diff --git a/tools/user-data.arch.92 b/tools/user-data.arch.92
deleted file mode 100644
index cd36a2631..000000000
--- a/tools/user-data.arch.92
+++ /dev/null
@@ -1,30 +0,0 @@
-#cloud-config
-
-users:
-  - name: admin
-    gecos: Administrator
-    groups: users, wheel
-    sudo: ALL=(ALL) NOPASSWD:ALL
-    lock_passwd: false
-    passwd: $6$rounds=4096$LOrEHmgTz.6NcoJ1$RMkylzuJzdbti2.1p2Nfa3ZtqqzTP.fbtbvsKV71ByyRNlIATcOB8jsxTdM5MlgZvcTCY5nZdLAoohKpn7Fqw/
-    ssh_authorized_keys:
-      - ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABgQCzxo5dEcS+LDK/OFAfHo6740EyoDM8aYaCkBala0FnWfMMTOq7PQe04ahB0eFLS3IlQtK5bpgzxBdFGVqF6uT5z4hhaPjQec0G3+BD5Pxo6V+SxShKZo+ZNGU3HVrF9p2V7QH0YFQj5B8F6AicA3fYh2BVUFECTPuMpy5A52ufWu0r4xOFmbU7SIhRQRAQz2u4yjXqBsrpYptAvyzzoN4gjUhNnwOHSPsvFpWoBFkWmqn0ytgHg3Vv9DlHW+45P02QH1UFedXR2MqLnwRI30qqtaOkVS+9rE/dhnR+XPpHHG+hv2TgMDAuQ3IK7Ab5m/yCbN73cxFifH4LST0vVG3Jx45xn+GTeHHhfkAfBSCtya6191jixbqyovpRunCBKexI5cfRPtWOitM3m7Mq26r7LpobMM+oOLUm4p0KKNIthWcmK9tYwXWSuGGfUQ+Y8gt7E0G06ZGbCPHOrxJ8lYQqXsif04piONPA/c9Hq43O99KPNGShONCS9oPFdOLRT3U= ostree-image-test
-packages:
-  - python3
-  - python3-dnf
-yum_repos:
-  baseos:
-    name: rhel-baseos
-    baseurl: http://REPLACE_ME_HERE/rhel-9/nightly/updates/RHEL-9/latest-RHEL-9.2.0/compose/BaseOS/REPLACE_ARCH_HERE/os/
-    enabled: true
-    gpgcheck: false
-  appstream:
-    name: rhel-baseos
-    baseurl: http://REPLACE_ME_HERE/rhel-9/nightly/updates/RHEL-9/latest-RHEL-9.2.0/compose/AppStream/REPLACE_ARCH_HERE/os/
-    enabled: true
-    gpgcheck: false
-  crb:
-    name: rhel-crb
-    baseurl: http://REPLACE_ME_HERE/rhel-9/nightly/updates/RHEL-9/latest-RHEL-9.2.0/compose/CRB/REPLACE_ARCH_HERE/os/
-    enabled: true
-    gpgcheck: false
diff --git a/tools/user-data.arch.93 b/tools/user-data.arch.93
deleted file mode 100644
index a28902297..000000000
--- a/tools/user-data.arch.93
+++ /dev/null
@@ -1,30 +0,0 @@
-#cloud-config
-
-users:
-  - name: admin
-    gecos: Administrator
-    groups: users, wheel
-    sudo: ALL=(ALL) NOPASSWD:ALL
-    lock_passwd: false
-    passwd: $6$rounds=4096$LOrEHmgTz.6NcoJ1$RMkylzuJzdbti2.1p2Nfa3ZtqqzTP.fbtbvsKV71ByyRNlIATcOB8jsxTdM5MlgZvcTCY5nZdLAoohKpn7Fqw/
-    ssh_authorized_keys:
-      - ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABgQCzxo5dEcS+LDK/OFAfHo6740EyoDM8aYaCkBala0FnWfMMTOq7PQe04ahB0eFLS3IlQtK5bpgzxBdFGVqF6uT5z4hhaPjQec0G3+BD5Pxo6V+SxShKZo+ZNGU3HVrF9p2V7QH0YFQj5B8F6AicA3fYh2BVUFECTPuMpy5A52ufWu0r4xOFmbU7SIhRQRAQz2u4yjXqBsrpYptAvyzzoN4gjUhNnwOHSPsvFpWoBFkWmqn0ytgHg3Vv9DlHW+45P02QH1UFedXR2MqLnwRI30qqtaOkVS+9rE/dhnR+XPpHHG+hv2TgMDAuQ3IK7Ab5m/yCbN73cxFifH4LST0vVG3Jx45xn+GTeHHhfkAfBSCtya6191jixbqyovpRunCBKexI5cfRPtWOitM3m7Mq26r7LpobMM+oOLUm4p0KKNIthWcmK9tYwXWSuGGfUQ+Y8gt7E0G06ZGbCPHOrxJ8lYQqXsif04piONPA/c9Hq43O99KPNGShONCS9oPFdOLRT3U= ostree-image-test
-packages:
-  - python3
-  - python3-dnf
-yum_repos:
-  baseos:
-    name: rhel-baseos
-    baseurl: http://REPLACE_ME_HERE/rhel-9/nightly/RHEL-9/latest-RHEL-9.3.0/compose/BaseOS/REPLACE_ARCH_HERE/os/
-    enabled: true
-    gpgcheck: false
-  appstream:
-    name: rhel-baseos
-    baseurl: http://REPLACE_ME_HERE/rhel-9/nightly/RHEL-9/latest-RHEL-9.3.0/compose/AppStream/REPLACE_ARCH_HERE/os/
-    enabled: true
-    gpgcheck: false
-  crb:
-    name: rhel-crb
-    baseurl: http://REPLACE_ME_HERE/rhel-9/nightly/RHEL-9/latest-RHEL-9.3.0/compose/CRB/REPLACE_ARCH_HERE/os/
-    enabled: true
-    gpgcheck: false
diff --git a/tools/user-data.arch.94 b/tools/user-data.arch.94
deleted file mode 100644
index 113606dcf..000000000
--- a/tools/user-data.arch.94
+++ /dev/null
@@ -1,30 +0,0 @@
-#cloud-config
-
-users:
-  - name: admin
-    gecos: Administrator
-    groups: users, wheel
-    sudo: ALL=(ALL) NOPASSWD:ALL
-    lock_passwd: false
-    passwd: $6$rounds=4096$LOrEHmgTz.6NcoJ1$RMkylzuJzdbti2.1p2Nfa3ZtqqzTP.fbtbvsKV71ByyRNlIATcOB8jsxTdM5MlgZvcTCY5nZdLAoohKpn7Fqw/
-    ssh_authorized_keys:
-      - ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABgQCzxo5dEcS+LDK/OFAfHo6740EyoDM8aYaCkBala0FnWfMMTOq7PQe04ahB0eFLS3IlQtK5bpgzxBdFGVqF6uT5z4hhaPjQec0G3+BD5Pxo6V+SxShKZo+ZNGU3HVrF9p2V7QH0YFQj5B8F6AicA3fYh2BVUFECTPuMpy5A52ufWu0r4xOFmbU7SIhRQRAQz2u4yjXqBsrpYptAvyzzoN4gjUhNnwOHSPsvFpWoBFkWmqn0ytgHg3Vv9DlHW+45P02QH1UFedXR2MqLnwRI30qqtaOkVS+9rE/dhnR+XPpHHG+hv2TgMDAuQ3IK7Ab5m/yCbN73cxFifH4LST0vVG3Jx45xn+GTeHHhfkAfBSCtya6191jixbqyovpRunCBKexI5cfRPtWOitM3m7Mq26r7LpobMM+oOLUm4p0KKNIthWcmK9tYwXWSuGGfUQ+Y8gt7E0G06ZGbCPHOrxJ8lYQqXsif04piONPA/c9Hq43O99KPNGShONCS9oPFdOLRT3U= ostree-image-test
-packages:
-  - python3
-  - python3-dnf
-yum_repos:
-  baseos:
-    name: rhel-baseos
-    baseurl: http://REPLACE_ME_HERE/rhel-9/nightly/RHEL-9/latest-RHEL-9.4.0/compose/BaseOS/REPLACE_ARCH_HERE/os/
-    enabled: true
-    gpgcheck: false
-  appstream:
-    name: rhel-baseos
-    baseurl: http://REPLACE_ME_HERE/rhel-9/nightly/RHEL-9/latest-RHEL-9.4.0/compose/AppStream/REPLACE_ARCH_HERE/os/
-    enabled: true
-    gpgcheck: false
-  crb:
-    name: rhel-crb
-    baseurl: http://REPLACE_ME_HERE/rhel-9/nightly/RHEL-9/latest-RHEL-9.4.0/compose/CRB/REPLACE_ARCH_HERE/os/
-    enabled: true
-    gpgcheck: false