diff --git a/CHANGELOG.md b/CHANGELOG.md
index 19d17f0..c1bac91 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -3,6 +3,7 @@ All notable changes to this project will be documented in this file.
 This project uses the changelog in accordance with [keepchangelog](http://keepachangelog.com/). Please use this to write notable changes, which is not the same as git commit log...
 
 ## [unreleased][unreleased]
+ - Change git version to version tag instead of dev tag.
  - Fixed 14A emulate bug and MF1 emulate bug (@spp2000 and @xianglin1998)
  - Fixed `hf 14a raw` command raising `AttributeError` (@augustozanellato)
  - Fixed ATS handling in tags that NAK RATS (@augustozanellato)
diff --git a/docs/protocol.md b/docs/protocol.md
index d097ef2..0be1872 100644
--- a/docs/protocol.md
+++ b/docs/protocol.md
@@ -130,7 +130,7 @@ In the following list, "CLI" refers to one typical CLI command using the describ
 * Response: n bytes, a UTF-8 encoded string, no null terminator.
 * CLI: cf `hw version`
 
-Notes: the returned string is the output of `git describe --abbrev=7 --dirty --always --tags` so, depending on the status of the repo it can be
+Notes: the returned string is the output of `git describe --abbrev=7 --dirty --always --tags --match "v*.*"` so, depending on the status of the repo it can be
 * a short tag, e.g. `v2.0.0` if the firmware is built from the tagged commit
 * a longer tag indicating how far it is from the latest tag and 7 nibbles of its commit hash, prepended with `g`, e.g. 5 commits away from v2.0.0: `v2.0.0-5-g617d6d0`
 * a long tag finishing with `-dirty` if the local repo contains changes not yet committed, e.g. `v2.0.0-5-g617d6d0-dirty`
diff --git a/firmware/Makefile.defs b/firmware/Makefile.defs
index 7f7314d..e406962 100644
--- a/firmware/Makefile.defs
+++ b/firmware/Makefile.defs
@@ -26,7 +26,7 @@ CHAMELEON_LITE  := lite
 CURRENT_DEVICE_TYPE ?= ${CHAMELEON_ULTRA}
 
 # Versioning information
-GIT_VERSION := $(shell git describe --abbrev=7 --dirty --always --tags)
+GIT_VERSION := $(shell git describe --abbrev=7 --dirty --always --tags --match "v*.*")
 APP_FW_SEMVER := $(subst v,,$(shell git describe --tags --abbrev=0 --match "v*.*"))
 APP_FW_VER_MAJOR := $(word 1,$(subst ., ,$(APP_FW_SEMVER)))
 APP_FW_VER_MINOR := $(word 2,$(subst ., ,$(APP_FW_SEMVER)))