diff --git a/.gitmodules b/.gitmodules
index d6fc7e5f..db88bdea 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -1,6 +1,3 @@
-[submodule "external/hibou-shipbox"]
-	path = external/hibou-shipbox
-	url = https://github.com/hibou-io/shipbox.git
 [submodule "external/hibou-oca/server-tools"]
 	path = external/hibou-oca/server-tools
 	url = https://github.com/hibou-io/oca-server-tools.git
@@ -42,3 +39,6 @@
 [submodule "external/hibou-oca/purchase-workflow"]
 	path = external/hibou-oca/purchase-workflow
 	url = https://github.com/hibou-io/oca-purchase-workflow.git
+[submodule "external/hiboubox"]
+	path = external/hiboubox
+	url = https://gitlab.com/hibou-io/hibou-odoo/hiboubox.git
diff --git a/box_base b/box_base
new file mode 120000
index 00000000..927a8be2
--- /dev/null
+++ b/box_base
@@ -0,0 +1 @@
+./external/hiboubox/box_base
\ No newline at end of file
diff --git a/box_printbox b/box_printbox
new file mode 120000
index 00000000..32a05aa1
--- /dev/null
+++ b/box_printbox
@@ -0,0 +1 @@
+./external/hiboubox/box_printbox
\ No newline at end of file
diff --git a/box_printbox_queue b/box_printbox_queue
new file mode 120000
index 00000000..1f317dc0
--- /dev/null
+++ b/box_printbox_queue
@@ -0,0 +1 @@
+./external/hiboubox/box_printbox_queue
\ No newline at end of file
diff --git a/box_shipbox b/box_shipbox
new file mode 120000
index 00000000..e6ddf932
--- /dev/null
+++ b/box_shipbox
@@ -0,0 +1 @@
+./external/hiboubox/box_shipbox
\ No newline at end of file
diff --git a/external/hibou-shipbox b/external/hibou-shipbox
deleted file mode 160000
index 55fb9a89..00000000
--- a/external/hibou-shipbox
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit 55fb9a890fdaf15b5b65a41b0cb1f9a0a0b0aa38
diff --git a/external/hiboubox b/external/hiboubox
new file mode 160000
index 00000000..3e4f551d
--- /dev/null
+++ b/external/hiboubox
@@ -0,0 +1 @@
+Subproject commit 3e4f551dfd8cc230ea6134ac37572f6e3d5e2fb9
diff --git a/shipbox b/shipbox
index e077c55d..45ee84a1 120000
--- a/shipbox
+++ b/shipbox
@@ -1 +1 @@
-./external/hibou-shipbox/shipbox
\ No newline at end of file
+./external/hiboubox/shipbox
\ No newline at end of file