diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index b8414cb563..2513cd00ca 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -362,7 +362,7 @@ jobs:
     runs-on: [self-hosted, 8vcpu-16ram-ubuntu22-namada-x86]
     container: 
       image: ghcr.io/heliaxdev/namada-ci:namada-main
-    if: github.event.pull_request.draft == false || contains(github.ref, 'mergify/merge-queue')
+    if: github.event.pull_request.draft == false || contains(github.head_ref, 'mergify/merge-queue') || contains(github.ref_name, 'mergify/merge-queue')
     timeout-minutes: 25
     needs: [build-wasm]
 
@@ -473,7 +473,7 @@ jobs:
     runs-on: [self-hosted, 4vcpu-8ram-ubuntu22-namada-x86]
     container: 
       image: ghcr.io/heliaxdev/namada-ci:namada-main
-    if: github.event.pull_request.draft == false || contains(github.ref, 'mergify/merge-queue')
+    if: github.event.pull_request.draft == false || contains(github.head_ref, 'mergify/merge-queue') || contains(github.ref_name, 'mergify/merge-queue')
     needs: [build-wasm, build-binaries]
     timeout-minutes: 35
     strategy: