diff --git a/tests/series-format-patch-bb.ref b/tests/series-format-patch-bb.ref
index 3a9f406..4b7cbee 100644
--- a/tests/series-format-patch-bb.ref
+++ b/tests/series-format-patch-bb.ref
@@ -1,6 +1,6 @@
 # umpf-base: base
 # umpf-name: name
-# umpf-version: name/20221209-1
+# umpf-version: name/20240314-2
 # umpf-topic: a
 # umpf-hashinfo: f46ed0419d2c31ed10f978cc461e0d1ae4b3b426
 # umpf-topic-range: d306da785d874c09b89264d3f71632bc14bfe51f..b2b9f854952b0be84ba2472f236783d09bfa6561
@@ -14,6 +14,6 @@ SRC_URI += "\
   file://patches/0101-b1.patch \
   "
 UMPF_BASE = "base"
-UMPF_VERSION = "20221209-1"
+UMPF_VERSION = "20240314-2"
 PV = "${UMPF_BASE}-${UMPF_VERSION}"
 # umpf-end
diff --git a/tests/test-git/info/refs b/tests/test-git/info/refs
index 4855174..ae75a87 100644
--- a/tests/test-git/info/refs
+++ b/tests/test-git/info/refs
@@ -5,6 +5,8 @@ f46ed0419d2c31ed10f978cc461e0d1ae4b3b426	refs/heads/a
 d306da785d874c09b89264d3f71632bc14bfe51f	refs/heads/master
 d306da785d874c09b89264d3f71632bc14bfe51f	refs/tags/base
 9f80efc9c56cd60aa8059a2e599ae4a0e5611521	refs/tags/name/20221209-1
+cafa4a9cf5da347772533d93fc33040b5d961978	refs/tags/name/20240314-2
+a815789db19080f83c2fe01a8fdf41e8172eb33e	refs/tags/name/20240314-2^{}
 402a5929b9e015d35a6b07e4632c5c1a26d0e782	refs/tags/umpf-build
 c42a48897afca146023190ae073373e4d491807e	refs/tags/umpf-merge
 9f80efc9c56cd60aa8059a2e599ae4a0e5611521	refs/tags/umpf-tag
diff --git a/tests/test-git/objects/info/commit-graph b/tests/test-git/objects/info/commit-graph
index b6c7243..3e30da5 100644
Binary files a/tests/test-git/objects/info/commit-graph and b/tests/test-git/objects/info/commit-graph differ
diff --git a/tests/test-git/objects/info/packs b/tests/test-git/objects/info/packs
index e85fc1f..7d4792a 100644
--- a/tests/test-git/objects/info/packs
+++ b/tests/test-git/objects/info/packs
@@ -1,2 +1,2 @@
-P pack-1ba3875ef90f58e563d875a54cff75687436a9b0.pack
+P pack-308eb06292fe3f86a68fa9e5d6a98201d268f7f9.pack
 
