diff --git a/docker/tango/Makefile b/docker/tango/Makefile
index 71ba876d1b19d5a52077be6a30390c46b5042b6b..91bd08338005efc9ba69c6ec1ec793ebd6693573 100644
--- a/docker/tango/Makefile
+++ b/docker/tango/Makefile
@@ -1,4 +1,4 @@
-DIRS = tango-builder tango-dependencies tango-db tango-cpp tango-java tango-rest tango-dsconfig ska-python-buildenv tango-pogo tango-starter tango-libtango tango-jive ska-python-runtime tango-admin tango-databaseds tango-test tango-itango tango-vscode tango-vnc tango-pytango mariadb_hdbpp tango-archiver hdbpp_viewer
+DIRS = tango-builder tango-dependencies tango-db tango-cpp tango-java tango-rest tango-dsconfig ska-python-buildenv tango-pogo tango-starter tango-libtango tango-jive ska-python-runtime tango-admin tango-databaseds tango-test tango-itango tango-vscode tango-vnc tango-pytango mariadb_hdbpp tango-archiver hdbpp_viewer tango-modbus
 TEST = ska-python-buildenv tango-itango tango-rest tango-db tango-cpp tango-archiver
 BUILDDIRS = $(DIRS:%=build-%)
 TESTDIRS = $(TEST:%=test-%)
diff --git a/docker/tango/tangobox-com/.release b/docker/tango/tangobox-com/.release
new file mode 100644
index 0000000000000000000000000000000000000000..a8c298868368b9b0af032b243c2a7b25a55ca3b0
--- /dev/null
+++ b/docker/tango/tangobox-com/.release
@@ -0,0 +1,2 @@
+release=9.2.5a
+tag=tangobox-com-9.2.5a
diff --git a/docker/tango/tangobox-com/Dockerfile b/docker/tango/tangobox-com/Dockerfile
new file mode 100644
index 0000000000000000000000000000000000000000..3b7351471095653d8d0e9b638ff96ffbdfc9c2cf
--- /dev/null
+++ b/docker/tango/tangobox-com/Dockerfile
@@ -0,0 +1,4 @@
+FROM nexus.engageska-portugal.pt/ska-docker/ska-python-buildenv:9.3.3.1 as ska
+
+FROM registry.gitlab.com/s2innovation/tangobox-docker/tangobox-com
+COPY --from=ska /usr/local/bin/retry /usr/local/bin/retry
diff --git a/docker/tango/tangobox-com/Makefile b/docker/tango/tangobox-com/Makefile
new file mode 100644
index 0000000000000000000000000000000000000000..9f046a948604496191fe3dcfb695d21018b6435b
--- /dev/null
+++ b/docker/tango/tangobox-com/Makefile
@@ -0,0 +1,7 @@
+include ../../make/Makefile
+
+pre-build:
+	@echo do some stuff before the docker build
+
+post-build:
+	@echo do some stuff after the docker build
\ No newline at end of file