diff --git a/.github/workflows/build_and_push_docker_images.yaml b/.github/workflows/build_and_push_docker_images.yaml
index 17192971e..4464c8f9c 100644
--- a/.github/workflows/build_and_push_docker_images.yaml
+++ b/.github/workflows/build_and_push_docker_images.yaml
@@ -130,16 +130,16 @@ jobs:
             otp: 24.2.1-1
             elixir: 1.13.4
             arch: amd64
-            build_elixir: no_elixir
+            build_elixir: with_elixir
             build_machine: ubuntu-20.04
             registry: 'public.ecr.aws'
           - os: [debian11, "debian:11-slim", "deploy/docker/Dockerfile"]
             profile: emqx
             otp: 24.2.1-1
             elixir: 1.13.4
-            arch: amd64
+            arch: arm64
             build_elixir: with_elixir
-            build_machine: ubuntu-20.04
+            build_machine: aws-arm64
 
     steps:
     - uses: AutoModality/action-clean@v1
@@ -257,16 +257,16 @@ jobs:
             otp: 24.2.1-1
             elixir: 1.13.4
             arch: amd64
-            build_elixir: no_elixir
+            build_elixir: with_elixir
             build_machine: ubuntu-20.04
-            registry: public.ecr.aws
+            registry: docker.io
           - os: [debian11, "debian:11-slim", "deploy/docker/Dockerfile"]
             profile: emqx
             otp: 24.2.1-1
             elixir: 1.13.4
-            arch: amd64
+            arch: arm64
             build_elixir: with_elixir
-            build_machine: ubuntu-20.04
+            build_machine: aws-arm64
             registry: docker.io
 
     steps: