diff --git a/.github/workflows/build-kata-static-tarball-amd64.yaml b/.github/workflows/build-kata-static-tarball-amd64.yaml
index d2c902af23..8432e77148 100644
--- a/.github/workflows/build-kata-static-tarball-amd64.yaml
+++ b/.github/workflows/build-kata-static-tarball-amd64.yaml
@@ -2,10 +2,6 @@ name: CI | Build kata-static tarball for amd64
 on:
   workflow_call:
     inputs:
-      checkout-ref:
-        required: false
-        type: string
-        default: ${{ github.sha }}
       tarball-suffix:
         required: false
         type: string
@@ -33,7 +29,7 @@ jobs:
     steps:
       - uses: actions/checkout@v3
         with:
-          ref: ${{ inputs.checkout-ref }}
+          ref: ${{ github.event.pull_request.head.sha }}
           fetch-depth: 0 # This is needed in order to keep the commit ids history
       - name: Build ${{ matrix.asset }}
         run: |
@@ -60,7 +56,7 @@ jobs:
     steps:
       - uses: actions/checkout@v3
         with:
-          ref: ${{ inputs.checkout-ref }}
+          ref: ${{ github.event.pull_request.head.sha }}
       - name: get-artifacts
         uses: actions/download-artifact@v3
         with:
diff --git a/.github/workflows/build-kata-static-tarball-arm64.yaml b/.github/workflows/build-kata-static-tarball-arm64.yaml
index a508622310..753bcf13a3 100644
--- a/.github/workflows/build-kata-static-tarball-arm64.yaml
+++ b/.github/workflows/build-kata-static-tarball-arm64.yaml
@@ -2,10 +2,6 @@ name: CI | Build kata-static tarball for arm64
 on:
   workflow_call:
     inputs:
-      checkout-ref:
-        required: false
-        type: string
-        default: ${{ github.sha }}
       tarball-suffix:
         required: false
         type: string
@@ -37,7 +33,7 @@ jobs:
 
       - uses: actions/checkout@v3
         with:
-          ref: ${{ inputs.checkout-ref }}
+          ref: ${{ github.event.pull_request.head.sha }}
           fetch-depth: 0 # This is needed in order to keep the commit ids history
       - name: Build ${{ matrix.asset }}
         run: |
@@ -68,7 +64,7 @@ jobs:
 
       - uses: actions/checkout@v3
         with:
-          ref: ${{ inputs.checkout-ref }}
+          ref: ${{ github.event.pull_request.head.sha }}
       - name: get-artifacts
         uses: actions/download-artifact@v3
         with:
diff --git a/.github/workflows/build-kata-static-tarball-s390x.yaml b/.github/workflows/build-kata-static-tarball-s390x.yaml
index 064ed006b6..95e4a5ff52 100644
--- a/.github/workflows/build-kata-static-tarball-s390x.yaml
+++ b/.github/workflows/build-kata-static-tarball-s390x.yaml
@@ -2,10 +2,6 @@ name: CI | Build kata-static tarball for s390x
 on:
   workflow_call:
     inputs:
-      checkout-ref:
-        required: false
-        type: string
-        default: ${{ github.sha }}
       tarball-suffix:
         required: false
         type: string
@@ -33,7 +29,7 @@ jobs:
 
       - uses: actions/checkout@v3
         with:
-          ref: ${{ inputs.checkout-ref }}
+          ref: ${{ github.event.pull_request.head.sha }}
           fetch-depth: 0 # This is needed in order to keep the commit ids history
       - name: Build ${{ matrix.asset }}
         run: |
@@ -65,7 +61,7 @@ jobs:
 
       - uses: actions/checkout@v3
         with:
-          ref: ${{ inputs.checkout-ref }}
+          ref: ${{ github.event.pull_request.head.sha }}
       - name: get-artifacts
         uses: actions/download-artifact@v3
         with:
diff --git a/.github/workflows/ci-on-push.yaml b/.github/workflows/ci-on-push.yaml
index f2cd7e0554..2dfd6c728d 100644
--- a/.github/workflows/ci-on-push.yaml
+++ b/.github/workflows/ci-on-push.yaml
@@ -1,36 +1,30 @@
 name: Kata Containers CI
 on:
