diff --git a/main/CMakeLists.txt b/main/CMakeLists.txt
index c647d2f..f87f36b 100644
--- a/main/CMakeLists.txt
+++ b/main/CMakeLists.txt
@@ -77,4 +77,13 @@ execute_process(
         OUTPUT_STRIP_TRAILING_WHITESPACE
 )
 
-add_compile_definitions(VERSION_HASH="${GIT_HASH}")
\ No newline at end of file
+add_compile_definitions(VERSION_HASH="${GIT_HASH}")
+
+execute_process(
+        COMMAND git describe --tags --abbrev=0
+        WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}
+        OUTPUT_VARIABLE GIT_TAG
+        OUTPUT_STRIP_TRAILING_WHITESPACE
+)
+
+add_compile_definitions(VERSION_TAG="${GIT_TAG}")
\ No newline at end of file
diff --git a/main/app/odroid-power-mate.c b/main/app/odroid-power-mate.c
index b7d0260..08be324 100644
--- a/main/app/odroid-power-mate.c
+++ b/main/app/odroid-power-mate.c
@@ -15,7 +15,7 @@
 void app_main(void)
 {
     printf("\n\n== ODROID POWER-MATE ===\n");
-    printf("Versgition: %s\n\n", VERSION_HASH);
+    printf("Version: %s-%s\n\n", VERSION_TAG, VERSION_HASH);
 
     ESP_ERROR_CHECK(i2cdev_init());
     init_led();
diff --git a/main/system/system.c b/main/system/system.c
index 66c4737..3992eaa 100644
--- a/main/system/system.c
+++ b/main/system/system.c
@@ -82,7 +82,7 @@ static esp_err_t version_get_handler(httpd_req_t* req)
 {
     httpd_resp_set_type(req, "application/json");
     char buf[100];
-    sprintf(buf, "{\"version\": \"%s\"}", VERSION_HASH);
+    sprintf(buf, "{\"version\": \"%s-%s\"}", VERSION_TAG, VERSION_HASH);
     httpd_resp_send(req, buf, strlen(buf));
     return ESP_OK;
 }