diff --git a/.circleci/config.yml b/.circleci/config.yml
index 40c558a2..5bdf6aac 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -80,37 +80,21 @@ jobs:
             pushd build-minimal
             make tests
             popd
-  # Prepare dependencies for aarch64
-  "build/aarch64-prepare":
-    machine:
-      image: ubuntu-2004:202010-01
-    steps:
-      - checkout
-      - run:
-          name: Prepare dependencies for aarch64
-          command: |
-            docker run --rm --privileged multiarch/qemu-user-static:register
-            docker run -v $PWD:/falco -w /falco -e BUILD_DIR=/build --entrypoint="scripts/ci-build-alpine-aarch64.sh" -v /build:/build multiarch/alpine:aarch64-v3.12 prepare
-      - persist_to_workspace:
-          root: /
-          paths:
-            - falco
-            - build
   # CMake for aarch64
   "build/aarch64-cmake":
     machine:
       image: ubuntu-2004:202010-01
     steps:
-      - attach_workspace:
-          at: /
+      - checkout
       - run:
           name: CMake for aarch64
           command: |
             docker run --rm --privileged multiarch/qemu-user-static:register
-            docker run -v $PWD:/falco -w /falco -e BUILD_DIR=/build --entrypoint="scripts/ci-build-alpine-aarch64.sh" -v /build:/build multiarch/alpine:aarch64-v3.12 cmake
+            docker run --user $(id -u):$(id -g) -v $PWD:/falco -w /falco -e BUILD_DIR=/build --entrypoint="scripts/ci-build-alpine-aarch64.sh" -v /build:/build multiarch/alpine:aarch64-v3.12 cmake
       - persist_to_workspace:
           root: /
           paths:
+            - falco
             - build
   # Build gRPC for aarch64
   "build/aarch64-grpc":
@@ -123,7 +107,7 @@ jobs:
           name: Build gRPC for aarch64
           command: |
             docker run --rm --privileged multiarch/qemu-user-static:register
-            docker run -v $PWD:/falco -w /falco -e BUILD_DIR=/build --entrypoint="scripts/ci-build-alpine-aarch64.sh" -v /build:/build multiarch/alpine:aarch64-v3.12 grpc
+            docker run --user $(id -u):$(id -g) -v $PWD:/falco -w /falco -e BUILD_DIR=/build --entrypoint="scripts/ci-build-alpine-aarch64.sh" -v /build:/build multiarch/alpine:aarch64-v3.12 grpc
       - persist_to_workspace:
           root: /
           paths:
@@ -572,10 +556,7 @@ workflows:
     jobs:
       - "build/musl"
       - "build/minimal"
-      - "build/aarch64-prepare"
-      - "build/aarch64-cmake":
-          requires:
-            - "build/aarch64-prepare"
+      - "build/aarch64-cmake"
       - "build/aarch64-grpc":
           requires:
             - "build/aarch64-cmake"
diff --git a/scripts/ci-build-alpine-aarch64.sh b/scripts/ci-build-alpine-aarch64.sh
index 3794a4de..9ba6f601 100755
--- a/scripts/ci-build-alpine-aarch64.sh
+++ b/scripts/ci-build-alpine-aarch64.sh
@@ -7,13 +7,11 @@ set -xeu
 mkdir -p "${BUILD_DIR}"
 cd "${BUILD_DIR}"
 
+apk update
+apk add g++ gcc cmake cmake make ncurses-dev git bash perl linux-headers autoconf automake m4 libtool elfutils-dev libelf-static patch binutils
+
 while test $# -gt 0; do
     case "$1" in
-        prepare)
-            apk update
-            apk add g++ gcc cmake cmake make ncurses-dev git bash perl linux-headers autoconf automake m4 libtool elfutils-dev libelf-static patch binutils
-            exit 0
-            ;;
         cmake)
             cmake -DUSE_BUNDLED_DEPS=On -DMUSL_OPTIMIZED_BUILD=On -DBUILD_DRIVER=Off /falco
             exit 0