diff --git a/boards/blackpill-128kib/Makefile.features b/boards/blackpill-128kib/Makefile.features
index 94ebe23fab..09dd9aafb6 100644
--- a/boards/blackpill-128kib/Makefile.features
+++ b/boards/blackpill-128kib/Makefile.features
@@ -1 +1,3 @@
+CPU_MODEL = stm32f103cb
+
 include $(RIOTBOARD)/common/blxxxpill/Makefile.features
diff --git a/boards/blackpill-128kib/Makefile.include b/boards/blackpill-128kib/Makefile.include
index 7b80db87b4..63221c6783 100644
--- a/boards/blackpill-128kib/Makefile.include
+++ b/boards/blackpill-128kib/Makefile.include
@@ -1,6 +1,3 @@
-## the cpu to build for
-export CPU = stm32f1
-export CPU_MODEL = stm32f103cb
 export OPENOCD_CONFIG ?= $(RIOTBOARD)/common/blxxxpill/dist/openocd-128kib.cfg
 
 USEMODULE += boards_common_blxxxpill
diff --git a/boards/blackpill/Makefile.features b/boards/blackpill/Makefile.features
index 94ebe23fab..2af8d82ba2 100644
--- a/boards/blackpill/Makefile.features
+++ b/boards/blackpill/Makefile.features
@@ -1 +1,3 @@
+CPU_MODEL = stm32f103c8
+
 include $(RIOTBOARD)/common/blxxxpill/Makefile.features
diff --git a/boards/blackpill/Makefile.include b/boards/blackpill/Makefile.include
index 0278f0c650..bfb8dd58e0 100644
--- a/boards/blackpill/Makefile.include
+++ b/boards/blackpill/Makefile.include
@@ -1,6 +1,3 @@
-## the cpu to build for
-export CPU = stm32f1
-export CPU_MODEL = stm32f103c8
 export OPENOCD_CONFIG ?= $(RIOTBOARD)/common/blxxxpill/dist/openocd.cfg
 
 USEMODULE += boards_common_blxxxpill
diff --git a/boards/bluepill-128kib/Makefile.features b/boards/bluepill-128kib/Makefile.features
index 94ebe23fab..09dd9aafb6 100644
--- a/boards/bluepill-128kib/Makefile.features
+++ b/boards/bluepill-128kib/Makefile.features
@@ -1 +1,3 @@
+CPU_MODEL = stm32f103cb
+
 include $(RIOTBOARD)/common/blxxxpill/Makefile.features
diff --git a/boards/bluepill-128kib/Makefile.include b/boards/bluepill-128kib/Makefile.include
index 7b80db87b4..63221c6783 100644
--- a/boards/bluepill-128kib/Makefile.include
+++ b/boards/bluepill-128kib/Makefile.include
@@ -1,6 +1,3 @@
-## the cpu to build for
-export CPU = stm32f1
-export CPU_MODEL = stm32f103cb
 export OPENOCD_CONFIG ?= $(RIOTBOARD)/common/blxxxpill/dist/openocd-128kib.cfg
 
 USEMODULE += boards_common_blxxxpill
diff --git a/boards/bluepill/Makefile.features b/boards/bluepill/Makefile.features
index 94ebe23fab..2af8d82ba2 100644
--- a/boards/bluepill/Makefile.features
+++ b/boards/bluepill/Makefile.features
@@ -1 +1,3 @@
+CPU_MODEL = stm32f103c8
+
 include $(RIOTBOARD)/common/blxxxpill/Makefile.features
diff --git a/boards/bluepill/Makefile.include b/boards/bluepill/Makefile.include
index 0278f0c650..bfb8dd58e0 100644
--- a/boards/bluepill/Makefile.include
+++ b/boards/bluepill/Makefile.include
@@ -1,6 +1,3 @@
-## the cpu to build for
-export CPU = stm32f1
-export CPU_MODEL = stm32f103c8
 export OPENOCD_CONFIG ?= $(RIOTBOARD)/common/blxxxpill/dist/openocd.cfg
 
 USEMODULE += boards_common_blxxxpill
diff --git a/boards/common/blxxxpill/Makefile.features b/boards/common/blxxxpill/Makefile.features
index 71d8369f8c..3c1aab73cb 100644
--- a/boards/common/blxxxpill/Makefile.features
+++ b/boards/common/blxxxpill/Makefile.features
@@ -1,3 +1,5 @@
+CPU = stm32f1
+
 # Put defined MCU peripherals here (in alphabetical order)
 FEATURES_PROVIDED += periph_adc
 FEATURES_PROVIDED += periph_i2c