diff --git a/.gitmodules b/.gitmodules
index f5c1b168def62d7e50b5cae600d3da68f58a5c15..e264757b888f3d4ebe1c59e457660c7043a2960f 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -16,3 +16,6 @@ url = https://git.soton.ac.uk/soclabs/nanosoc_tech.git
 [submodule "rtl_primitives_tech"]
 	path = rtl_primitives_tech
 	url = https://git.soton.ac.uk/soclabs/rtl_primitives_tech.git
+[submodule "secworks-aes"]
+	path = secworks-aes
+	url = https://github.com/secworks/aes.git
diff --git a/flist/nanosoc/nanosoc_chip_ip.flist b/flist/nanosoc/nanosoc_chip_ip.flist
index dc66fdb2ca46527b3bd4584bfa7a98874f108b66..0999af9e44b5377e8c7a3cf80a97f8e0f8d906e7 100644
--- a/flist/nanosoc/nanosoc_chip_ip.flist
+++ b/flist/nanosoc/nanosoc_chip_ip.flist
@@ -32,7 +32,6 @@ $(SOCLABS_NANOSOC_TECH_DIR)/system/src/verilog/nanosoc_mcu_sysctrl.v
 
 $(SOCLABS_NANOSOC_TECH_DIR)/system/src/verilog/nanosoc_apb_usrt.v
 $(SOCLABS_NANOSOC_TECH_DIR)/system/src/verilog/nanosoc_ahb_bootrom.v
-$(SOCLABS_NANOSOC_TECH_DIR)/system/src/bootrom/verilog/bootrom.v
 
 //$(SOCLABS_NANOSOC_TECH_DIR)/system/aes/src/nanosoc_exp_wrapper.v
 //+incdir+$(SOCLABS_PROJECT_DIR)/secworks-aes/src/rtl
diff --git a/flist/project/system.flist b/flist/project/system.flist
index b81c92febec60b4ab1dee8625cdbd111e396b6d5..431b2e81e9d601032b2350d99c8e92100e61a6a3 100644
--- a/flist/project/system.flist
+++ b/flist/project/system.flist
@@ -19,7 +19,7 @@
 
 // =============    Accelerator Module search path    =============
 // ! Point this to your accelerator filelist
- f $(SOCLABS_PROJECT_DIR)/flist/project/accelerator.flist
+-f $(SOCLABS_PROJECT_DIR)/flist/project/accelerator.flist
 
 // =============    Wrapper Filelist      =========================
 -f $(SOCLABS_PROJECT_DIR)/flist/project/wrapper.flist
@@ -64,4 +64,4 @@
 -f $(SOCLABS_PROJECT_DIR)/flist/project/system_tb.flist
 
 // =============    Bootrom Filelist      ================
-//$(SOCLABS_PROJECT_DIR)/system/src/bootrom/verilog/bootrom.v
+$(SOCLABS_PROJECT_DIR)/system/src/bootrom/verilog/bootrom.v
diff --git a/fpga_lib_tech b/fpga_lib_tech
index c51fa197a1d89ed556653fd7743c4aba20383b39..4344fb7198daaae6d40f95b58587af5f869263a2 160000
--- a/fpga_lib_tech
+++ b/fpga_lib_tech
@@ -1 +1 @@
-Subproject commit c51fa197a1d89ed556653fd7743c4aba20383b39
+Subproject commit 4344fb7198daaae6d40f95b58587af5f869263a2
diff --git a/nanosoc_tech b/nanosoc_tech
index 23d548a2cbe9c61a8ec90096c6f269ba692534e1..be3bdf3202c87063c7bf38bf3cd3c6db6307a286 160000
--- a/nanosoc_tech
+++ b/nanosoc_tech
@@ -1 +1 @@
-Subproject commit 23d548a2cbe9c61a8ec90096c6f269ba692534e1
+Subproject commit be3bdf3202c87063c7bf38bf3cd3c6db6307a286
diff --git a/simulate/socsim/system_secworks_aes128.sh b/simulate/socsim/system_secworks_aes128.sh
index 9cfe3ee59c66138208d0a4f984b1095a56ae146d..90665179b989b521710619239e3236f1a060d759 100755
--- a/simulate/socsim/system_secworks_aes128.sh
+++ b/simulate/socsim/system_secworks_aes128.sh
@@ -15,16 +15,16 @@
 SIM_NAME=`basename -s .sh "$0"`
 
 # Directory to put simulation files
-SIM_DIR=$PROJECT_DIR/simulate/sim/$SIM_NAME
+SIM_DIR=$SOCLABS_PROJECT_DIR/simulate/sim/$SIM_NAME
 
 # Create Directory to put simulation files
 mkdir -p $SIM_DIR
-cd $PROJECT_DIR/simulate/sim/$PROJECT_DIR
+cd $SOCLABS_PROJECT_DIR/simulate/sim/$SIM_NAME
 
 # Compile Simulation
 # Call makefile in NanoSoC Repo with options
 echo ${2}
-make -C $NANOSOC_TECH_DIR/system run_xm \
+make -C $SOCLABS_NANOSOC_TECH_DIR/system run_xm \
     SIM_DIR=$SIM_DIR \
     ${@:2}
 
diff --git a/soctools_flow b/soctools_flow
index e5b63d6e283f277a79947bcd4a616e4bf3ebadd9..1c706759aebfbd539a9f035e94737975e00dd5dd 160000
--- a/soctools_flow
+++ b/soctools_flow
@@ -1 +1 @@
-Subproject commit e5b63d6e283f277a79947bcd4a616e4bf3ebadd9
+Subproject commit 1c706759aebfbd539a9f035e94737975e00dd5dd