diff --git a/.github/workflows/build_arm_whells.yml b/.github/workflows/build_arm_whells.yml
index 1bd6f1a5a86..b60826b0d92 100644
--- a/.github/workflows/build_arm_whells.yml
+++ b/.github/workflows/build_arm_whells.yml
@@ -1,6 +1,12 @@
 name: Build arm64
 
 on:
+  # for test action
+  pull_request:
+    branches:
+      - main
+      - feat/add-arm-wheel-build
+  # end for test action
   workflow_dispatch:
     inputs:
       TAG_NAME:
@@ -24,18 +30,23 @@ jobs:
       matrix:
         os: [ ubuntu-20.04 ]
         # python-version: [ "3.8", "3.9", "3.10", "3.11"]
-        python-version: [ "3.11" ]
+        python-version: [ "3.8" ]
     env:
       RUNNER_OS: ${{ matrix.os }}
-      PYTHON_VERSION: ${{ matrix.python-version }}
+      #PYTHON_VERSION: ${{ matrix.python-version }}
     steps:
-      - name: switch python
+      - name: Install clang++ for Ubuntu
+        if: matrix.os == 'ubuntu-20.04'
         run: |
-          export PYENV_ROOT="$HOME/.pyenv"
-          export PATH="$PYENV_ROOT/bin:$PATH"
-          pyenv local "${{ matrix.python-version }}"
-          python --version
-        shell: bash -l {0}
+          pwd
+          uname -a
+          wget https://apt.llvm.org/llvm.sh
+          chmod +x llvm.sh
+          sudo ./llvm.sh 15
+          which clang++-15
+          clang++-15 --version
+          sudo apt-get install -y make cmake ccache ninja-build yasm gawk wget
+          ccache -s
       - name: Update git
         run: |
           sudo add-apt-repository ppa:git-core/ppa -y
@@ -72,49 +83,52 @@ jobs:
           key: ${{ matrix.os }}
           max-size: 5G
           append-timestamp: true
-      - name: Prepare chdb/build.sh
+      - name: remove old clang and link clang-15 to clang
+        if: matrix.os == 'ubuntu-20.04'
         run: |
-          pyenv local "${{ matrix.python-version }}"
-          python3 --version
-          export CC=/usr/bin/clang
-          export CXX=/usr/bin/clang++
-        shell: bash -l {0}
+          sudo rm /usr/bin/clang
+          sudo ln -s /usr/bin/clang-15 /usr/bin/clang
+          sudo rm /usr/bin/clang++
+          sudo ln -s /usr/bin/clang++-15 /usr/bin/clang++
+          which clang++
+          clang++ --version
+      - name: Run packages/build_linux_arm64.sh
+        run: |
+          bash -l -e packages/build_linux_arm64.sh
         continue-on-error: false
-      - name: Install dependencies for building wheels
+      - name: Check ccache statistics
         run: |
-          python3 -m pip install -U pip tox pybind11 twine setuptools wheel
-          python3 -m pip install cibuildwheel==2.12.1
-        shell: bash -l {0}
-      - name: Build wheels
-        run: python3 -m cibuildwheel --output-dir wheelhouse
-        timeout-minutes: 300
-        env:
-          CIBW_DEBUG: 1
-          CIBW_BEFORE_BUILD_LINUX: "yum install -y wget && wget https://apt.llvm.org/llvm.sh; chmod +x llvm.sh; bash ./llvm.sh 15; which clang++-15; wget https://github.com/NixOS/patchelf/releases/download/0.18.0/patchelf-0.18.0-aarch64.tar.gz -O patchelf.tar.gz; tar -xvf patchelf.tar.gz; cp bin/patchelf /usr/bin/; chmod +x /usr/bin/patchelf; patchelf --version;"
-          CIBW_CONTAINER_ENGINE: podman
-          CIBW_ENVIRONMENT_LINUX: "CC=/usr/bin/clang CXX=/usr/bin/clang++"
-          CIBW_BEFORE_BUILD: "pip install -U pip tox pybind11 && bash -x gen_manifest.sh && bash chdb/build.sh"
-          CIBW_BUILD_VERBOSITY: 3
-          CIBW_BUILD: "cp38-manylinux_aarch64 cp39-manylinux_aarch64 cp310-manylinux_aarch64"
-          CIBW_TEST_REQUIRES: "pyarrow pandas psutil"
-          CIBW_TEST_COMMAND: "cd {project} && make test"
-      - name: Keep killall ccache and wait for ccache to finish
-        if: always()
+          ccache -s
+          ls -lh chdb
+          df -h
+      - name: Install patchelf from github
         run: |
-          sleep 60
-          while ps -ef | grep ccache | grep -v grep; do \
-            killall ccache; \
-            sleep 10; \
-          done
+          pyenv local "${{ matrix.python-version }}"
+          wget https://github.com/NixOS/patchelf/releases/download/0.18.0/patchelf-0.18.0-aarch64.tar.gz -O patchelf.tar.gz
+          tar -xvf patchelf.tar.gz
+          sudo cp bin/patchelf /usr/bin/
+          sudo chmod +x /usr/bin/patchelf
+          patchelf --version
+      - name: Audit wheels
+        run: |
+          pyenv local "${{ matrix.python-version }}"
+          python3 -m pip install auditwheel
+          auditwheel -v repair -w dist/ --plat manylinux_2_17_aarch64 dist/*.whl
+        continue-on-error: false
       - name: Show files
-        run: ls -lh wheelhouse
+        run: |
+          # e.g: remove chdb-0.11.4-cp310-cp310-linux_aarch64.whl, keep chdb-0.11.4-cp310-cp310-manylinux_2_17_aarch64.manylinux2014_aarch64.whl
+          sudo rm -f dist/*linux_aarch64.whl
+          ls -lh dist
         shell: bash
+        continue-on-error: false
       - uses: actions/upload-artifact@v3
         with:
-          path: ./wheelhouse/*.whl
+          path: ./dist/*.whl
       - name: Upload pypi
         if: startsWith(github.ref, 'refs/tags/v')
         run: |
+          pyenv local "${{ matrix.python-version }}"
           python3 -m pip install twine
           python3 -m twine upload wheelhouse/*.whl
         env:
diff --git a/.github/workflows/build_wheels.yml b/.github/workflows/build_wheels.yml
index f4a1e51a776..3bd49b0a588 100644
--- a/.github/workflows/build_wheels.yml
+++ b/.github/workflows/build_wheels.yml
@@ -1,21 +1,13 @@
-name: Build
+name: Build X86
 
 on:
-  push:
-    tags:
-      - 'v*'
-    branches:
-      - main
-    paths-ignore:
-      - '**.md'
-      - '**.yml'
-      - '.github/**'
-      - 'examples/**'
-      - 'tests/**'
-  pull_request:
-    branches:
-      - main
   workflow_dispatch:
+    inputs:
+      TAG_NAME:
+        description: 'Release Version Tag'
+        required: true
+  release:
+    types: [created]
 
 jobs:
   build_wheels_linux:
diff --git a/packages/build_linux_arm64.sh b/packages/build_linux_arm64.sh
new file mode 100755
index 00000000000..b0f8cd519fc
--- /dev/null
+++ b/packages/build_linux_arm64.sh
@@ -0,0 +1,56 @@
+#!/bin/bash -l -e
+DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" >/dev/null 2>&1 && pwd )"
+PROJ_DIR=$(dirname ${DIR})
+
+echo ${PROJ_DIR}
+
+for PY_VER in 3.8 3.9 3.10 3.11; do
+    cd ${PROJ_DIR}
+    pyenv local "${PY_VER}"
+    python3 --version
+    python3 -m pip install pybind11
+    export CC=/usr/bin/clang
+    export CXX=/usr/bin/clang++
+    # Install universal2 pkg
+    python3 -VV
+    python3-config --includes
+    # if python3 -VV does not contain ${PY_VER}, then exit
+    if ! python3 -VV 2>&1 | grep -q "${PY_VER}"; then
+        echo "Error: Required version of Python (${PY_VER}) not found. Aborting."
+        exit 1
+    fi
+
+    python3 -m pip install -U pybind11 wheel build tox
+    rm -rf ./buildlib
+
+    ./chdb/build.sh
+    cd chdb && python3 -c "import _chdb; res = _chdb.query('select 1112222222,555', 'JSON'); print(res)" && cd -
+
+    ./gen_manifest.sh
+    cat ./MANIFEST.in
+
+    # try delete 
+    whl_file=$(find dist | grep 'whl$' | grep cp${PY_VER//./}-cp${PY_VER//./} || echo "notfound.whl")
+    rm -f ${whl_file} || :
+
+    python3 -m build --wheel
+
+    python3 -m wheel tags --platform-tag=manylinux_2_17_aarch64
+
+    find dist
+
+    python3 -m pip install pandas pyarrow psutil
+    find dist
+    whl_file=$(find dist | grep 'whl$' | grep cp${PY_VER//./}-cp${PY_VER//./})
+    python3 -m pip install --force-reinstall ${whl_file}
+
+    python3 -c "import chdb; res = chdb.query('select version()', 'CSV'); print(res)"
+
+    python3 -m chdb "SELECT 1, 'ab'" arrowtable
+
+    python3 -m chdb "SELECT 1, 'ab'" dataframe
+
+    bash -x ./chdb/test_smoke.sh
+
+    make test
+done