-  workflow_run:
-    workflows:
-      - Commit Message Check
-    types:
-      - completed
+  pull_request_target:
+    branches:
+      - 'main'
 
 jobs:
   build-kata-static-tarball-amd64:
-    if: ${{ github.event.workflow_run.conclusion == 'success' }}
     uses: ./.github/workflows/build-kata-static-tarball-amd64.yaml
     with:
-      checkout-ref: ${{ github.event.workflow_run.head_sha }}
-      tarball-suffix: -${{ github.event.workflow_run.head_sha }}
+      tarball-suffix: -${{ github.event.pull_request.number}}-${{ github.event.pull_request.head.sha }}
 
   publish-kata-deploy-payload-amd64:
     needs: build-kata-static-tarball-amd64
     uses: ./.github/workflows/publish-kata-deploy-payload-amd64.yaml
     with:
-      checkout-ref: ${{ github.event.workflow_run.head_sha }}
-      tarball-suffix: -${{ github.event.workflow_run.head_sha }}
+      tarball-suffix: -${{ github.event.pull_request.number}}-${{ github.event.pull_request.head.sha }}
       registry: ghcr.io
       repo: ${{ github.repository_owner }}/kata-deploy-ci
-      tag: ${{ github.event.workflow_run.head_sha }}-amd64
+      tag: ${{ github.event.pull_request.number }}-${{ github.event.pull_request.head.sha }}-amd64
     secrets: inherit
 
   run-k8s-tests-on-aks:
     needs: publish-kata-deploy-payload-amd64
     uses: ./.github/workflows/run-k8s-tests-on-aks.yaml
     with:
-      checkout-ref: ${{ github.event.workflow_run.head_sha }}
       registry: ghcr.io
       repo: ${{ github.repository_owner }}/kata-deploy-ci
-      tag: ${{ github.event.workflow_run.head_sha }}-amd64
+      tag: ${{ github.event.pull_request.number }}-${{ github.event.pull_request.head.sha }}-amd64
     secrets: inherit
diff --git a/.github/workflows/publish-kata-deploy-payload-amd64.yaml b/.github/workflows/publish-kata-deploy-payload-amd64.yaml
index 697fdb433c..91c7a0612d 100644
--- a/.github/workflows/publish-kata-deploy-payload-amd64.yaml
+++ b/.github/workflows/publish-kata-deploy-payload-amd64.yaml
@@ -2,10 +2,6 @@ name: CI | Publish kata-deploy payload for amd64
 on:
   workflow_call:
     inputs:
-      checkout-ref:
-        required: false
-        type: string
-        default: ${{ github.sha }}
       tarball-suffix:
         required: false
         type: string
@@ -25,7 +21,7 @@ jobs:
     steps:
       - uses: actions/checkout@v3
         with:
-          ref: ${{ inputs.checkout-ref }}
+          ref: ${{ github.event.pull_request.head.sha }}
 
       - name: get-kata-tarball
         uses: actions/download-artifact@v3
diff --git a/.github/workflows/publish-kata-deploy-payload-arm64.yaml b/.github/workflows/publish-kata-deploy-payload-arm64.yaml
index f1de4abacf..c4fd324775 100644
--- a/.github/workflows/publish-kata-deploy-payload-arm64.yaml
+++ b/.github/workflows/publish-kata-deploy-payload-arm64.yaml
@@ -2,10 +2,6 @@ name: CI | Publish kata-deploy payload for arm64
 on:
   workflow_call:
     inputs:
-      checkout-ref:
-        required: false
-        type: string
-        default: ${{ github.sha }}
       tarball-suffix:
         required: false
         type: string
@@ -29,7 +25,7 @@ jobs:
 
       - uses: actions/checkout@v3
         with:
-          ref: ${{ inputs.checkout-ref }}
+          ref: ${{ github.event.pull_request.head.sha }}
 
       - name: get-kata-tarball
         uses: actions/download-artifact@v3
diff --git a/.github/workflows/publish-kata-deploy-payload-s390x.yaml b/.github/workflows/publish-kata-deploy-payload-s390x.yaml
index 498b8cd98c..2a0ea8071d 100644
--- a/.github/workflows/publish-kata-deploy-payload-s390x.yaml
+++ b/.github/workflows/publish-kata-deploy-payload-s390x.yaml
@@ -2,10 +2,6 @@ name: CI | Publish kata-deploy payload for s390x
 on:
   workflow_call:
     inputs:
-      checkout-ref:
-        required: false
-        type: string
-        default: ${{ github.sha }}
       tarball-suffix:
         required: false
         type: string
@@ -29,7 +25,7 @@ jobs:
 
       - uses: actions/checkout@v3
         with:
-          ref: ${{ inputs.checkout-ref }}
+          ref: ${{ github.event.pull_request.head.sha }}
 
       - name: get-kata-tarball
         uses: actions/download-artifact@v3
diff --git a/.github/workflows/run-k8s-tests-on-aks.yaml b/.github/workflows/run-k8s-tests-on-aks.yaml
index 371fd05a8e..715814818f 100644
--- a/.github/workflows/run-k8s-tests-on-aks.yaml
+++ b/.github/workflows/run-k8s-tests-on-aks.yaml
@@ -2,10 +2,6 @@ name: CI | Run kubernetes tests on AKS
 on:
   workflow_call:
     inputs:
-      checkout-ref:
-        required: false
-        type: string
-        default: ${{ github.sha }}
       registry:
         required: true
         type: string
@@ -17,18 +13,6 @@ on:
         type: string
 
 jobs:
-  create-aks:
-    strategy:
-      matrix:
-        vmm:
-          - clh
-          - dragonball
-          - qemu
-    uses: ./.github/workflows/create-aks.yaml
-    with:
-      name: ${{ inputs.checkout-ref }}-${{ matrix.vmm }}-amd64
-    secrets: inherit
-
   run-k8s-tests:
     strategy:
       fail-fast: false
@@ -38,11 +22,15 @@ jobs:
           - dragonball
           - qemu
     runs-on: ubuntu-latest
-    needs: create-aks
     steps:
+      - name: Create AKS cluster to test ${{ matrix.vmm }}
+        uses: ./.github/workflows-create-aks.yaml
+        with:
+          name: ${{ github.event.pull_request.number }}-${{ github.event.pull_request.head.sha }}-${{ matrix.vmm }}-amd64
+
       - uses: actions/checkout@v3
         with:
-          ref: ${{ inputs.checkout-ref }}
+          ref: ${{ github.event.pull_request.head.sha }}
       - name: Install `bats`
         run: |
           sudo apt-get update
@@ -62,7 +50,7 @@ jobs:
 
       - name: Download credentials for the Kubernetes CLI to use them
         run: |
-          az aks get-credentials -g "kataCI" -n ${{ inputs.checkout-ref }}-${{ matrix.vmm }}-amd64
+          az aks get-credentials -g "kataCI" -n ${{ github.event.pull_request.number }}-${{ github.event.pull_request.head.sha }}-${{ matrix.vmm }}-amd64
 
       - name: Deploy kata-deploy
         run: |
@@ -85,16 +73,8 @@ jobs:
         env:
           KATA_HYPERVISOR: ${{ matrix.vmm }}
 
-  delete-aks:
-    strategy:
-      matrix:
-        vmm:
-          - clh
-          - dragonball
-          - qemu
-    needs: run-k8s-tests
-    if: always()
-    uses: ./.github/workflows/delete-aks.yaml
-    with:
-      name: ${{ inputs.checkout-ref }}-${{ matrix.vmm }}-amd64
-    secrets: inherit
+      - name: Delete AKS cluster used to test ${{ matrix.vmm }}
+        if: always()
+        uses: ./.github/workflows/delete-aks.yaml
+        with:
+          name: ${{ github.event.pull_request.number }}-${{ github.event.pull_request.head.sha }}-${{ matrix.vmm }}-amd64