diff --git a/Makefile b/Makefile
index 3b767da..683be6b 100644
--- a/Makefile
+++ b/Makefile
@@ -259,7 +259,6 @@ CFLAGS += -DMK_DIS_FIRMWARE='$(MK_DIS_FIRMWARE)'
 CFLAGS += -DDFU_APP_DATA_RESERVED=7*4096
 
 CFLAGS += -DUF2_VERSION='"$(GIT_VERSION) $(GIT_SUBMODULE_VERSIONS) $(SD_NAME) $(SD_VERSION)"'
-CFLAGS += -DBOARD_$(shell echo $(BOARD) | tr '[:lower:]' '[:upper:]')
 
 ifneq ($(IS_52832),)
 CFLAGS += -DNRF52
diff --git a/src/boards/electronut_labs_papyr/board.h b/src/boards/electronut_labs_papyr/board.h
index ab7588c..0dc1a5e 100644
--- a/src/boards/electronut_labs_papyr/board.h
+++ b/src/boards/electronut_labs_papyr/board.h
@@ -60,7 +60,7 @@
 #define DIS_MANUFACTURER    "Electronut Labs"
 #define DIS_MODEL           "Papyr"
 
-#define BOARD_ID            "Electronut Labs Papyr"
+#define UF2_BOARD_ID            "Electronut Labs Papyr"
 #define INDEX_URL           "https://docs.electronut.in/papyr"
 
 #define USB_DESC_VID        0x239A
diff --git a/src/boards/feather_nrf52840_express/board.h b/src/boards/feather_nrf52840_express/board.h
index 9b9631e..7f16a32 100644
--- a/src/boards/feather_nrf52840_express/board.h
+++ b/src/boards/feather_nrf52840_express/board.h
@@ -60,5 +60,6 @@
 
 #define PRODUCT_NAME          "Adafruit Feather nRF52840 Express"
 #define VOLUME_LABEL          "FTHR840BOOT"
+#define UF2_BOARD_ID "nRF52840-Feather-revD"
 
 #endif // _FEATHER_NRF52840_H
diff --git a/src/boards/mdk_nrf52840_dongle/board.h b/src/boards/mdk_nrf52840_dongle/board.h
index 387ee9d..e35d31f 100644
--- a/src/boards/mdk_nrf52840_dongle/board.h
+++ b/src/boards/mdk_nrf52840_dongle/board.h
@@ -55,7 +55,7 @@
 #define PRODUCT_NAME          "MDK nRF52840 USB Dongle"
 #define VOLUME_LABEL          "MDK840DONGL"
 
-#define BOARD_ID "MakerDiary-nRF52840-USB-Dongle"
+#define UF2_BOARD_ID "MakerDiary-nRF52840-USB-Dongle"
 
 #define INDEX_URL "https://wiki.makerdiary.com/nrf52840-mdk-usb-dongle/"
 
diff --git a/src/boards/metro_nrf52840_express/board.h b/src/boards/metro_nrf52840_express/board.h
index 1fc5b02..033ab1c 100644
--- a/src/boards/metro_nrf52840_express/board.h
+++ b/src/boards/metro_nrf52840_express/board.h
@@ -60,6 +60,7 @@
 
 #define PRODUCT_NAME          "Adafruit Metro nRF52840 Express"
 #define VOLUME_LABEL          "METR840BOOT"
+#define UF2_BOARD_ID "nRF52840-Metro-revA"
 
 
 #endif /* _METRO_NRF52840_H_ */
diff --git a/src/boards/particle_argon/board.h b/src/boards/particle_argon/board.h
index 6b99c09..3e0a9f7 100644
--- a/src/boards/particle_argon/board.h
+++ b/src/boards/particle_argon/board.h
@@ -62,7 +62,7 @@
 
 #define VOLUME_LABEL      "ARGONBOOT  "
 
-#define BOARD_ID "Particle-Argon-v1"
+#define UF2_BOARD_ID "nRF52840-Argon-v1"
 
 #define INDEX_URL "https://www.particle.io/mesh/"
 
diff --git a/src/boards/particle_boron/board.h b/src/boards/particle_boron/board.h
index 95124aa..6209136 100644
--- a/src/boards/particle_boron/board.h
+++ b/src/boards/particle_boron/board.h
@@ -62,7 +62,7 @@
 
 #define VOLUME_LABEL      "BORONBOOT  "
 
-#define BOARD_ID "Particle-Boron-v1"
+#define UF2_BOARD_ID "nRF52840-Boron-v1"
 
 #define INDEX_URL "https://www.particle.io/mesh/"
 
diff --git a/src/boards/particle_xenon/board.h b/src/boards/particle_xenon/board.h
index 123e94f..6b9cbf0 100644
--- a/src/boards/particle_xenon/board.h
+++ b/src/boards/particle_xenon/board.h
@@ -62,7 +62,7 @@
 
 #define VOLUME_LABEL      "XENONBOOT  "
 
-#define BOARD_ID "Particle-Xenon-v1"
+#define UF2_BOARD_ID "nRF52840-Xenon-v1"
 
 #define INDEX_URL "https://www.particle.io/mesh/"
 
diff --git a/src/boards/pca10056/board.h b/src/boards/pca10056/board.h
index f962f31..1c0aa7b 100644
--- a/src/boards/pca10056/board.h
+++ b/src/boards/pca10056/board.h
@@ -54,4 +54,6 @@
 #define DIS_MANUFACTURER    "Nordic"
 #define DIS_MODEL           "PCA10056"
 
+#define UF2_BOARD_ID           "nRF52840-pca10056-v1"
+
 #endif // PCA10056_H
diff --git a/src/boards/pca10059/board.h b/src/boards/pca10059/board.h
index 8fe8084..a2d76d8 100644
--- a/src/boards/pca10059/board.h
+++ b/src/boards/pca10059/board.h
@@ -57,4 +57,6 @@
 #define DIS_MANUFACTURER  "Nordic"
 #define DIS_MODEL         "PCA10059"
 
+#define UF2_BOARD_ID           "nRF52840-pca10059-v1"
+
 #endif // PCA10059_H
diff --git a/src/usb/uf2/ghostfat.c b/src/usb/uf2/ghostfat.c
index 5d0deb2..bf39999 100644
--- a/src/usb/uf2/ghostfat.c
+++ b/src/usb/uf2/ghostfat.c
@@ -63,8 +63,7 @@ struct TextFile {
 const char infoUf2File[] = //
     "UF2 Bootloader " UF2_VERSION "\r\n"
     "Model: " PRODUCT_NAME "\r\n"
-    "Board-ID: " BOARD_ID "\r\n"
-    "Bootloader: " BOOTLOADER_ID "\r\n"
+    "Board-ID: " UF2_BOARD_ID "\r\n"
     "Date: " __DATE__ "\r\n";
 
 const char indexFile[] = //
diff --git a/src/usb/uf2/uf2cfg.h b/src/usb/uf2/uf2cfg.h
index 0229a20..6042b67 100644
--- a/src/usb/uf2/uf2cfg.h
+++ b/src/usb/uf2/uf2cfg.h
@@ -4,10 +4,6 @@
   #define PRODUCT_NAME     DIS_MODEL
 #endif
 
-#ifndef BOARD_ID
-#define BOARD_ID           "NRF52-Bluefruit-v0"
-#endif
-
 #ifndef INDEX_URL
 #define INDEX_URL          "https://www.adafruit.com/"
 #endif