diff --git a/tests/test-git/objects/pack/pack-1ba3875ef90f58e563d875a54cff75687436a9b0.bitmap b/tests/test-git/objects/pack/pack-1ba3875ef90f58e563d875a54cff75687436a9b0.bitmap
deleted file mode 100644
index 9c5d72f..0000000
Binary files a/tests/test-git/objects/pack/pack-1ba3875ef90f58e563d875a54cff75687436a9b0.bitmap and /dev/null differ
diff --git a/tests/test-git/objects/pack/pack-1ba3875ef90f58e563d875a54cff75687436a9b0.pack b/tests/test-git/objects/pack/pack-1ba3875ef90f58e563d875a54cff75687436a9b0.pack
deleted file mode 100644
index 2e940b7..0000000
Binary files a/tests/test-git/objects/pack/pack-1ba3875ef90f58e563d875a54cff75687436a9b0.pack and /dev/null differ
diff --git a/tests/test-git/objects/pack/pack-1ba3875ef90f58e563d875a54cff75687436a9b0.rev b/tests/test-git/objects/pack/pack-1ba3875ef90f58e563d875a54cff75687436a9b0.rev
deleted file mode 100644
index e5464b9..0000000
Binary files a/tests/test-git/objects/pack/pack-1ba3875ef90f58e563d875a54cff75687436a9b0.rev and /dev/null differ
diff --git a/tests/test-git/objects/pack/pack-308eb06292fe3f86a68fa9e5d6a98201d268f7f9.bitmap b/tests/test-git/objects/pack/pack-308eb06292fe3f86a68fa9e5d6a98201d268f7f9.bitmap
new file mode 100644
index 0000000..978292e
Binary files /dev/null and b/tests/test-git/objects/pack/pack-308eb06292fe3f86a68fa9e5d6a98201d268f7f9.bitmap differ
diff --git a/tests/test-git/objects/pack/pack-1ba3875ef90f58e563d875a54cff75687436a9b0.idx b/tests/test-git/objects/pack/pack-308eb06292fe3f86a68fa9e5d6a98201d268f7f9.idx
similarity index 50%
rename from tests/test-git/objects/pack/pack-1ba3875ef90f58e563d875a54cff75687436a9b0.idx
rename to tests/test-git/objects/pack/pack-308eb06292fe3f86a68fa9e5d6a98201d268f7f9.idx
index 4ae0df0..922bf2c 100644
Binary files a/tests/test-git/objects/pack/pack-1ba3875ef90f58e563d875a54cff75687436a9b0.idx and b/tests/test-git/objects/pack/pack-308eb06292fe3f86a68fa9e5d6a98201d268f7f9.idx differ
diff --git a/tests/test-git/objects/pack/pack-308eb06292fe3f86a68fa9e5d6a98201d268f7f9.pack b/tests/test-git/objects/pack/pack-308eb06292fe3f86a68fa9e5d6a98201d268f7f9.pack
new file mode 100644
index 0000000..44bd543
Binary files /dev/null and b/tests/test-git/objects/pack/pack-308eb06292fe3f86a68fa9e5d6a98201d268f7f9.pack differ
diff --git a/tests/test-git/packed-refs b/tests/test-git/packed-refs
index c3cdbc2..8826154 100644
--- a/tests/test-git/packed-refs
+++ b/tests/test-git/packed-refs
@@ -6,6 +6,8 @@ f46ed0419d2c31ed10f978cc461e0d1ae4b3b426 refs/heads/a
 d306da785d874c09b89264d3f71632bc14bfe51f refs/heads/master
 d306da785d874c09b89264d3f71632bc14bfe51f refs/tags/base
 9f80efc9c56cd60aa8059a2e599ae4a0e5611521 refs/tags/name/20221209-1
+cafa4a9cf5da347772533d93fc33040b5d961978 refs/tags/name/20240314-2
+^a815789db19080f83c2fe01a8fdf41e8172eb33e
 402a5929b9e015d35a6b07e4632c5c1a26d0e782 refs/tags/umpf-build
 c42a48897afca146023190ae073373e4d491807e refs/tags/umpf-merge
 9f80efc9c56cd60aa8059a2e599ae4a0e5611521 refs/tags/umpf-tag
diff --git a/tests/umpf-format-patch-bb b/tests/umpf-format-patch-bb
index a4bdae5..aee56a3 100644
--- a/tests/umpf-format-patch-bb
+++ b/tests/umpf-format-patch-bb
@@ -3,6 +3,6 @@
 # Test creating a Yocto compatible patchset with "umpf format-patch --bb".
 #
 
-umpf format-patch umpf-tag --bb --patchdir=patches
+umpf format-patch name/20240314-2 --bb --patchdir=patches
 
 diff -u ${TEST_DIR}/series-format-patch-bb.ref patches/series.inc
diff --git a/umpf b/umpf
index 00bf715..e9728a3 100755
--- a/umpf
+++ b/umpf
@@ -1360,6 +1360,10 @@ format_patch_name() {
 }
 
 format_patch_version() {
+	local name="$(<"${STATE}/name")"
+	local version="${content#${name}/}"
+	echo "${version}" > "${STATE}/version"
+	echo "${content}" > "${STATE}/tag"
 	echo "$line" >&${series_out}
 	if ${NIX}; then
 		echo "[" >&${series_out}