diff --git a/common/recipes-core/os-release/os-release.bbappend b/common/recipes-core/os-release/os-release.bbappend
new file mode 100644
index 0000000..1692af1
--- /dev/null
+++ b/common/recipes-core/os-release/os-release.bbappend
@@ -0,0 +1,8 @@
+def git_describe(d):
+        return bb.process.run("git describe --dirty")[0]
+def git_tag(d):
+        return bb.process.run("git tag")[0]
+
+VERSION_ID = "${@git_tag(d)}"
+BUILD_ID = "${@git_describe(d)}"
+OS_RELEASE_FIELDS_append = " BUILD_ID"