diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml
index 38d5f07..1d722e1 100644
--- a/.github/workflows/build.yaml
+++ b/.github/workflows/build.yaml
@@ -147,13 +147,12 @@ jobs:
     runs-on: ${{ matrix.os }}
     container:
       image: yuezk/gpdev:pkgbuild
+      # Add -u builder for arm64
+      options: ${{ matrix.os == 'arm64' && '-u builder' || '' }}
       credentials:
         username: ${{ secrets.DOCKER_HUB_USERNAME }}
         password: ${{ secrets.DOCKER_HUB_TOKEN }}
     steps:
-    - name: Change to non-root user
-      run: |
-        sudo su "$(stat -c '%U' $HOME)"
     - name: Download tarball
       uses: actions/download-artifact@v3
       with: