diff --git a/docker/docker-compose.app.yml b/docker/docker-compose.app.yml
index 8037c088..9351726c 100644
--- a/docker/docker-compose.app.yml
+++ b/docker/docker-compose.app.yml
@@ -8,8 +8,7 @@ services:
       - GID=${HOST_GID}
       - UID=${HOST_UID}
     container_name: ${COMPOSE_PROJECT_NAME}-astroport
-    domainname: ${HOST_ASTROPORT_SERVICE_DOMAIN:-localhost}
-    hostname: ${HOST_ASTROPORT_SERVICE_NAME:-astroport}
+    hostname: ${HOSTNAME:-astroport}.${HOST_ASTROPORT_SERVICE_DOMAIN:-localhost}
     image: ${DOCKER_REPOSITORY}/astroport:${DOCKER_IMAGE_TAG}
     labels:
     - SERVICE_1234_CHECK_HTTP=/test