diff --git a/.github/aur/stirling-pdf-bin/PKGBUILD b/.github/aur/stirling-pdf-desktop/PKGBUILD
similarity index 75%
rename from .github/aur/stirling-pdf-bin/PKGBUILD
rename to .github/aur/stirling-pdf-desktop/PKGBUILD
index bc6f59cea3..937f48f5c0 100644
--- a/.github/aur/stirling-pdf-bin/PKGBUILD
+++ b/.github/aur/stirling-pdf-desktop/PKGBUILD
@@ -1,14 +1,14 @@
 # Maintainer: Stirling PDF Inc <contact@stirlingpdf.com>
-pkgname=stirling-pdf-bin
+pkgname=stirling-pdf-desktop
 pkgver=2.7.3
 pkgrel=1
-pkgdesc="Locally hosted, web-based PDF manipulation tool (desktop app, prebuilt binary)"
+pkgdesc="Locally hosted, web-based PDF manipulation tool (Tauri desktop app, official Stirling PDF Inc build)"
 arch=('x86_64')
 url="https://www.stirling.com"
 license=('MIT' 'LicenseRef-Stirling-PDF-Proprietary')
-depends=('gtk3' 'webkit2gtk' 'libappindicator-gtk3')
+depends=('gtk3' 'webkit2gtk-4.1' 'libappindicator-gtk3')
 provides=('stirling-pdf')
-conflicts=('stirling-pdf' 'stirling-pdf-git')
+conflicts=('stirling-pdf' 'stirling-pdf-git' 'stirling-pdf-bin')
 options=('!strip')
 
 source_x86_64=("${pkgname}-${pkgver}.deb::https://github.com/Stirling-Tools/Stirling-PDF/releases/download/v${pkgver}/Stirling-PDF-linux-x86_64.deb")
diff --git a/.github/aur/stirling-pdf-server-bin/PKGBUILD b/.github/aur/stirling-pdf-server-bin/PKGBUILD
index 3e0119e10e..c60923e3af 100644
--- a/.github/aur/stirling-pdf-server-bin/PKGBUILD
+++ b/.github/aur/stirling-pdf-server-bin/PKGBUILD
@@ -6,22 +6,27 @@ pkgdesc="Locally hosted, web-based PDF manipulation tool (server JAR, prebuilt)"
 arch=('any')
 url="https://www.stirling.com"
 license=('MIT' 'LicenseRef-Stirling-PDF-Proprietary')
-depends=('java-runtime>=21')
+depends=('java-runtime>=25')
 provides=('stirling-pdf-server')
 conflicts=('stirling-pdf-server' 'stirling-pdf-server-git')
 backup=('etc/stirling-pdf-server/settings.yml')
 
-source=("Stirling-PDF-with-login-${pkgver}.jar::https://github.com/Stirling-Tools/Stirling-PDF/releases/download/v${pkgver}/Stirling-PDF-with-login.jar"
-        "stirling-pdf-server.service"
-        "stirling-pdf-server.sysusers"
-        "stirling-pdf-server.tmpfiles")
-sha256sums=('PLACEHOLDER_JAR_SHA256'
-            'PLACEHOLDER_SERVICE_SHA256'
-            'PLACEHOLDER_SYSUSERS_SHA256'
-            'PLACEHOLDER_TMPFILES_SHA256')
+source=("Stirling-PDF-with-login-${pkgver}.jar::https://github.com/Stirling-Tools/Stirling-PDF/releases/download/v${pkgver}/Stirling-PDF-with-login.jar")
+sha256sums=('PLACEHOLDER_JAR_SHA256')
 
