diff --git a/firmware/config/boards/subaru_eg33/board.mk b/firmware/config/boards/subaru_eg33/board.mk
index c6947aeeaa..be91b2ac26 100644
--- a/firmware/config/boards/subaru_eg33/board.mk
+++ b/firmware/config/boards/subaru_eg33/board.mk
@@ -18,6 +18,7 @@ DDEFS +=  -DLED_CRITICAL_ERROR_BRAIN_PIN=GPIOG_7
 
 # We are running on Subaru EG33 hardware!
 DDEFS += -DHW_SUBARU_EG33=1
+DDEFS += -DFIRMWARE_ID=\"EG33\"
 
 # Override DEFAULT_ENGINE_TYPE
 DDEFS += -DDEFAULT_ENGINE_TYPE=SUBARUEG33_DEFAULTS
diff --git a/firmware/controllers/core/common_headers.h b/firmware/controllers/core/common_headers.h
index 58c101b7af..de7894b08e 100644
--- a/firmware/controllers/core/common_headers.h
+++ b/firmware/controllers/core/common_headers.h
@@ -31,7 +31,3 @@
 #include "datalogging.h"
 #include "cli_registry.h"
 #endif /* __cplusplus */
-
-#ifndef FIRMWARE_ID
-#define FIRMWARE_ID "source"
-#endif
diff --git a/simulator/Makefile b/simulator/Makefile
index 30e15b1f1b..e0d41e191e 100644
--- a/simulator/Makefile
+++ b/simulator/Makefile
@@ -241,6 +241,8 @@ CPPWARN = -Wall -Wextra -Wundef
 
 # List all user C define here, like -D_DEBUG=1
 UDEFS = -DSIMULATOR
+DDEFS += -DFIRMWARE_ID=\"simulator\"
+
 
 # Define ASM defines here
 UADEFS =