diff --git a/.ci/docker-compose-file/docker-compose.yaml b/.ci/docker-compose-file/docker-compose.yaml
index 5ba6498f3..8a5fec042 100644
--- a/.ci/docker-compose-file/docker-compose.yaml
+++ b/.ci/docker-compose-file/docker-compose.yaml
@@ -23,7 +23,7 @@ services:
 
   erlang24:
     container_name: erlang24
-    image: emqx/build-env:erl24.0.1-emqx-1-ubuntu20.04
+    image: emqx/build-env:erl24.0.5-emqx-1-ubuntu20.04
     env_file:
       - conf.env
     environment:
diff --git a/.github/workflows/build_packages.yaml b/.github/workflows/build_packages.yaml
index a5c156cb5..7388b4d05 100644
--- a/.github/workflows/build_packages.yaml
+++ b/.github/workflows/build_packages.yaml
@@ -14,7 +14,7 @@ jobs:
       matrix:
         container:
           - "emqx/build-env:erl23.2.7.2-emqx-2-ubuntu20.04"
-          - "emqx/build-env:erl24.0.1-emqx-1-ubuntu20.04"
+          - "emqx/build-env:erl24.0.5-emqx-1-ubuntu20.04"
 
     runs-on: ubuntu-20.04
     container: ${{ matrix.container }}
@@ -85,7 +85,7 @@ jobs:
     - uses: gleam-lang/setup-erlang@v1.1.0
       id: install_erlang
       with:
-        otp-version: 23.2
+        otp-version: 24.0.5
     - name: build
       env:
         PYTHON: python
@@ -141,7 +141,7 @@ jobs:
       matrix:
         profile: ${{fromJSON(needs.prepare.outputs.profiles)}}
         erl_otp:
-          - 23.2.7.2-emqx-2
+          - 24.0.5-emqx-1
         exclude:
           - profile: emqx-edge
 
@@ -221,7 +221,7 @@ jobs:
         profile: ${{fromJSON(needs.prepare.outputs.profiles)}}
         erl_otp:
           - 23.2.7.2-emqx-2
-          - 24.0.1-emqx-1
+          - 24.0.5-emqx-1
         arch:
           - amd64
           - arm64
@@ -237,8 +237,6 @@ jobs:
           - centos6
           - raspbian10
           # - raspbian9
-        erl_otp:
-          - 23.2.7.2-emqx-2
         exclude:
         - os: centos6
           arch: arm64
@@ -341,7 +339,7 @@ jobs:
       matrix:
         profile: ${{fromJSON(needs.prepare.outputs.profiles)}}
         erl_otp:
-          - 23.2.7.2-emqx-2
+          - 24.0.5-emqx-1
 
     steps:
     - uses: actions/download-artifact@v2
diff --git a/.github/workflows/build_slim_packages.yaml b/.github/workflows/build_slim_packages.yaml
index afee6c2fe..9e19889fc 100644
--- a/.github/workflows/build_slim_packages.yaml
+++ b/.github/workflows/build_slim_packages.yaml
@@ -15,8 +15,7 @@ jobs:
     strategy:
       matrix:
         erl_otp:
-        - erl23.2.7.2-emqx-2
-        - erl24.0.1-emqx-1
+        - erl24.0.5-emqx-1
 
         os:
         - ubuntu20.04
@@ -60,7 +59,7 @@ jobs:
     strategy:
       matrix:
         erl_otp:
-        - 23.2.7.2-emqx-2
+        - 24.0.5-emqx-1
 
     steps:
     - uses: actions/checkout@v1
diff --git a/.github/workflows/check_deps_integrity.yaml b/.github/workflows/check_deps_integrity.yaml
index 64564469c..96cd71bf0 100644
--- a/.github/workflows/check_deps_integrity.yaml
+++ b/.github/workflows/check_deps_integrity.yaml
@@ -7,8 +7,7 @@ jobs:
     strategy:
       matrix:
         container:
-          - "emqx/build-env:erl23.2.7.2-emqx-2-ubuntu20.04"
-          - "emqx/build-env:erl24.0.1-emqx-1-ubuntu20.04"
+          - "emqx/build-env:erl24.0.5-emqx-1-ubuntu20.04"
 
     runs-on: ubuntu-20.04
     container: ${{ matrix.container }}
diff --git a/.github/workflows/run_emqx_app_tests.yaml b/.github/workflows/run_emqx_app_tests.yaml
index 6e64d7747..d05d41969 100644
--- a/.github/workflows/run_emqx_app_tests.yaml
+++ b/.github/workflows/run_emqx_app_tests.yaml
@@ -13,7 +13,7 @@ jobs:
           matrix:
             container:
               - "emqx/build-env:erl23.2.7.2-emqx-2-ubuntu20.04"
-              - "emqx/build-env:erl24.0.1-emqx-1-ubuntu20.04"
+              - "emqx/build-env:erl24.0.5-emqx-1-ubuntu20.04"
 
         runs-on: ubuntu-20.04
         container: ${{ matrix.container }}
diff --git a/.github/workflows/run_fvt_tests.yaml b/.github/workflows/run_fvt_tests.yaml
index 6fb8f4ea6..dc9479429 100644
--- a/.github/workflows/run_fvt_tests.yaml
+++ b/.github/workflows/run_fvt_tests.yaml
@@ -16,7 +16,7 @@ jobs:
         - uses: gleam-lang/setup-erlang@v1.1.2
           id: install_erlang
           with:
-            otp-version: 23.2
+            otp-version: 24.0.5
         - name: prepare
           run: |
             if make emqx-ee --dry-run > /dev/null 2>&1; then
@@ -72,7 +72,7 @@ jobs:
         - uses: gleam-lang/setup-erlang@v1.1.2
           id: install_erlang
           with:
-            otp-version: 23.2
+            otp-version: 24.0.5
         - name: prepare
           run: |
             if make emqx-ee --dry-run > /dev/null 2>&1; then
@@ -187,7 +187,7 @@ jobs:
           matrix:
             container:
               - "emqx/build-env:erl23.2.7.2-emqx-2-ubuntu20.04"
-              - "emqx/build-env:erl24.0.1-emqx-1-ubuntu20.04"
+              - "emqx/build-env:erl24.0.5-emqx-1-ubuntu20.04"
 
         runs-on: ubuntu-20.04
         container: ${{ matrix.container }}
diff --git a/.github/workflows/run_test_cases.yaml b/.github/workflows/run_test_cases.yaml
index 3e5a1e346..c2b30ed3d 100644
--- a/.github/workflows/run_test_cases.yaml
+++ b/.github/workflows/run_test_cases.yaml
@@ -13,7 +13,7 @@ jobs:
           matrix:
             container:
               - "emqx/build-env:erl23.2.7.2-emqx-2-ubuntu20.04"
-              - "emqx/build-env:erl24.0.1-emqx-1-ubuntu20.04"
+              - "emqx/build-env:erl24.0.5-emqx-1-ubuntu20.04"
 
         runs-on: ubuntu-20.04
         container: ${{ matrix.container }}
@@ -36,7 +36,7 @@ jobs:
           matrix:
             container:
               - "emqx/build-env:erl23.2.7.2-emqx-2-ubuntu20.04"
-              - "emqx/build-env:erl24.0.1-emqx-1-ubuntu20.04"
+              - "emqx/build-env:erl24.0.5-emqx-1-ubuntu20.04"
 
         runs-on: ubuntu-20.04
         container: ${{ matrix.container }}