-prepare() {
-    cat > stirling-pdf-server.service << 'EOF'
+package() {
+    # JAR
+    install -Dm644 "Stirling-PDF-with-login-${pkgver}.jar" \
+        "${pkgdir}/usr/share/stirling-pdf-server/stirling-pdf-server.jar"
+
+    # Wrapper script
+    install -Dm755 /dev/stdin "${pkgdir}/usr/bin/stirling-pdf-server" << 'EOF'
+#!/bin/sh
+exec java $JAVA_OPTS -jar /usr/share/stirling-pdf-server/stirling-pdf-server.jar "$@"
+EOF
+
+    # systemd unit
+    install -Dm644 /dev/stdin "${pkgdir}/usr/lib/systemd/system/stirling-pdf-server.service" << 'EOF'
 [Unit]
 Description=Stirling-PDF Server
 After=network.target
@@ -43,36 +48,16 @@ Environment=JAVA_OPTS=-Xmx512m
 WantedBy=multi-user.target
 EOF
 
-    cat > stirling-pdf-server.sysusers << 'EOF'
+    # sysusers
+    install -Dm644 /dev/stdin "${pkgdir}/usr/lib/sysusers.d/stirling-pdf-server.conf" << 'EOF'
 u stirling-pdf - "Stirling-PDF Server" /var/lib/stirling-pdf-server -
 EOF
 
-    cat > stirling-pdf-server.tmpfiles << 'EOF'
+    # tmpfiles
+    install -Dm644 /dev/stdin "${pkgdir}/usr/lib/tmpfiles.d/stirling-pdf-server.conf" << 'EOF'
 d /var/lib/stirling-pdf-server 0750 stirling-pdf stirling-pdf -
 d /var/log/stirling-pdf-server 0750 stirling-pdf stirling-pdf -
 EOF
-}
-
-package() {
-    # JAR
-    install -Dm644 "Stirling-PDF-with-login-${pkgver}.jar" \
-        "${pkgdir}/usr/share/stirling-pdf-server/stirling-pdf-server.jar"
-
-    # Wrapper script
-    install -Dm755 /dev/stdin "${pkgdir}/usr/bin/stirling-pdf-server" << 'EOF'
-#!/bin/sh
-exec java $JAVA_OPTS -jar /usr/share/stirling-pdf-server/stirling-pdf-server.jar "$@"
-EOF
-
-    # systemd unit
-    install -Dm644 stirling-pdf-server.service \
-        "${pkgdir}/usr/lib/systemd/system/stirling-pdf-server.service"
-
-    # sysusers / tmpfiles
-    install -Dm644 stirling-pdf-server.sysusers \
-        "${pkgdir}/usr/lib/sysusers.d/stirling-pdf-server.conf"
-    install -Dm644 stirling-pdf-server.tmpfiles \
-        "${pkgdir}/usr/lib/tmpfiles.d/stirling-pdf-server.conf"
 
     # Default config stub
     install -dm755 "${pkgdir}/etc/stirling-pdf-server"
@@ -85,6 +70,8 @@ EOF
 
     # License
     install -Dm644 /dev/stdin "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE" << 'EOF'
-MIT License — see https://github.com/Stirling-Tools/Stirling-PDF/blob/main/LICENSE
+MIT License with proprietary carve-outs (open-core).
+SPDX: MIT AND LicenseRef-Stirling-PDF-Proprietary
+See https://github.com/Stirling-Tools/Stirling-PDF/blob/main/LICENSE
 EOF
 }
diff --git a/.github/workflows/aur-publish.yml b/.github/workflows/aur-publish.yml
index a8c240e7fd..3092e4e902 100644
--- a/.github/workflows/aur-publish.yml
+++ b/.github/workflows/aur-publish.yml
@@ -77,52 +77,52 @@ jobs:
       - name: Checkout repository (for PKGBUILD templates)
         uses: actions/checkout@34e114876b0b11c390a56381ad16ebd13914f8d5 # v4.3.1
 
-      - name: Update stirling-pdf-bin PKGBUILD
+      - name: Update stirling-pdf-desktop PKGBUILD
         env:
           VERSION: ${{ needs.get-release-info.outputs.version }}
           DEB_SHA: ${{ needs.get-release-info.outputs.deb_sha256 }}
         run: |
-          PKGBUILD=".github/aur/stirling-pdf-bin/PKGBUILD"
+          PKGBUILD=".github/aur/stirling-pdf-desktop/PKGBUILD"
           sed -i "s/^pkgver=.*/pkgver=${VERSION}/" "$PKGBUILD"
           sed -i "s/^pkgrel=.*/pkgrel=1/" "$PKGBUILD"
           sed -i "s/'PLACEHOLDER_DEB_SHA256'/'${DEB_SHA}'/" "$PKGBUILD"
 
-      - name: Update stirling-pdf-server-bin PKGBUILD
-        env:
-          VERSION: ${{ needs.get-release-info.outputs.version }}
-          JAR_SHA: ${{ needs.get-release-info.outputs.jar_sha256 }}
-        run: |
-          PKGBUILD=".github/aur/stirling-pdf-server-bin/PKGBUILD"
-          sed -i "s/^pkgver=.*/pkgver=${VERSION}/" "$PKGBUILD"
-          sed -i "s/^pkgrel=.*/pkgrel=1/" "$PKGBUILD"
-          sed -i "s/'PLACEHOLDER_JAR_SHA256'/'${JAR_SHA}'/" "$PKGBUILD"
+      # Disabled until we sort out the server packaging story.
+      # The third-party stirling-pdf-bin on AUR currently covers a similar use case.
+      # - name: Update stirling-pdf-server-bin PKGBUILD
+      #   env:
+      #     VERSION: ${{ needs.get-release-info.outputs.version }}
+      #     JAR_SHA: ${{ needs.get-release-info.outputs.jar_sha256 }}
+      #   run: |
+      #     PKGBUILD=".github/aur/stirling-pdf-server-bin/PKGBUILD"
+      #     sed -i "s/^pkgver=.*/pkgver=${VERSION}/" "$PKGBUILD"
+      #     sed -i "s/^pkgrel=.*/pkgrel=1/" "$PKGBUILD"
+      #     sed -i "s/'PLACEHOLDER_JAR_SHA256'/'${JAR_SHA}'/" "$PKGBUILD"
 
-      - name: Show updated PKGBUILDs (for dry-run visibility)
+      - name: Show updated PKGBUILD (for dry-run visibility)
         run: |
-          echo "--- stirling-pdf-bin PKGBUILD ---"
-          cat .github/aur/stirling-pdf-bin/PKGBUILD
-          echo ""
-          echo "--- stirling-pdf-server-bin PKGBUILD ---"
-          cat .github/aur/stirling-pdf-server-bin/PKGBUILD
+          echo "--- stirling-pdf-desktop PKGBUILD ---"
+          cat .github/aur/stirling-pdf-desktop/PKGBUILD
 
-      - name: Publish stirling-pdf-bin to AUR
+      - name: Publish stirling-pdf-desktop to AUR
         if: ${{ github.event_name == 'release' || inputs.dry_run == false }}
-        uses: KSXGitHub/github-actions-deploy-aur@2ac5a4c1d7035885d46b10e3193393be8460b6f1 # v4.1.1
+        uses: KSXGitHub/github-actions-deploy-aur@v4.1.2
         with:
-          pkgname: stirling-pdf-bin
-          pkgbuild: .github/aur/stirling-pdf-bin/PKGBUILD
+          pkgname: stirling-pdf-desktop
+          pkgbuild: .github/aur/stirling-pdf-desktop/PKGBUILD
           commit_username: Stirling PDF Inc
           commit_email: contact@stirlingpdf.com
           ssh_private_key: ${{ secrets.AUR_SSH_PRIVATE_KEY }}
           commit_message: "Update to v${{ needs.get-release-info.outputs.version }}"
 
-      - name: Publish stirling-pdf-server-bin to AUR
-        if: ${{ github.event_name == 'release' || inputs.dry_run == false }}
-        uses: KSXGitHub/github-actions-deploy-aur@2ac5a4c1d7035885d46b10e3193393be8460b6f1 # v4.1.1
-        with:
-          pkgname: stirling-pdf-server-bin
-          pkgbuild: .github/aur/stirling-pdf-server-bin/PKGBUILD
-          commit_username: Stirling PDF Inc
-          commit_email: contact@stirlingpdf.com
-          ssh_private_key: ${{ secrets.AUR_SSH_PRIVATE_KEY }}
-          commit_message: "Update to v${{ needs.get-release-info.outputs.version }}"
+      # Disabled until we sort out the server packaging story.
+      # - name: Publish stirling-pdf-server-bin to AUR
+      #   if: ${{ github.event_name == 'release' || inputs.dry_run == false }}
+      #   uses: KSXGitHub/github-actions-deploy-aur@2ac5a4c1d7035885d46b10e3193393be8460b6f1 # v4.1.1
+      #   with:
+      #     pkgname: stirling-pdf-server-bin
+      #     pkgbuild: .github/aur/stirling-pdf-server-bin/PKGBUILD
+      #     commit_username: Stirling PDF Inc
+      #     commit_email: contact@stirlingpdf.com
+      #     ssh_private_key: ${{ secrets.AUR_SSH_PRIVATE_KEY }}
+      #     commit_message: "Update to v${{ needs.get-release-info.outputs.version }}"