diff --git a/.gitmodules b/.gitmodules
index d4a445c13..9f0ade8d2 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -15,4 +15,7 @@
 	url = https://github.com/pulp-platform/fpga-support.git
 [submodule "src/common_cells"]
 	path = src/common_cells
-  url = https://github.com/pulp-platform/common_cells.git
+	url = https://github.com/pulp-platform/common_cells.git
+[submodule "src/axi"]
+	path = src/axi
+	url = https://github.com/pulp-platform/axi.git
diff --git a/Makefile b/Makefile
index f09512ecb..71daf8061 100755
--- a/Makefile
+++ b/Makefile
@@ -21,7 +21,8 @@ target-options ?=
 # Package files -> compile first
 ariane_pkg := include/riscv_pkg.sv       \
               src/debug/dm_pkg.sv        \
-              include/ariane_pkg.sv      \
+              src/axi/src/axi_pkg.sv     \
+			  include/ariane_pkg.sv      \
               include/std_cache_pkg.sv   \
               include/piton_cache_pkg.sv \
 			  include/axi_if.sv
@@ -45,7 +46,7 @@ src :=  $(filter-out src/ariane_regfile.sv, $(wildcard src/*.sv))      \
 		$(wildcard bootrom/*.sv)                                       \
         $(wildcard src/axi_slice/*.sv)                                 \
         $(wildcard src/clint/*.sv)                                     \
-        $(wildcard src/axi_node/*.sv)                                  \
+        $(wildcard src/axi_node/src/*.sv)                              \
         $(wildcard src/axi_mem_if/src/*.sv)                            \
         $(filter-out src/debug/dm_pkg.sv, $(wildcard src/debug/*.sv))  \
         $(wildcard src/debug/debug_rom/*.sv)                           \
diff --git a/src/axi b/src/axi
new file mode 160000
index 000000000..328cbe05a
--- /dev/null
+++ b/src/axi
@@ -0,0 +1 @@
+Subproject commit 328cbe05a42a31aae6f57f780351a2ba22954fef
diff --git a/src/axi_node b/src/axi_node
index ec45a3d13..9c3d507ff 160000
--- a/src/axi_node
+++ b/src/axi_node
@@ -1 +1 @@
-Subproject commit ec45a3d13a9b827f35aa76d19a8400e3ef6d13b6
+Subproject commit 9c3d507ffa1bc9db93e53331cb317b3cfd0a1176