diff --git a/.github/workflows/aur_upload.yml b/.github/workflows/aur_upload.yml
index 3df72c1..2cd619e 100644
--- a/.github/workflows/aur_upload.yml
+++ b/.github/workflows/aur_upload.yml
@@ -1,19 +1,19 @@
 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 .
-          PACKAGE_NAME=$(grep '^name =' Cargo.toml | sed 's/name = "\(.*\)"/\1/')
+          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/')
@@ -28,6 +28,62 @@ jobs:
         with:
           updpkgsums: true
           srcinfo: true
+      - name: Publish AUR package
+        uses: KSXGitHub/github-actions-deploy-aur@v3
+        with:
+          pkgname: ${{ env.PKG_NAME }}-bin
+          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
+    strategy:
+      matrix:
+        name:
+          - master
+          - git
+    steps:
+      - name: Checkout Code
+        uses: actions/checkout@v4
+      - name: generate PKGBUILD
+        run: |
+          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/')
+          if [[ ${{ matrix.name }} == "master" ]]; then
+            TAG=""
+            PACKAGE_NAME=${PACKAGE_NAME}-git
+          else
+            TAG="#tag=v${VERSION}"
+          fi
+          sed -i "1i # Maintainer: ${MAINTAINER}" 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}\")" PKGBUILD
+
+          install=$(cat scripts/ci/install)
+          echo "package() {" >> PKGBUILD
+          echo "TARGET=\$CARCH-unknown-linux-gnu" >> PKGBUILD
+          echo "pkgname=tpi" >> PKGBUILD
+          echo "$install" >> PKGBUILD
+          echo -e "}\n" >> PKGBUILD
+
+          echo "VERSION=${VERSION}" >> $GITHUB_ENV
+          echo "PKG_NAME=${PACKAGE_NAME}" >> $GITHUB_ENV
+      - run: cat ./PKGBUILD
+      - name: Create AUR package
+        uses: addnab/docker-run-action@v3
+        with:
+          registry: ghcr.io
+          image: 'ghcr.io/heyhusen/archlinux-package-action:latest'
+          options: -v ${{ github.workspace }}:/workspace --entrypoint=""
+          run: /workspace/scripts/ci/entry_point.sh
       - name: Publish AUR package
         uses: KSXGitHub/github-actions-deploy-aur@v3
         with:
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index 6723078..9b15172 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -32,8 +32,6 @@ jobs:
     steps:
       - name: Checkout Code
         uses: actions/checkout@v4
-        with:
-          fetch-depth: 1
 
       - name: Install Toolchain
         uses: actions-rs/toolchain@v1
diff --git a/Cargo.toml b/Cargo.toml
index 03931e2..3fc71c7 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -3,7 +3,7 @@ name = "tpi"
 version = "1.0.7"
 edition = "2021"
 license = "Apache-2.0"
-authors = ["Sven Rademakers <sven@turingpi.com>"]
+authors = ["Sven Rademakers <sven.rademakers@gmail.com>"]
 description = "Official Turing-Pi2 CLI tool"
 homepage = "https://turingpi.com/"
 repository = "https://github.com/turing-machines/tpi"
diff --git a/scripts/ci/PKGBUILD b/scripts/ci/PKGBUILD
index b07815d..808bb85 100644
--- a/scripts/ci/PKGBUILD
+++ b/scripts/ci/PKGBUILD
@@ -1,13 +1,25 @@
-pkgname=
-pkgver=
-pkgrel=1
-pkgdesc=
+pkgrel=3
 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")
+license=('Apache-2.0')
+makedepends=('cargo' 'git')
+arch=('x86_64' 'aarch64' 'armv7h')
+options=(!lto)
 
-package() {
-    tar -xzf "${srcdir}/tpi-${CARCH}-unknown-linux-gnu.tar.gz" -C "${pkgdir}"
+prepare() {
+    cd tpi
+    export RUSTUP_TOOLCHAIN=stable
+    cargo fetch --locked --target "$CARCH-unknown-linux-gnu"
+}
+
+build() {
+    cd tpi
+    export RUSTUP_TOOLCHAIN=stable
+    export CARGO_TARGET_DIR=target
+    cargo build --frozen --release --target "$CARCH-unknown-linux-gnu"
+}
+
+check() {
+    cd tpi
+    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..9aedefe
--- /dev/null
+++ b/scripts/ci/PKGBUILD.bin
@@ -0,0 +1,13 @@
+pkgname=
+pkgver=
+pkgrel=1
+pkgdesc=
+url=https://turingpi.com/
+license=('Apache-2.0')
+arch=('x86_64' 'aarch64')
+source_x86_64=("https://github.com/turing-machines/tpi/releases/download/${pkgver}/tpi-x86_64-unknown-linux-gnu.tar.gz")
+source_aarch64=("https://github.com/turing-machines/tpi/releases/download/${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/entry_point.sh b/scripts/ci/entry_point.sh
new file mode 100755
index 0000000..0d8e540
--- /dev/null
+++ b/scripts/ci/entry_point.sh
@@ -0,0 +1,17 @@
+#!/bin/bash
+work_dir=/home/builder/gh-action
+
+echo "::group::Copying files from /workspace to $work_dir"
+mkdir -p $work_dir
+cp -rfv /workspace/* $work_dir
+cd $work_dir
+echo "::endgroup::"
+
+echo "::group::Updating PKGBUID"
+updpkgsums
+makepkg -g >> PKGBUILD
+makepkg --printsrcinfo >.SRCINFO
+
+sudo cp -f PKGBUILD /workspace
+sudo cp -f .SRCINFO /workspace
+echo "::endgroup::"
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