diff --git a/.ci/docker-compose-file/docker-compose.yaml b/.ci/docker-compose-file/docker-compose.yaml
index 8a5fec042..62d45e693 100644
--- a/.ci/docker-compose-file/docker-compose.yaml
+++ b/.ci/docker-compose-file/docker-compose.yaml
@@ -3,7 +3,7 @@ version: '3.9'
 services:
   erlang23:
     container_name: erlang23
-    image: emqx/build-env:erl23.2.7.2-emqx-2-ubuntu20.04
+    image: ghcr.io/emqx/emqx-builder-helper/5.0:23.2.7.2-emqx-2-ubuntu20.04
     env_file:
       - conf.env
     environment:
@@ -23,7 +23,7 @@ services:
 
   erlang24:
     container_name: erlang24
-    image: emqx/build-env:erl24.0.5-emqx-1-ubuntu20.04
+    image: ghcr.io/emqx/emqx-builder-helper/5.0:24.1.1-emqx-1-ubuntu20.04
     env_file:
       - conf.env
     environment:
diff --git a/.github/workflows/build_packages.yaml b/.github/workflows/build_packages.yaml
index d847eb550..74c42f5f1 100644
--- a/.github/workflows/build_packages.yaml
+++ b/.github/workflows/build_packages.yaml
@@ -87,7 +87,7 @@ jobs:
     steps:
     - uses: actions/download-artifact@v2
       with:
-        name: source-24.1.1-emqx-1
+        name: source-23.2.7.2-emqx-2
         path: .
     - name: unzip source code
       run: Expand-Archive -Path source-23.2.7.2-emqx-2.zip -DestinationPath ./
@@ -96,7 +96,7 @@ jobs:
       id: install_erlang
       ## gleam-lang/setup-erlang does not yet support the installation of otp24 on windows
       with:
-        otp-version: 24.1
+        otp-version: 23.2
     - name: build
       env:
         PYTHON: python
diff --git a/.github/workflows/run_fvt_tests.yaml b/.github/workflows/run_fvt_tests.yaml
index 7820ed42b..ae391c112 100644
--- a/.github/workflows/run_fvt_tests.yaml
+++ b/.github/workflows/run_fvt_tests.yaml
@@ -70,7 +70,7 @@ jobs:
       matrix:
         otp:
         - 23.2.7.2-emqx-2
-        - 24.0.5-emqx-1
+        - 24.1.1-emqx-1
 
     steps:
     - uses: actions/download-artifact@v2
@@ -123,7 +123,7 @@ jobs:
       matrix:
         otp:
         - 23.2.7.2-emqx-2
-        - 24.0.5-emqx-1
+        - 24.1.1-emqx-1
 
     steps:
     - uses: actions/download-artifact@v2