diff --git a/.gitea/workflows/build.yaml b/.gitea/workflows/build.yaml
deleted file mode 100644
index 5281af2..0000000
--- a/.gitea/workflows/build.yaml
+++ /dev/null
@@ -1,33 +0,0 @@
-name: Build Package
-on:
-  push:
-    tags:
-      - 'v*'
-
-jobs:
-  build:
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@v4
-        with:
-          submodules: recursive
-
-      - name: Build package ZIP
-        run: |
-          cd source
-          # Create individual package ZIPs
-          for pkg_dir in packages/*/; do
-            pkg_name=$(basename "$pkg_dir")
-            cd "$pkg_dir"
-            zip -r "../../${pkg_name}.zip" . -x "*.git*"
-            cd ../..
-          done
-          # Create main package ZIP with all sub-packages + manifest
-          zip -j "pkg_mokosuitenpo.zip" pkg_*.xml script.php updates.xml *.zip 2>/dev/null || true
-          ls -la *.zip
-
-      - name: Create Release
-        uses: softprops/action-gh-release@v1
-        with:
-          files: source/pkg_mokosuitenpo.zip
-          generate_release_notes: true
diff --git a/.gitea/workflows/pre-release.yml b/.gitea/workflows/pre-release.yml
new file mode 100644
index 0000000..7e4d40e
--- /dev/null
+++ b/.gitea/workflows/pre-release.yml
@@ -0,0 +1,66 @@
+name: Pre-Release Package
+
+on:
+  push:
+    tags:
+      - "v*"
+  workflow_dispatch:
+    inputs:
+      version:
+        description: "Version (e.g. 1.0.0-alpha.1)"
+        required: true
+
+jobs:
+  build:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v4
+
+      - name: Determine version
+        id: version
+        run: |
+          if [ "${{ github.event_name }}" = "workflow_dispatch" ]; then
+            echo "VERSION=${{ github.event.inputs.version }}" >> $GITHUB_OUTPUT
+            echo "TAG=v${{ github.event.inputs.version }}" >> $GITHUB_OUTPUT
+          else
+            VERSION="${GITHUB_REF#refs/tags/v}"
+            echo "VERSION=$VERSION" >> $GITHUB_OUTPUT
+            echo "TAG=${GITHUB_REF#refs/tags/}" >> $GITHUB_OUTPUT
+          fi
+
+      - name: Build package zip
+        run: |
+          cd source
+          for dir in packages/*/; do
+            pkg_name=$(basename "$dir")
+            cd "$dir"
+            zip -r "../../${pkg_name}.zip" . -x "*.git*"
+            cd ../..
+          done
+          mkdir -p pkg_build
+          mv *.zip pkg_build/
+          cp pkg_*.xml pkg_build/ 2>/dev/null || true
+          cp script.php pkg_build/ 2>/dev/null || true
+          cd pkg_build
+          zip -r "../${{ github.event.repository.name }}-${{ steps.version.outputs.VERSION }}.zip" .
+
+      - name: Create Pre-Release
+        uses: actions/create-release@v1
+        id: create_release
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+        with:
+          tag_name: ${{ steps.version.outputs.TAG }}
+          release_name: "${{ github.event.repository.name }} ${{ steps.version.outputs.TAG }}"
+          draft: false
+          prerelease: true
+
+      - name: Upload Release Asset
+        uses: actions/upload-release-asset@v1
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+        with:
+          upload_url: ${{ steps.create_release.outputs.upload_url }}
+          asset_path: ./source/${{ github.event.repository.name }}-${{ steps.version.outputs.VERSION }}.zip
+          asset_name: ${{ github.event.repository.name }}-${{ steps.version.outputs.VERSION }}.zip
+          asset_content_type: application/zip
diff --git a/.mokogitea/workflows/issue-branch.yml b/.mokogitea/workflows/issue-branch.yml
index bb69873..43d7107 100644
--- a/.mokogitea/workflows/issue-branch.yml
+++ b/.mokogitea/workflows/issue-branch.yml
@@ -5,7 +5,7 @@
 # FILE INFORMATION
 # DEFGROUP: Gitea.Workflow
 # INGROUP: mokocli.Automation
-# VERSION: 01.07.23
+# VERSION: 01.07.24
 # BRIEF: Auto-create feature branch when an issue is opened
 
 name: "Universal: Issue Branch"
diff --git a/source/packages/com_mokosuitenpo/mokosuitenpo.xml b/source/packages/com_mokosuitenpo/mokosuitenpo.xml
index 0ccf933..7e8318e 100644
--- a/source/packages/com_mokosuitenpo/mokosuitenpo.xml
+++ b/source/packages/com_mokosuitenpo/mokosuitenpo.xml
@@ -7,7 +7,7 @@
 	<license>GPL-3.0-or-later</license>
 	<authorEmail>hello@mokoconsulting.tech</authorEmail>
 	<authorUrl>https://mokoconsulting.tech</authorUrl>
-	<version>01.07.23</version>
+	<version>01.07.24</version>
 	<php_minimum>8.3</php_minimum>
 	<description>MokoSuite NPO component</description>
 	<namespace path="src">Moko\Component\MokoSuiteNpo</namespace>
diff --git a/source/pkg_mokosuitenpo.xml b/source/pkg_mokosuitenpo.xml
index 481ae3c..83ff126 100644
--- a/source/pkg_mokosuitenpo.xml
+++ b/source/pkg_mokosuitenpo.xml
@@ -2,7 +2,7 @@
 <extension type="package" method="upgrade">
 	<name>Package - MokoSuite NPO</name>
 	<packagename>mokosuitenpo</packagename>
-	<version>01.07.23</version>
+	<version>01.07.24</version>
 	<creationDate>2026-06-11</creationDate>
 	<author>Moko Consulting</author>
 	<authorEmail>hello@mokoconsulting.tech</authorEmail>