diff --git a/examples/simple_repeater/main.cpp b/examples/simple_repeater/main.cpp
index 201491f..2c35106 100644
--- a/examples/simple_repeater/main.cpp
+++ b/examples/simple_repeater/main.cpp
@@ -21,7 +21,13 @@
 
 /* ------------------------------ Config -------------------------------- */
 
-#define FIRMWARE_VER_TEXT   "v6 (build: 27 Feb 2025)"
+#ifndef FIRMWARE_BUILD_DATE
+  #define FIRMWARE_BUILD_DATE   "3 Mar 2025"
+#endif
+
+#ifndef FIRMWARE_VERSION
+  #define FIRMWARE_VERSION   "v1.0.0"
+#endif
 
 #ifndef LORA_FREQ
   #define LORA_FREQ   915.0
@@ -516,7 +522,8 @@ public:
     updateAdvertTimer();
   }
 
-  const char* getFirmwareVer() override { return FIRMWARE_VER_TEXT; }
+  const char* getFirmwareVer() override { return FIRMWARE_VERSION; }
+  const char* getBuildDate() override { return FIRMWARE_BUILD_DATE; }
 
   void savePrefs() override {
 #if defined(NRF52_PLATFORM)
diff --git a/examples/simple_room_server/main.cpp b/examples/simple_room_server/main.cpp
index 2c05ad4..4ef72e1 100644
--- a/examples/simple_room_server/main.cpp
+++ b/examples/simple_room_server/main.cpp
@@ -21,7 +21,13 @@
 
 /* ------------------------------ Config -------------------------------- */
 
-#define FIRMWARE_VER_TEXT   "v6 (build: 27 Feb 2025)"
+#ifndef FIRMWARE_BUILD_DATE
+  #define FIRMWARE_BUILD_DATE   "3 Mar 2025"
+#endif
+
+#ifndef FIRMWARE_VERSION
+  #define FIRMWARE_VERSION   "v1.0.0"
+#endif
 
 #ifndef LORA_FREQ
   #define LORA_FREQ   915.0
@@ -551,7 +557,8 @@ public:
     updateAdvertTimer();
   }
 
-  const char* getFirmwareVer() override { return FIRMWARE_VER_TEXT; }
+  const char* getFirmwareVer() override { return FIRMWARE_VERSION; }
+  const char* getBuildDate() override { return FIRMWARE_BUILD_DATE; }
 
   void savePrefs() override {
 #if defined(NRF52_PLATFORM)
diff --git a/src/helpers/CommonCLI.cpp b/src/helpers/CommonCLI.cpp
index f61d780..b436a1d 100644
--- a/src/helpers/CommonCLI.cpp
+++ b/src/helpers/CommonCLI.cpp
@@ -204,7 +204,7 @@ void CommonCLI::handleCommand(uint32_t sender_timestamp, const char* command, ch
       bool s = _callbacks->formatFileSystem();
       sprintf(reply, "File system erase: %s", s ? "OK" : "Err");
     } else if (memcmp(command, "ver", 3) == 0) {
-      strcpy(reply, _callbacks->getFirmwareVer());
+      sprintf(reply, "%s (Build: %s)", _callbacks->getFirmwareVer(), _callbacks->getBuildDate());
     } else if (memcmp(command, "log start", 9) == 0) {
       _callbacks->setLoggingOn(true);
       strcpy(reply, "   logging on");
diff --git a/src/helpers/CommonCLI.h b/src/helpers/CommonCLI.h
index 63f305e..f384bd7 100644
--- a/src/helpers/CommonCLI.h
+++ b/src/helpers/CommonCLI.h
@@ -28,6 +28,7 @@ class CommonCLICallbacks {
 public:
   virtual void savePrefs() = 0;
   virtual const char* getFirmwareVer() = 0;
+  virtual const char* getBuildDate() = 0;
   virtual bool formatFileSystem() = 0;
   virtual void sendSelfAdvertisement(int delay_millis) = 0;
   virtual void updateAdvertTimer() = 0;