diff --git a/boards/uvify/core/default.cmake b/boards/uvify/core/default.cmake
index e87a91d368..b9de8876a8 100644
--- a/boards/uvify/core/default.cmake
+++ b/boards/uvify/core/default.cmake
@@ -7,7 +7,6 @@ px4_add_board(
 	TOOLCHAIN arm-none-eabi
 	ARCHITECTURE cortex-m4
 	ROMFSROOT px4fmu_common
-	#TESTING
 	UAVCAN_INTERFACES 1
 
 	SERIAL_PORTS
@@ -17,50 +16,37 @@ px4_add_board(
 
 	DRIVERS
 		adc
-		#barometer # all available barometer drivers
 		barometer/ms5611
 		batt_smbus
 		camera_capture
 		camera_trigger
-		#differential_pressure # all available differential pressure drivers
 		distance_sensor # all available distance sensor drivers
 		dshot
 		gps
-		#heater
-		#imu # all available imu drivers
 		imu/mpu6000
 		imu/mpu9250
 		irlock
-		#lights/blinkm
-		#lights/rgbled
 		lights/rgbled_ncp5623c
-		#magnetometer # all available magnetometer drivers
 		magnetometer/bmm150
 		magnetometer/lis3mdl
 		magnetometer/ist8310
-		#mkblctrl
 		optical_flow # all available optical flow drivers
 		pca9685
 		pwm_input
 		pwm_out_sim
 		px4fmu
 		rc_input
-		#tap_esc
-		#telemetry # all available telemetry drivers
-		#test_ppm
 		tone_alarm
 		uavcan
 
 	MODULES
 		attitude_estimator_q
+		battery_status
 		camera_feedback
 		commander
 		dataman
 		ekf2
 		events
-		#fw_att_control
-		#fw_pos_control_l1
-		#rover_pos_control
 		land_detector
 		landing_target_estimator
 		load_mon
@@ -70,12 +56,9 @@ px4_add_board(
 		mc_att_control
 		mc_pos_control
 		navigator
-		battery_status
 		sensors
 		sih
 		vmount
-		#vtol_att_control
-		#airspeed_selector
 
 	SYSTEMCMDS
 		bl_update
@@ -98,23 +81,10 @@ px4_add_board(
 		reflect
 		sd_bench
 		shutdown
-		#tests # tests and test runner
 		top
 		topic_listener
 		tune_control
 		usb_connected
 		ver
 		work_queue
-
-	EXAMPLES
-		#bottle_drop # OBC challenge
-		#fixedwing_control # Tutorial code from https://px4.io/dev/example_fixedwing_control
-		#hello
-		#hwtest # Hardware test
-		#matlab_csv_serial
-		#px4_mavlink_debug # Tutorial code from http://dev.px4.io/en/debug/debug_values.html
-		#px4_simple_app # Tutorial code from http://dev.px4.io/en/apps/hello_sky.html
-		#rover_steering_control # Rover example app
-		#uuv_example_app
-
 	)
diff --git a/boards/uvify/core/nuttx-config/include/board.h b/boards/uvify/core/nuttx-config/include/board.h
index aa158ba6a2..0529569153 100644
--- a/boards/uvify/core/nuttx-config/include/board.h
+++ b/boards/uvify/core/nuttx-config/include/board.h
@@ -236,8 +236,8 @@
 /* UART8 has no alternate pin config */
 
 /* UART RX DMA configurations */
-#define DMAMAP_USART1_RX DMAMAP_USART1_RX_2
-#define DMAMAP_USART6_RX DMAMAP_USART6_RX_2
+#define DMAMAP_USART1_RX DMAMAP_USART1_RX_1	/*DMA2 Stream 2*/
+#define DMAMAP_USART6_RX DMAMAP_USART6_RX_1	/*DMA2 Stream 1*/
 
 /*
  * CAN
diff --git a/boards/uvify/core/nuttx-config/nsh/defconfig b/boards/uvify/core/nuttx-config/nsh/defconfig
index 7343388319..e9143b261d 100644
--- a/boards/uvify/core/nuttx-config/nsh/defconfig
+++ b/boards/uvify/core/nuttx-config/nsh/defconfig
@@ -217,7 +217,6 @@ CONFIG_UART7_SERIAL_CONSOLE=y
 CONFIG_UART7_TXBUFSIZE=300
 CONFIG_UART8_BAUD=57600
 CONFIG_UART8_RXBUFSIZE=300
-CONFIG_UART8_RXDMA=y
 CONFIG_UART8_TXBUFSIZE=300
 CONFIG_USART1_RXBUFSIZE=600
 CONFIG_USART1_RXDMA=y
diff --git a/boards/uvify/core/src/timer_config.c b/boards/uvify/core/src/timer_config.c
index 49f5ac6216..32456cca1a 100644
--- a/boards/uvify/core/src/timer_config.c
+++ b/boards/uvify/core/src/timer_config.c
@@ -83,6 +83,7 @@ __EXPORT const io_timers_t io_timers[MAX_IO_TIMERS] = {
 			.start_ccr_register = TIM_DMABASE_CCR2,
 			.channels_number = 2u // CCR2 and CCR3
 		}
+
 	}
 };