diff --git a/.build/software/vaultwarden/build.bash b/.build/software/vaultwarden/build.bash
index d9ead499c7..fd7840b7e3 100755
--- a/.build/software/vaultwarden/build.bash
+++ b/.build/software/vaultwarden/build.bash
@@ -34,6 +34,14 @@ export PATH="$HOME/.cargo/bin:$PATH"
 # - vaultwarden
 version=$(curl -sSf 'https://api.github.com/repos/dani-garcia/vaultwarden/releases/latest' | mawk -F\" '/^ *"tag_name": "[^"]*",$/{print $4}')
 [[ $version ]] || { G_DIETPI-NOTIFY 1 'No latest vaultwarden version found, aborting ...'; exit 1; }
+# - Obtain version suffix
+G_EXEC curl -sSfo package.deb "https://dietpi.com/downloads/binaries/$G_DISTRO_NAME/vaultwarden_$G_HW_ARCH_NAME.deb"
+old_version=$(dpkg-deb -f package.deb Version) || exit 1
+G_EXEC rm package.deb
+suffix=${old_version#*-dietpi}
+[[ $old_version == "$version-"* ]] && pkg_version+="-dietpi$((suffix+1))" || pkg_version+="-dietpi1"
+# - Env var to show version in web UI: https://github.com/MichaIng/DietPi/issues/7364
+export VW_VERSION=$pkg_version
 # - web vault
 wv_url=$(curl -sSf 'https://api.github.com/repos/dani-garcia/bw_web_builds/releases/latest' | mawk -F\" '/^ *"browser_download_url": ".*\.tar\.gz"$/{print $4}')
 [[ $wv_url ]] || { G_DIETPI-NOTIFY 1 'No latest web vault version found, aborting ...'; exit 1; }
@@ -213,17 +221,10 @@ DEPS_APT_VERSIONED=${DEPS_APT_VERSIONED%,}
 # shellcheck disable=SC2001
 [[ $G_HW_ARCH_NAME == 'armv6l' ]] && DEPS_APT_VERSIONED=$(sed 's/+rp[it][0-9]\+[^)]*)/)/g' <<< "$DEPS_APT_VERSIONED") || DEPS_APT_VERSIONED=$(sed 's/+b[0-9]\+)/)/g' <<< "$DEPS_APT_VERSIONED")
 
-# - Obtain version suffix
-G_EXEC curl -sSfo package.deb "https://dietpi.com/downloads/binaries/$G_DISTRO_NAME/vaultwarden_$G_HW_ARCH_NAME.deb"
-old_version=$(dpkg-deb -f package.deb Version)
-G_EXEC rm package.deb
-suffix=${old_version#*-dietpi}
-[[ $old_version == "$version-"* ]] && version+="-dietpi$((suffix+1))" || version+="-dietpi1"
-
 # - control
 cat << _EOF_ > "$DIR/DEBIAN/control"
 Package: vaultwarden
-Version: $version
+Version: $pkg_version
 Architecture: $(dpkg --print-architecture)
 Maintainer: MichaIng <micha@dietpi.com>
 Date: $(date -uR)
diff --git a/CHANGELOG.txt b/CHANGELOG.txt
index 9e84d30eaf..b52088b0af 100644
--- a/CHANGELOG.txt
+++ b/CHANGELOG.txt
@@ -7,6 +7,7 @@ Enhancements:
 - RISC-V | Debian Trixie does now support this architecture, hence our VisionFive 2 and Star64 images are now provided with Debian Trixie/testing instead of Debian Sid/unstable, and existing systemd will be migrated to the Trixie suite.
 - RISC-V | Additional software options have been enabled for RISC-V systems: NZBGet, MicroK8s and AdGuard Home
 - DietPi-Software | myMPD: We enabled the software option for ARMv6 Bookworm systems, since packages for Raspbian Bookworm are now available. Many thanks to @hackslikeus for bringing up the topic: https://github.com/MichaIng/DietPi/issues/7345
+- DietPi-Software | vaultwarden: Our builds will now show the package version within the web UI. Many thanks to @gh3597 for reporting it missing and how to add it: https://github.com/MichaIng/DietPi/issues/7364
 
 Removed software:
 - DietPi-Software | A number of software options have been removed, which were installed just as single APT package, without any configuration or dependant. Running `dietpi-software` for such is overkill, as one can just use the native Debian package manager directly, like "apt install tcpdump". Affected software titles: iftop, IPTraf, Iperf, MTR-Tiny, nLoad, tcpdump