diff --git a/.github/workflows/pkgbuild.yml b/.github/workflows/pkgbuild.yml
new file mode 100644
index 0000000..5a0dca5
--- /dev/null
+++ b/.github/workflows/pkgbuild.yml
@@ -0,0 +1,30 @@
+# This is a basic workflow to help you get started with Actions
+
+name: CI
+
+# Controls when the workflow will run
+on:
+  # Triggers the workflow on push or pull request events but only for the "main" branch
+  push:
+    branches: [ "main" ]
+  pull_request:
+    branches: [ "main" ]
+
+  # Allows you to run this workflow manually from the Actions tab
+  workflow_dispatch:
+
+# A workflow run is made up of one or more jobs that can run sequentially or in parallel
+jobs:
+  # This workflow contains a single job called "build"
+  build:
+    # The type of runner that the job will run on
+    runs-on: ubuntu-latest
+
+    # Steps represent a sequence of tasks that will be executed as part of the job
+    steps:
+      # Checks-out your repository under $GITHUB_WORKSPACE, so your job can access it
+      - uses: actions/checkout@v4
+      - uses: 2m/arch-pkgbuild-builder@v1.16
+        with:
+          target: 'pkgbuild'
+          pkgname: 'iwd-firewalld-zone'
diff --git a/PKGBUILD b/iwd-firewalld-zone/PKGBUILD
similarity index 100%
rename from PKGBUILD
rename to iwd-firewalld-zone/PKGBUILD
diff --git a/PKGBUILD.install b/iwd-firewalld-zone/PKGBUILD.install
similarity index 100%
rename from PKGBUILD.install
rename to iwd-firewalld-zone/PKGBUILD.install
diff --git a/bin/iwd-firewalld-zone b/iwd-firewalld-zone/bin/iwd-firewalld-zone
similarity index 100%
rename from bin/iwd-firewalld-zone
rename to iwd-firewalld-zone/bin/iwd-firewalld-zone
diff --git a/systemd/system/iwd-firewalld-zone.path b/iwd-firewalld-zone/systemd/system/iwd-firewalld-zone.path
similarity index 100%
rename from systemd/system/iwd-firewalld-zone.path
rename to iwd-firewalld-zone/systemd/system/iwd-firewalld-zone.path
diff --git a/systemd/system/iwd-firewalld-zone.target b/iwd-firewalld-zone/systemd/system/iwd-firewalld-zone.target
similarity index 100%
rename from systemd/system/iwd-firewalld-zone.target
rename to iwd-firewalld-zone/systemd/system/iwd-firewalld-zone.target
diff --git a/systemd/system/iwd-firewalld-zone@.service b/iwd-firewalld-zone/systemd/system/iwd-firewalld-zone@.service
similarity index 100%
rename from systemd/system/iwd-firewalld-zone@.service
rename to iwd-firewalld-zone/systemd/system/iwd-firewalld-zone@.service