diff --git a/.github/workflows/_push-entrypoint.yaml b/.github/workflows/_push-entrypoint.yaml
index 7ba8cbce7..a59511259 100644
--- a/.github/workflows/_push-entrypoint.yaml
+++ b/.github/workflows/_push-entrypoint.yaml
@@ -160,7 +160,7 @@ jobs:
 
   run_emqx_app_tests:
     needs:
-      - sanity-checks
+      - prepare
       - compile
     uses: ./.github/workflows/run_emqx_app_tests.yaml
     with:
diff --git a/.github/workflows/run_emqx_app_tests.yaml b/.github/workflows/run_emqx_app_tests.yaml
index 13a8b42d6..b5b821741 100644
--- a/.github/workflows/run_emqx_app_tests.yaml
+++ b/.github/workflows/run_emqx_app_tests.yaml
@@ -23,7 +23,7 @@ env:
 jobs:
   run_emqx_app_tests:
     runs-on: ${{ inputs.runner }}
-    container: "ghcr.io/emqx/emqx-builder/${{ matrix.builder }}:${{ matrix.elixir}}-${{ matrix.otp }}-ubuntu22.04"
+    container: ${{ inputs.builder }}
 
     defaults:
       run:
@@ -63,5 +63,5 @@ jobs:
     - uses: actions/upload-artifact@v3
       if: failure()
       with:
-        name: logs-${{ matrix.runs-on }}
+        name: logs-${{ inputs.runner }}
         path: apps/emqx/_build/test/logs