diff --git a/Makefile b/Makefile
index 668ec88..11a8228 100644
--- a/Makefile
+++ b/Makefile
@@ -28,7 +28,7 @@ FIRMWARE = $(APPLICATION) $(BOOTLOADER)
 
 # which development board is used
 # supported are: SYSTEM_BOARD, MAPLE_MINI, BLUE_PILL, CORE_BOARD
-BOARD = BLUE_PILL
+BOARD = SYSTEM_BOARD
 
 # source files (this will be populated using includes based DEPENDENCIES)
 CSRC = global.c
@@ -117,7 +117,7 @@ ARCH_FLAGS = -mthumb -mcpu=cortex-m3 -msoft-float
 
 # SWD adapter used
 # supported are : st-link v2 (STLINKV2), black magic probe (BMP)
-SWD_ADAPTER ?= STLINKV2
+SWD_ADAPTER ?= BMP
 ifeq ($(SWD_ADAPTER),STLINKV2)
 # OpenOCD configuration
 OOCD ?= openocd