diff --git a/meta/recipes-support/bmaptool/bmaptool_git.bb b/meta/recipes-support/bmaptool/bmaptool_3.9.0.bb
similarity index 94%
rename from meta/recipes-support/bmaptool/bmaptool_git.bb
rename to meta/recipes-support/bmaptool/bmaptool_3.9.0.bb
index 155dd0ac80..28750786af 100644
--- a/meta/recipes-support/bmaptool/bmaptool_git.bb
+++ b/meta/recipes-support/bmaptool/bmaptool_3.9.0.bb
@@ -12,8 +12,9 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=b234ee4d69f5fce4486a80fdaf4a4263"
 SRC_URI = "git://github.com/yoctoproject/${BPN};branch=main;protocol=https"
 SRCREV = "618a7316102f6f81faa60537503012a419eafa06"
 S = "${WORKDIR}/git"
-BASEVER = "3.9.0"
-PV = "${BASEVER}+git"
+
+# TODO: remove when we upgrade to a release past 3.9.0
+PV .= "+git"
 
 UPSTREAM_CHECK_GITTAGREGEX = "v(?P<pver>\d+(\.\d+)+)"