diff --git a/conf/airframes/ENAC/fixed-wing/apogee.xml b/conf/airframes/ENAC/fixed-wing/apogee.xml
index 734c1bc263..4af8b1429a 100644
--- a/conf/airframes/ENAC/fixed-wing/apogee.xml
+++ b/conf/airframes/ENAC/fixed-wing/apogee.xml
@@ -11,6 +11,10 @@
     <!-- <load name="mcp355x.xml"> -->
     <!--   <define name="USE_SPI1"/> -->
     <!-- </load> -->
+    <load name="extra_dl.xml">
+      <configure name="EXTRA_DL_PORT" value="UART6"/>
+      <configure name="EXTRA_DL_BAUD" value="B57600"/>
+    </load>
   </modules>
 
   <firmware name="fixedwing">
@@ -24,7 +28,6 @@
 
     <target name="sim" board="pc"/>
     <target name="ap" board="apogee_1.0_chibios"/>
-    <configure name="FLASH_MODE" value="SWD"/>
 
     <subsystem name="radio_control" type="sbus"/>
 
@@ -40,7 +43,7 @@
     <!-- Sensors -->
     <subsystem name="gps" type="ublox"/>
 
-    <subsystem name="spi_master"/>
+    <!--subsystem name="spi_master"/-->
   </firmware>
 
   <firmware name="lisa_test_progs">
diff --git a/conf/boards/apogee_1.0_chibios.makefile b/conf/boards/apogee_1.0_chibios.makefile
index baff4eaf46..24209c23a2 100644
--- a/conf/boards/apogee_1.0_chibios.makefile
+++ b/conf/boards/apogee_1.0_chibios.makefile
@@ -22,10 +22,8 @@ HARD_FLOAT=yes
 $(TARGET).MAKEFILE = chibios-libopencm3
 
 # default flash mode is via usb dfu bootloader
-# possibilities: DFU, SWD
-FLASH_MODE ?= DFU
-STLINK ?= y
-DFU_UTIL ?= y
+# possibilities: DFU-UTIL, SWD, STLINK
+FLASH_MODE ?= DFU-UTIL
 
 #
 # default LED configuration
diff --git a/conf/modules/extra_dl.xml b/conf/modules/extra_dl.xml
index 66792ec7fe..3979fa735b 100644
--- a/conf/modules/extra_dl.xml
+++ b/conf/modules/extra_dl.xml
@@ -3,16 +3,18 @@
 <module name="extra_dl" dir="datalink">
   <doc>
     <description>Extra datalink (PPRZ transport)</description>
+    <configure name="EXTRA_DL_PORT" value="UARTX" description="Select port for extra datalink"/>
+    <configure name="EXTRA_DL_BAUD" value="B57600" description="Baudrate for extra datalink"/>
   </doc>
   <header>
     <file name="extra_pprz_dl.h"/>
   </header>
   <event fun="ExtraDatalinkEvent()"/>
   <makefile>
-    <define name="EXTRA_DOWNLINK_DEVICE" value="UART0"/>
-    <define name="EXTRA_PPRZ_UART" value="UART0"/>
-    <define name="USE_UART0" value="1"/>
-    <define name="UART0_BAUD" value="B57600"/>
+    <define name="EXTRA_DOWNLINK_DEVICE" value="$(EXTRA_DL_PORT)"/>
+    <define name="EXTRA_PPRZ_UART" value="$(EXTRA_DL_PORT)"/>
+    <define name="USE_$(EXTRA_DL_PORT)"/>
+    <define name="$(EXTRA_DL_PORT)_BAUD" value="$(EXTRA_DL_BAUD)"/>
     <file name="extra_pprz_dl.c"/>
   </makefile>
 </module>
diff --git a/sw/airborne/modules/datalink/extra_pprz_dl.h b/sw/airborne/modules/datalink/extra_pprz_dl.h
index a21a94faa3..f43ea38379 100644
--- a/sw/airborne/modules/datalink/extra_pprz_dl.h
+++ b/sw/airborne/modules/datalink/extra_pprz_dl.h
@@ -37,7 +37,7 @@ extern struct pprz_transport extra_pprz_tp;
 /* Datalink Event */
 
 #define ExtraDatalinkEvent() {			                  \
-  PpprzCheckAndParse(EXTRA_PPRZ_UART, extra_pprz_tp); \
+  PprzCheckAndParse(EXTRA_PPRZ_UART, extra_pprz_tp); \
   DlCheckAndParse();                                  \
 }