diff --git a/.github/workflows/publish-aur-nym-vpn-app.yml b/.github/workflows/publish-aur-nym-vpn-app.yml
index c5c0053526..f2e2c44842 100644
--- a/.github/workflows/publish-aur-nym-vpn-app.yml
+++ b/.github/workflows/publish-aur-nym-vpn-app.yml
@@ -19,7 +19,7 @@ on:
         required: false
         default: false
       commit_msg:
-        description: "Commit message for the AUR repo (default to the release tag)"
+        description: "Commit message for the AUR repo (default to package version)"
         type: string
         required: false
 
@@ -95,7 +95,7 @@ jobs:
           commit_username: ${{ secrets.AUR_USERNAME }}
           commit_email: ${{ secrets.AUR_EMAIL }}
           ssh_private_key: ${{ secrets.AUR_SSH_KEY }}
-          commit_message: ${{ inputs.commit_msg || inputs.release_tag }}
+          commit_message: ${{ inputs.commit_msg || format('v{0}', steps.app-version.outputs.metadata) }}
           assets: |
             nym-vpn-app/.pkg/aur/nym-vpn-wrapper.sh
             nym-vpn-app/.pkg/aur/nym-vpn.desktop
diff --git a/.github/workflows/publish-aur-nym-vpnd.yml b/.github/workflows/publish-aur-nym-vpnd.yml
index 31d0ca580b..5911853dcb 100644
--- a/.github/workflows/publish-aur-nym-vpnd.yml
+++ b/.github/workflows/publish-aur-nym-vpnd.yml
@@ -19,7 +19,7 @@ on:
         required: false
         default: false
       commit_msg:
-        description: "Commit message for the AUR repo (default to the release tag)"
+        description: "Commit message for the AUR repo (default to package version)"
         type: string
         required: false
 
@@ -93,6 +93,6 @@ jobs:
           commit_username: ${{ secrets.AUR_USERNAME }}
           commit_email: ${{ secrets.AUR_EMAIL }}
           ssh_private_key: ${{ secrets.AUR_SSH_KEY }}
-          commit_message: ${{ inputs.commit_msg || inputs.release_tag }}
+          commit_message: ${{ inputs.commit_msg || format('v{0}', steps.app-version.outputs.metadata) }}
           assets: |
             nym-vpn-core/crates/nym-vpnd/.pkg/aur/nym-vpnd.service
diff --git a/nym-vpn-app/.pkg/aur/PKGBUILD b/nym-vpn-app/.pkg/aur/PKGBUILD
index a62811e715..7d644b3797 100644
--- a/nym-vpn-app/.pkg/aur/PKGBUILD
+++ b/nym-vpn-app/.pkg/aur/PKGBUILD
@@ -16,7 +16,7 @@ depends=('gcc-libs' 'bash' 'cairo' 'gtk3' 'webkit2gtk-4.1' 'gdk-pixbuf2' 'glib2'
 makedepends=('rust' 'cargo' 'protobuf' 'npm')
 optdepends=('nym-vpnd: NymVPN daemon as a systemd service')
 provides=('nym-vpn-app')
-conflicts=('nym-vpn-app')
+conflicts=('nymvpn-x' 'nym-vpn-app')
 options=(!debug)
 source=("$pkgname-$pkgver.tar.gz::$url/archive/refs/tags/$_release_tag.tar.gz"
     'nym-vpn-wrapper.sh'
diff --git a/nym-vpn-app/.pkg/aur/PKGBUILD-bin b/nym-vpn-app/.pkg/aur/PKGBUILD-bin
index 3b3d71d96a..3a54bcdfc7 100644
--- a/nym-vpn-app/.pkg/aur/PKGBUILD-bin
+++ b/nym-vpn-app/.pkg/aur/PKGBUILD-bin
@@ -16,7 +16,7 @@ depends=('gcc-libs' 'bash' 'cairo' 'gtk3' 'webkit2gtk-4.1' 'gdk-pixbuf2' 'glib2'
 makedepends=()
 optdepends=('nym-vpnd: NymVPN daemon as a systemd service')
 provides=('nym-vpn-app')
-conflicts=('nym-vpn-app')
+conflicts=('nymvpn-x' 'nym-vpn-app')
 options=(!debug)
 source=("$url/releases/download/$_release_tag/nym-vpn_${_pkgver}_linux_x64"
     'nym-vpn-wrapper.sh'