diff --git a/asic_lib_tech b/asic_lib_tech
index 39deacc600317d7c68df33421c1e49521818f69f..5687e4966986706e13dcc9fe14a7ec741a57a022 160000
--- a/asic_lib_tech
+++ b/asic_lib_tech
@@ -1 +1 @@
-Subproject commit 39deacc600317d7c68df33421c1e49521818f69f
+Subproject commit 5687e4966986706e13dcc9fe14a7ec741a57a022
diff --git a/flist/project/system_ASIC.flist b/flist/project/system_ASIC.flist
index 7330052510779ba01d61b9887040fc5ad192b189..20603e75153b926f2c9254bee0ebe31d018197fe 100644
--- a/flist/project/system_ASIC.flist
+++ b/flist/project/system_ASIC.flist
@@ -22,11 +22,8 @@
 // - Primitives IP
 -f $(SOCLABS_PRIMITIVES_TECH_DIR)/flist/rtl_primitives_ip.flist
 
-// - Generic Pad Library
--f $(SOCLABS_GENERIC_LIB_TECH_DIR)/flist/generic_lib_ip.flist
-
-// - FPGA sram
--f $(SOCLABS_ASIC_LIB_TECH_DIR)/flist/asic_lib_mem_ip.flist
+// - ASIC memories and pads
+-f $(SOCLABS_ASIC_LIB_TECH_DIR)/flist/asic_lib_ip.flist
 
 // - Accelerator Wrapper IP
 -f $(SOCLABS_WRAPPER_TECH_DIR)/flist/accelerator_wrapper_ip.flist
diff --git a/nanosoc_tech b/nanosoc_tech
index 778e3f5a95b69ee590e43de5d20ec168549cded0..872cd269323ed2cf442aff3830cb46ab25846ad8 160000
--- a/nanosoc_tech
+++ b/nanosoc_tech
@@ -1 +1 @@
-Subproject commit 778e3f5a95b69ee590e43de5d20ec168549cded0
+Subproject commit 872cd269323ed2cf442aff3830cb46ab25846ad8
diff --git a/soctools_flow b/soctools_flow
index eb193b3aa83a65cf3a510a171ea919bfa84cc348..73a86713b7fb0b98ef3fd59032b6c6326a20041f 160000
--- a/soctools_flow
+++ b/soctools_flow
@@ -1 +1 @@
-Subproject commit eb193b3aa83a65cf3a510a171ea919bfa84cc348
+Subproject commit 73a86713b7fb0b98ef3fd59032b6c6326a20041f