diff --git a/.github/workflows/build_packages.yaml b/.github/workflows/build_packages.yaml
index d54b3709c..12f38fb5f 100644
--- a/.github/workflows/build_packages.yaml
+++ b/.github/workflows/build_packages.yaml
@@ -180,21 +180,8 @@ jobs:
       matrix:
         profile:
           - ${{ needs.prepare.outputs.BUILD_PROFILE }}
-        builder:
-          - 5.0-26
         otp:
           - 24.3.4.2-1
-        elixir:
-          - 1.13.4
-        # used to split elixir packages into a separate job, since the
-        # entire job may take a lot of time, especially on arm64
-        # emulation.
-        # we only want to build ubuntu and centos with elixir for the
-        # time being, so it's easier to just include those with
-        # `with_elixir` set.
-        build_elixir:
-          # - with_elixir
-          - no_elixir
         arch:
           - amd64
           - arm64
@@ -216,19 +203,17 @@ jobs:
           build_machine: aws-arm64
         include:
           - profile: emqx
-            otp: 24.3.4.2-1
-            elixir: 1.13.4
-            build_elixir: with_elixir
+            otp: 25.1.2-2
             arch: amd64
             os: ubuntu20.04
             build_machine: ubuntu-20.04
+            is_elixir: yes
           - profile: emqx
-            otp: 24.3.4.2-1
-            elixir: 1.13.4
-            build_elixir: with_elixir
+            otp: 25.1.2-2
             arch: amd64
             os: amzn2
             build_machine: ubuntu-20.04
+            is_elixir: yes
 
     defaults:
       run:
@@ -246,9 +231,9 @@ jobs:
     - name: build emqx packages
       working-directory: source
       env:
-        BUILDER: ${{ matrix.builder }}
+        BUILDER: '5.0-26'
+        ELIXIR: '1.13.4'
         OTP: ${{ matrix.otp }}
-        ELIXIR: ${{ matrix.elixir }}
         PROFILE: ${{ matrix.profile }}
         ARCH: ${{ matrix.arch }}
         SYSTEM: ${{ matrix.os }}
@@ -262,11 +247,11 @@ jobs:
         fi
         echo "pwd is $PWD"
         PkgTypes="tgz pkg"
-        IsElixir="no"
-        if [ ${{ matrix.build_elixir }} = "with_elixir" ]; then
+        IS_ELIXIR="no"
+        if [ ${{ matrix.is_elixir }} == 'yes' ]; then
           PkgTypes="tgz"
           # set Elixir build flag
-          IsElixir="yes"
+          IS_ELIXIR="yes"
         fi
         for PKGTYPE in ${PkgTypes};
         do
@@ -274,7 +259,7 @@ jobs:
             --profile "${PROFILE}" \
             --pkgtype "${PKGTYPE}" \
             --arch "${ARCH}" \
-            --elixir "${IsElixir}" \
+            --elixir "${IS_ELIXIR}" \
             --builder "ghcr.io/emqx/emqx-builder/${BUILDER}:${ELIXIR}-${OTP}-${SYSTEM}"
         done
     - uses: actions/upload-artifact@v3