diff --git a/fpga/makefile b/fpga/makefile
index b6ca5aa104f12d9c073879277009bba48c627ac8..838eaee458007e516def6571fbe8e6ffc1b83353 100644
--- a/fpga/makefile
+++ b/fpga/makefile
@@ -44,8 +44,10 @@ TCL_OUTPUT_FILELIST  := $(TCL_FLIST_DIR)/gen_flist.tcl
 
 # NanoSoC Tech Flow Dependencies
 NANOSOC_FPGA_FLOW_DIR := $(SOCLABS_NANOSOC_TECH_DIR)/fpga
+
+# Directory to look for FPGA specific implementation files
 TARGET_DIR            ?= $(NANOSOC_FPGA_FLOW_DIR)/targets/$(BOARD_NAME)
-TARGET_TCL_DIR        ?= $(NANOSOC_FPGA_FLOW_DIR)/targets/$(BOARD_NAME)/vivado_script/$(VIVIADO_VERSION)
+TARGET_TCL_DIR        := $(TARGET_DIR)/vivado_script/$(VIVIADO_VERSION)
 
 # NanoSoC Tech Socket Design Dependencies
 RTL_SOCKET_DIR        := $(SOCLABS_NANOSOC_TECH_DIR)/socket/xilinx_lib