diff --git a/boards/cuav/can-gps-v1/canbootloader.cmake b/boards/cuav/can-gps-v1/canbootloader.cmake
index 765f4a895b..048aba3880 100644
--- a/boards/cuav/can-gps-v1/canbootloader.cmake
+++ b/boards/cuav/can-gps-v1/canbootloader.cmake
@@ -1,21 +1,4 @@
-
-# UAVCAN boot loadable Module ID
-set(uavcanblid_sw_version_major 0)
-set(uavcanblid_sw_version_minor 1)
-add_definitions(
-	-DAPP_VERSION_MAJOR=${uavcanblid_sw_version_major}
-	-DAPP_VERSION_MINOR=${uavcanblid_sw_version_minor}
-)
-
-set(uavcanblid_hw_version_major 3)
-set(uavcanblid_hw_version_minor 233)
-set(uavcanblid_name "\"org.cuav.can-gps-v1\"")
-
-add_definitions(
-	-DHW_UAVCAN_NAME=${uavcanblid_name}
-	-DHW_VERSION_MAJOR=${uavcanblid_hw_version_major}
-	-DHW_VERSION_MINOR=${uavcanblid_hw_version_minor}
-)
+include (${CMAKE_CURRENT_LIST_DIR}/uavcan_board_identity)
 
 px4_add_board(
 	PLATFORM nuttx
diff --git a/boards/cuav/can-gps-v1/default.cmake b/boards/cuav/can-gps-v1/default.cmake
index b17c7c80b8..ac89746511 100644
--- a/boards/cuav/can-gps-v1/default.cmake
+++ b/boards/cuav/can-gps-v1/default.cmake
@@ -1,22 +1,5 @@
+include (${CMAKE_CURRENT_LIST_DIR}/uavcan_board_identity)
 
-
-# UAVCAN boot loadable Module ID
-set(uavcanblid_sw_version_major 0)
-set(uavcanblid_sw_version_minor 1)
-add_definitions(
-	-DAPP_VERSION_MAJOR=${uavcanblid_sw_version_major}
-	-DAPP_VERSION_MINOR=${uavcanblid_sw_version_minor}
-)
-
-set(uavcanblid_hw_version_major 3)
-set(uavcanblid_hw_version_minor 233)
-set(uavcanblid_name "\"org.cuav.can-gps-v1\"")
-
-add_definitions(
-	-DHW_UAVCAN_NAME=${uavcanblid_name}
-	-DHW_VERSION_MAJOR=${uavcanblid_hw_version_major}
-	-DHW_VERSION_MINOR=${uavcanblid_hw_version_minor}
-)
 add_definitions(-DUSE_S_RGB_LED_DMA)
 
 px4_add_board(
diff --git a/boards/cuav/can-gps-v1/uavcan_board_identity b/boards/cuav/can-gps-v1/uavcan_board_identity
new file mode 100644
index 0000000000..78ce56022b
--- /dev/null
+++ b/boards/cuav/can-gps-v1/uavcan_board_identity
@@ -0,0 +1,16 @@
+# UAVCAN boot loadable Module ID
+set(uavcanblid_sw_version_major 0)
+set(uavcanblid_sw_version_minor 1)
+add_definitions(
+	-DAPP_VERSION_MAJOR=${uavcanblid_sw_version_major}
+	-DAPP_VERSION_MINOR=${uavcanblid_sw_version_minor}
+)
+
+set(uavcanblid_hw_version_major 3)
+set(uavcanblid_hw_version_minor 233)
+set(uavcanblid_name "\"org.cuav.can-gps-v1\"")
+add_definitions(
+	-DHW_UAVCAN_NAME=${uavcanblid_name}
+	-DHW_VERSION_MAJOR=${uavcanblid_hw_version_major}
+	-DHW_VERSION_MINOR=${uavcanblid_hw_version_minor}
+)