diff --git a/Makefile b/Makefile
index 96678f78..d66c8a1d 100644
--- a/Makefile
+++ b/Makefile
@@ -61,8 +61,8 @@ show-app:
 DISABLE_STANDARD_APP_SYNC_RAPDU = 1
 DISABLE_STANDARD_APP_FILES = 1
 DEFINES   += HAVE_LEGACY_PID
-DEFINES   += VERSION=\"$(APPVERSION)\" APPVERSION_M=$(APPVERSION_M)
-DEFINES   += COMMIT=\"$(COMMIT)\" APPVERSION_N=$(APPVERSION_N) APPVERSION_P=$(APPVERSION_P)
+DEFINES   += VERSION=\"$(APPVERSION)\"
+DEFINES   += COMMIT=\"$(COMMIT)\"
 
 ENABLE_BLUETOOTH = 1
 ENABLE_NBGL_QRCODE = 1
diff --git a/src/version.h b/src/version.h
index 6c50929a..a459506a 100644
--- a/src/version.h
+++ b/src/version.h
@@ -1,9 +1,5 @@
 #define CLASS 1
 
-#define MAJOR APPVERSION_M
-#define MINOR APPVERSION_N
-#define PATCH APPVERSION_P
-
 typedef struct version {
     uint8_t class;
     uint8_t major;
@@ -11,4 +7,4 @@ typedef struct version {
     uint8_t patch;
 } version_t;
 
-const version_t version = {CLASS, MAJOR, MINOR, PATCH};
+const version_t version = {CLASS, MAJOR_VERSION, MINOR_VERSION, PATCH_VERSION};