diff --git a/pyproject.toml b/pyproject.toml
index 483793d21..f6912c235 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -37,6 +37,6 @@ chirpc = "chirp.cli.main:main"
 rmprefix = "release_"
 
 [tool.versioningit.format]
-distance = "{committer_date:%Y%m%d}"
-dirty = "{committer_date:%Y%m%d}+d{build_date:%Y%m%d}"
-distance-dirty = "{committer_date:%Y%m%d}+d{build_date:%Y%m%d}"
+distance = "{committer_date:%Y%m%d}+{distance}.{vcs}{revision}"
+dirty = "{committer_date:%Y%m%d}+{distance}.{vcs}{revision}.d{build_date:%Y%m%d}"
+distance-dirty = "{committer_date:%Y%m%d}+{distance}.{vcs}{revision}.d{build_date:%Y%m%d}"