diff --git a/Firmware/GPAD_API/pre_extra_script.py b/Firmware/GPAD_API/pre_extra_script.py
index e83baff2..5662ac60 100644
--- a/Firmware/GPAD_API/pre_extra_script.py
+++ b/Firmware/GPAD_API/pre_extra_script.py
@@ -1,9 +1,20 @@
 Import("env")
 
+try:
+    import git
+except ImportError:
+    env.Execute("$PYTHONEXE -m pip install GitPython")
+
+repo = git.Repo('../../')
+tags = sorted(repo.tags, key=lambda t: t.commit.committed_datetime)
+latest_tag = "unknown"
+if len(tags) > 0:
+    latest_tag = [-1]
+
 cpp_defines = [
     ("COMPANY_NAME", "PubInv "),   # For the Broker ID for MQTT 
     ("PROG_NAME", "GPAD_API "),    # This program
-    ("FIRMWARE_VERSION", "0.46 "), # Initial Menu implementation
+    ("FIRMWARE_VERSION", f"{latest_tag} "),
     ("MODEL_NAME", "KRAKE_"), 
     ("LICENSE", "GNU Affero General Public License, version 3 "),
     ("ORIGIN", "US"),