diff --git a/common/Makefile b/common/Makefile
index ecc459b..aee7230 100644
--- a/common/Makefile
+++ b/common/Makefile
@@ -1,6 +1,35 @@
 BUILDDIR := ${current_dir}/build
 BOARD_BUILDDIR := ${BUILDDIR}/${TARGET}
 
+# Set board properties based on TARGET variable
+ifeq ($(TARGET),arty_35)
+  DEVICE := xc7a50t_test
+  BITSTREAM_DEVICE := artix7
+  PARTNAME := xc7a35tcsg324-1
+else ifeq ($(TARGET),arty_100)
+  DEVICE := xc7a100t_test
+  BITSTREAM_DEVICE := artix7
+  PARTNAME := xc7a100tcsg324-1
+else ifeq ($(TARGET),nexys4ddr)
+  DEVICE := xc7a100t_test
+  BITSTREAM_DEVICE := artix7
+  PARTNAME := xc7a100tcsg324-1
+else ifeq ($(TARGET),zybo)
+  DEVICE := xc7z010_test
+  BITSTREAM_DEVICE := zynq7
+  PARTNAME := xc7z010clg400-1
+else ifeq ($(TARGET),nexys_video)
+  DEVICE := xc7a200t_test
+  BITSTREAM_DEVICE := artix7
+  PARTNAME := xc7a200tsbg484-1
+else ifeq ($(TARGET),basys3)
+  DEVICE := xc7a50t_test
+  BITSTREAM_DEVICE := artix7
+  PARTNAME := xc7a35tcpg236-1
+else
+  $(error Unsupported board type)
+endif
+
 # Determine the type of constraint being used
 ifneq (${XDC},)
   XDC_CMD := -x ${XDC}
diff --git a/xc7/counter_test/Makefile b/xc7/counter_test/Makefile
index f6c79aa..7dccb0c 100644
--- a/xc7/counter_test/Makefile
+++ b/xc7/counter_test/Makefile
@@ -3,35 +3,17 @@ TOP := top
 SOURCES := ${current_dir}/counter.v
 
 ifeq ($(TARGET),arty_35)
-  DEVICE := xc7a50t_test
-  BITSTREAM_DEVICE := artix7
-  PARTNAME := xc7a35tcsg324-1
   XDC := ${current_dir}/arty.xdc
 else ifeq ($(TARGET),arty_100)
-  DEVICE := xc7a100t_test
-  BITSTREAM_DEVICE := artix7
-  PARTNAME := xc7a100tcsg324-1
   XDC := ${current_dir}/arty.xdc
 else ifeq ($(TARGET),nexys4ddr)
-  DEVICE := xc7a100t_test
-  BITSTREAM_DEVICE := artix7
-  PARTNAME := xc7a100tcsg324-1
   XDC := ${current_dir}/nexys4ddr.xdc
 else ifeq ($(TARGET),zybo)
-  DEVICE := xc7z010_test
-  BITSTREAM_DEVICE := zynq7
-  PARTNAME := xc7z010clg400-1
   XDC := ${current_dir}/zybo.xdc
   SOURCES:=${current_dir}/counter_zynq.v
 else ifeq ($(TARGET),nexys_video)
-  DEVICE := xc7a200t_test
-  BITSTREAM_DEVICE := artix7
-  PARTNAME := xc7a200tsbg484-1
   XDC := ${current_dir}/nexys_video.xdc
 else
-  DEVICE := xc7a50t_test
-  BITSTREAM_DEVICE := artix7
-  PARTNAME := xc7a35tcpg236-1
   XDC := ${current_dir}/basys3.xdc
 endif
 
diff --git a/xc7/linux_litex_demo/Makefile b/xc7/linux_litex_demo/Makefile
index 7318bab..f4d39ac 100644
--- a/xc7/linux_litex_demo/Makefile
+++ b/xc7/linux_litex_demo/Makefile
@@ -9,17 +9,6 @@ PCF := ${current_dir}/arty.pcf
 SDC := ${current_dir}/arty.sdc
 XDC := ${current_dir}/arty.xdc
 
-
-BITSTREAM_DEVICE := artix7
-
-ifeq ($(TARGET),arty_100)
-    PARTNAME := xc7a100tcsg324-1
-    DEVICE   := xc7a100t_test
-else
-    PARTNAME := xc7a35tcsg324-1
-    DEVICE   := xc7a50t_test
-endif
-
 export
 
 all:
diff --git a/xc7/picosoc_demo/Makefile b/xc7/picosoc_demo/Makefile
index f6c9404..bb7b591 100644
--- a/xc7/picosoc_demo/Makefile
+++ b/xc7/picosoc_demo/Makefile
@@ -6,27 +6,18 @@ SOURCES := ${current_dir}/picosoc_noflash.v \
            ${current_dir}/progmem.v
 
 SDC := ${current_dir}/picosoc.sdc
-BITSTREAM_DEVICE := artix7
 
 ifeq ($(TARGET),arty_35)
-  DEVICE  := xc7a50t_test
   SOURCES += ${current_dir}/arty.v
-  PARTNAME := xc7a35tcsg324-1
   PCF := ${current_dir}/arty.pcf
 else ifeq ($(TARGET),arty_100)
-  DEVICE := xc7a100t_test
   SOURCES += ${current_dir}/arty.v
-  PARTNAME := xc7a100tcsg324-1
   PCF := ${current_dir}/arty.pcf
 else ifeq ($(TARGET),nexys4ddr)
-  DEVICE := xc7a100t_test  
   SOURCES += ${current_dir}/nexys4ddr.v
-  PARTNAME := xc7a100tcsg324-1
   PCF := ${current_dir}/nexys4ddr.pcf
 else
-  DEVICE  := xc7a50t_test
   SOURCES += ${current_dir}/basys3.v
-  PARTNAME := xc7a35tcpg236-1
   PCF := ${current_dir}/basys3.pcf
 endif