diff --git a/boards/cuav/can-gps-v1/default.cmake b/boards/cuav/can-gps-v1/default.cmake
index 3dbdefad99..3d49dec74d 100644
--- a/boards/cuav/can-gps-v1/default.cmake
+++ b/boards/cuav/can-gps-v1/default.cmake
@@ -30,13 +30,12 @@ px4_add_board(
 	SERIAL_PORTS
 		GPS1:/dev/ttyS1
 	DRIVERS
-		#adc
 		barometer/ms5611
 		bootloaders
 		gps
 		magnetometer/rm3100
-		#safety_button
-		#tone_alarm
+		safety_button
+		tone_alarm
 		uavcannode
 	MODULES
 		#ekf2
@@ -50,7 +49,7 @@ px4_add_board(
 		#esc_calib
 		#hardfault_log
 		#i2cdetect
-		#led_control
+		led_control
 		#mft
 		#mixer
 		#motor_ramp
@@ -65,7 +64,7 @@ px4_add_board(
 		#shutdown
 		top
 		topic_listener
-		#tune_control
+		tune_control
 		ver
 		work_queue
 )
diff --git a/boards/cuav/can-gps-v1/nuttx-config/include/board.h b/boards/cuav/can-gps-v1/nuttx-config/include/board.h
index ac80751836..ccb1c239c6 100644
--- a/boards/cuav/can-gps-v1/nuttx-config/include/board.h
+++ b/boards/cuav/can-gps-v1/nuttx-config/include/board.h
@@ -128,40 +128,22 @@
 
 /* Alternate function pin selections ************************************************/
 
-/*
- * UARTs.
- */
+/* UARTs */
 #define GPIO_USART1_RX	GPIO_USART1_RX_2
 #define GPIO_USART1_TX	GPIO_USART1_TX_2
 
 #define GPIO_USART2_RX	GPIO_USART2_RX_1
 #define GPIO_USART2_TX	GPIO_USART2_TX_1
 
-/*
- * CAN
- *
- * CAN1 is routed to the onboard transceiver.
- */
+/* CAN */
 #define GPIO_CAN1_RX	GPIO_CAN1_RX_2
 #define GPIO_CAN1_TX	GPIO_CAN1_TX_2
 
-/*
- * I2C
- *
- * The optional _GPIO configurations allow the I2C driver to manually
- * reset the bus to clear stuck slaves.  They match the pin configuration,
- * but are normally-high GPIOs.
- */
+/* I2C */
 #define GPIO_I2C3_SCL		GPIO_I2C3_SCL_2
 #define GPIO_I2C3_SDA		GPIO_I2C3_SDA_2
-#define GPIO_I2C3_SCL_GPIO	(GPIO_OUTPUT|GPIO_OPENDRAIN|GPIO_SPEED_50MHz|GPIO_OUTPUT_SET|GPIO_PORTA|GPIO_PIN8)
-#define GPIO_I2C3_SDA_GPIO	(GPIO_OUTPUT|GPIO_OPENDRAIN|GPIO_SPEED_50MHz|GPIO_OUTPUT_SET|GPIO_PORTB|GPIO_PIN4)
 
-/*
- * SPI
- *
- * There are sensors on SPI1, and SPI2 is connected to the FRAM.
- */
+/* SPI */
 #define GPIO_SPI1_MISO  (GPIO_SPI1_MISO_1|GPIO_SPEED_50MHz)
 #define GPIO_SPI1_MOSI  (GPIO_SPI1_MOSI_1|GPIO_SPEED_50MHz)
 #define GPIO_SPI1_SCK   (GPIO_SPI1_SCK_1|GPIO_SPEED_50MHz)
diff --git a/boards/cuav/can-gps-v1/src/board_config.h b/boards/cuav/can-gps-v1/src/board_config.h
index b97bb98d6c..c7532b08d9 100644
--- a/boards/cuav/can-gps-v1/src/board_config.h
+++ b/boards/cuav/can-gps-v1/src/board_config.h
@@ -57,6 +57,8 @@
  */
 #define GPIO_CAN1_SILENT_S0  /* PB5  */ (GPIO_OUTPUT|GPIO_PUSHPULL|GPIO_SPEED_2MHz|GPIO_OUTPUT_CLEAR|GPIO_PORTB|GPIO_PIN5)
 
+#define GPIO_LED_SAFETY              (GPIO_OUTPUT|GPIO_PUSHPULL|GPIO_SPEED_2MHz|GPIO_OUTPUT_SET|GPIO_PORTB|GPIO_PIN1)
+#define GPIO_BTN_SAFETY              (GPIO_INPUT|GPIO_PULLUP|GPIO_PORTB|GPIO_PIN3)
 
 /* Tone alarm output. */
 #define TONE_ALARM_TIMER             2    /* timer 2 */
diff --git a/boards/cuav/can-gps-v1/src/init.c b/boards/cuav/can-gps-v1/src/init.c
index 712f7163c9..0e9c7c845b 100644
--- a/boards/cuav/can-gps-v1/src/init.c
+++ b/boards/cuav/can-gps-v1/src/init.c
@@ -90,6 +90,9 @@ stm32_boardinitialize(void)
 
 	stm32_configgpio(GPIO_CAN1_SILENT_S0);
 
+	stm32_configgpio(GPIO_LED_SAFETY);
+	stm32_configgpio(GPIO_BTN_SAFETY);
+
 	// Configure SPI all interfaces GPIO & enable power.
 	stm32_spiinitialize();
 }