diff --git a/.github/workflows/run_relup_tests.yaml b/.github/workflows/run_relup_tests.yaml
index 89c9cf8e4..27abe3c65 100644
--- a/.github/workflows/run_relup_tests.yaml
+++ b/.github/workflows/run_relup_tests.yaml
@@ -16,7 +16,7 @@ on:
 jobs:
   relup_test_plan:
     runs-on: ubuntu-20.04
-    container: ghcr.io/emqx/emqx-builder/4.4-12:24.1.5-3-ubuntu20.04
+    container: "ghcr.io/emqx/emqx-builder/5.0-17:1.13.4-24.2.1-1-ubuntu20.04"
     outputs:
       ce_vsn: ${{ steps.find-versions.outputs.CUR_CE_VSN }}
       ee_vsn: ${{ steps.find-versions.outputs.CUR_EE_VSN }}
@@ -39,34 +39,16 @@ jobs:
         ee_vsn="$(./pkg-vsn.sh enterprise)"
         old_ce_vsns="$(./scripts/relup-base-vsns.sh opensource | xargs)"
         old_ee_vsns="$(./scripts/relup-base-vsns.sh enterprise | xargs)"
-        echo "OLD_CE_VERSIONS=$old_ce_vsns" >> $GITHUB_ENV
-        echo "OLD_EE_VERSIONS=$old_ee_vsns" >> $GITHUB_ENV
+        old_vsns=$(echo -n "${old_ce_vsns} ${old_ee_vsns}" | sed 's/ $//g' | jq -R -s -c 'split(" ")')
         echo "::set-output name=CUR_CE_VSN::$ce_vsn"
         echo "::set-output name=CUR_EE_VSN::$ee_vsn"
-    - name: Generate matrix
-      id: generate-matrix
+        echo "::set-output name=OLD_VERSIONS::$old_vsns"
+    - name: build emqx
       run: |
         set -x
-        old_vsns=$(echo -n "${OLD_CE_VSNS} ${OLD_EE_VSNS}" | sed 's/ $//g' | jq -R -s -c 'split(" ")')
-        echo "::set-output name=OLD_VERSIONS::$old_vsns"
-
-  relup_test_build:
-    needs: relup_test_plan
-    runs-on: ubuntu-20.04
-    strategy:
-      matrix:
-        profile:
-        - emqx
-        - emqx-enterprise
-    container: "ghcr.io/emqx/emqx-builder/5.0-17:1.13.4-24.2.1-1-ubuntu20.04"
-    defaults:
-      run:
-        shell: bash
-    steps:
-    - name: build emqx
-      env:
-        PROFILE: ${{ matrix.profile }}
-      run: make -C emqx ${PROFILE}-tgz
+        cd emqx
+        make emqx-tgz
+        make emqx-enterprise-tgz
     - uses: actions/upload-artifact@v2
       name: Upload built emqx and test scenario
       with:
@@ -78,7 +60,6 @@ jobs:
   relup_test_run:
     needs:
       - relup_test_plan
-      - relup_test_build
     runs-on: ubuntu-20.04
     container: "ghcr.io/emqx/emqx-builder/5.0-17:1.13.4-24.2.1-1-ubuntu20.04"
     strategy: