diff --git a/.github/workflows/aur_upload.yml b/.github/workflows/aur_upload.yml
index 3df72c1..b866107 100644
--- a/.github/workflows/aur_upload.yml
+++ b/.github/workflows/aur_upload.yml
@@ -1,39 +1,80 @@
 name: Upload AUR
-
-on:
-  release:
-    types: [created]
+on: push
+#on:
+#  release:
+#    types: [created]
 
 jobs:
-  build:
+  #  tpi-bin:
+  #    runs-on: ubuntu-latest
+  #    steps:
+  #      - name: Checkout Code
+  #        uses: actions/checkout@v4
+  #      - name: generate PKGBUILD
+  #        run: |
+  #          cp scripts/ci/PKGBUILD.bin ./PKGBUILD
+  #          PACKAGE_NAME=$(grep '^name =' Cargo.toml | sed 's/name = "\(.*\)"/\1/')-bin
+  #          VERSION=$(grep '^version =' Cargo.toml | sed 's/version = "\(.*\)"/\1/')
+  #          MAINTAINER=$(grep '^authors =' Cargo.toml | sed 's/authors = \[\s*"\(.*\)\s*"\]/\1/')
+  #          DESCRIPTION=$(grep '^description =' Cargo.toml | sed 's/description = "\(.*\)"/\1/')
+  #          sed -i "1i # Maintainer: ${MAINTAINER}" PKGBUILD
+  #          sed -i "s/^pkgname=.*/pkgname=${PACKAGE_NAME}/" PKGBUILD
+  #          sed -i "s/^pkgver=.*/pkgver=${VERSION}/" PKGBUILD
+  #          sed -i "s/^pkgdesc=.*/pkgdesc='${DESCRIPTION}'/" PKGBUILD
+  #          echo "VERSION=${VERSION}" >> $GITHUB_ENV
+  #          echo "PKG_NAME=${PACKAGE_NAME}" >> $GITHUB_ENV
+  #      - name: Validate package
+  #        uses: heyhusen/archlinux-package-action@v2
+  #        with:
+  #          updpkgsums: true
+  #          srcinfo: true
+  #      - name: Publish AUR package
+  #        uses: KSXGitHub/github-actions-deploy-aur@v3
+  #        with:
+  #          pkgname: ${{ env.PKG_NAME }}
+  #          pkgbuild: ./PKGBUILD
+  #          commit_username: 'Github automation'
+  #          commit_email: 'noreply@turingpi.com'
+  #          ssh_private_key: ${{ secrets.AUR_DEPLOY_KEY }}
+  #          commit_message: Update package to ${{ env.VERSION }}
+
+  tpi-src:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout Code
         uses: actions/checkout@v4
       - name: generate PKGBUILD
         run: |
-          cp scripts/ci/PKGBUILD .
+          cp scripts/ci/PKGBUILD ./PKGBUILD
           PACKAGE_NAME=$(grep '^name =' Cargo.toml | sed 's/name = "\(.*\)"/\1/')
           VERSION=$(grep '^version =' Cargo.toml | sed 's/version = "\(.*\)"/\1/')
           MAINTAINER=$(grep '^authors =' Cargo.toml | sed 's/authors = \[\s*"\(.*\)\s*"\]/\1/')
           DESCRIPTION=$(grep '^description =' Cargo.toml | sed 's/description = "\(.*\)"/\1/')
           sed -i "1i # Maintainer: ${MAINTAINER}" PKGBUILD
-          sed -i "s/^pkgname=.*/pkgname=${PACKAGE_NAME}/" PKGBUILD
-          sed -i "s/^pkgver=.*/pkgver=${VERSION}/" PKGBUILD
-          sed -i "s/^pkgdesc=.*/pkgdesc='${DESCRIPTION}'/" PKGBUILD
+          sed -i "2i pkgname=${PACKAGE_NAME}" PKGBUILD
+          sed -i "3i pkgver=${VERSION}" PKGBUILD
+          sed -i "4i pkgdesc='${DESCRIPTION}'" PKGBUILD
+          sed -i "5i source=(\"git+https://github.com/turing-machines/tpi.git#tag=v${VERSION}\")" PKGBUILD
           echo "VERSION=${VERSION}" >> $GITHUB_ENV
           echo "PKG_NAME=${PACKAGE_NAME}" >> $GITHUB_ENV
+
+          install=$(cat scripts/ci/install)
+          echo "package() {" >> PKGBUILD
+          echo "    TARGET=\$CARCH-unknown-linux-gnu" >> PKGBUILD
+          echo "$install\n" >> PKGBUILD
+          echo -e "}\n" >> PKGBUILD
+      - run: cat ./PKGBUILD
       - name: Validate package
         uses: heyhusen/archlinux-package-action@v2
         with:
           updpkgsums: true
           srcinfo: true
-      - name: Publish AUR package
-        uses: KSXGitHub/github-actions-deploy-aur@v3
-        with:
-          pkgname: ${{ env.PKG_NAME }}
-          pkgbuild: ./PKGBUILD
-          commit_username: 'Github automation'
-          commit_email: 'noreply@turingpi.com'
-          ssh_private_key: ${{ secrets.AUR_DEPLOY_KEY }}
-          commit_message: Update package to ${{ env.VERSION }}
+          #     - name: Publish AUR package
+          #       uses: KSXGitHub/github-actions-deploy-aur@v3
+          #       with:
+          #         pkgname: ${{ env.PKG_NAME }}
+          #         pkgbuild: ./PKGBUILD
+          #         commit_username: 'Github automation'
+          #         commit_email: 'noreply@turingpi.com'
+          #         ssh_private_key: ${{ secrets.AUR_DEPLOY_KEY }}
+          #         commit_message: Update package to ${{ env.VERSION }}
diff --git a/scripts/ci/PKGBUILD b/scripts/ci/PKGBUILD
index b07815d..da81960 100644
--- a/scripts/ci/PKGBUILD
+++ b/scripts/ci/PKGBUILD
@@ -1,13 +1,24 @@
-pkgname=
-pkgver=
 pkgrel=1
-pkgdesc=
 url=https://turingpi.com/
 license=('Apache')
-arch=('x86_64' 'aarch64')
-source_x86_64=("https://github.com/turing-machines/tpi/releases/download/v${pkgver}/tpi-x86_64-unknown-linux-gnu.tar.gz")
-source_aarch64=("https://github.com/turing-machines/tpi/releases/download/v${pkgver}/tpi-aarch64-unknown-linux-gnu.tar.gz")
+makedepends=('cargo')
+arch=('any')
 
-package() {
-    tar -xzf "${srcdir}/tpi-${CARCH}-unknown-linux-gnu.tar.gz" -C "${pkgdir}"
+prepare() {
+    cd $pkgname
+    export RUSTUP_TOOLCHAIN=stable
+    cargo fetch --locked --target "$CARCH-unknown-linux-gnu"
+}
+
+build() {
+    cd $pkgname
+    export RUSTUP_TOOLCHAIN=stable
+    export CARGO_TARGET_DIR=target
+    cargo build --frozen --release
+}
+
+check() {
+    cd $pkgname
+    export RUSTUP_TOOLCHAIN=stable
+    cargo test --frozen
 }
diff --git a/scripts/ci/PKGBUILD.bin b/scripts/ci/PKGBUILD.bin
new file mode 100644
index 0000000..b07815d
--- /dev/null
+++ b/scripts/ci/PKGBUILD.bin
@@ -0,0 +1,13 @@
+pkgname=
+pkgver=
+pkgrel=1
+pkgdesc=
+url=https://turingpi.com/
+license=('Apache')
+arch=('x86_64' 'aarch64')
+source_x86_64=("https://github.com/turing-machines/tpi/releases/download/v${pkgver}/tpi-x86_64-unknown-linux-gnu.tar.gz")
+source_aarch64=("https://github.com/turing-machines/tpi/releases/download/v${pkgver}/tpi-aarch64-unknown-linux-gnu.tar.gz")
+
+package() {
+    tar -xzf "${srcdir}/tpi-${CARCH}-unknown-linux-gnu.tar.gz" -C "${pkgdir}"
+}
diff --git a/scripts/ci/install b/scripts/ci/install
index 90c46b7..6bc70e5 100644
--- a/scripts/ci/install
+++ b/scripts/ci/install
@@ -1,6 +1,6 @@
 mkdir -p ${pkgdir}/usr/bin
 mkdir -p ${pkgdir}/usr/share/doc/tpi
-install -m 755 ${srcdir}/target/${TARGET}/release/tpi ${pkgdir}/usr/bin/tpi
-install -m 644 ${srcdir}/README.md ${pkgdir}/usr/share/doc/tpi/README.md
-install -m 644 ${srcdir}/LICENSE ${pkgdir}/usr/share/doc/tpi/copyright
+install -m 755 ${srcdir}/${pkgname}/target/${TARGET}/release/tpi ${pkgdir}/usr/bin/tpi
+install -m 644 ${srcdir}/${pkgname}/README.md ${pkgdir}/usr/share/doc/tpi/README.md
+install -m 644 ${srcdir}/${pkgname}/LICENSE ${pkgdir}/usr/share/doc/tpi/copyright