diff --git a/docker-compose/Makefile b/docker-compose/Makefile
index 1f859907bd6eb9038c569e24fd2a40a339145ca5..d329b9bbb5bd6cbaff6cd0d06f9bf1f93ed47ae5 100644
--- a/docker-compose/Makefile
+++ b/docker-compose/Makefile
@@ -114,7 +114,9 @@ ifeq ($(NETWORK_MODE),host)
     MYSQL_HOST := $(shell hostname):3306
 else
     ifeq ($(TANGO_HOST),)
-        TANGO_HOST := $(CONTAINER_NAME_PREFIX)databaseds:10000
+        # Use FQDN for TANGO_HOST to avoid confusion in the archiver, which also
+        # adds the domain.
+        TANGO_HOST := $(CONTAINER_NAME_PREFIX)databaseds.$(NETWORK_MODE):10000
     else
         TANGO_HOST := $(TANGO_HOST)
     endif