diff --git a/12345.sh b/12345.sh
index cd3bf9f3..4786f9ac 100755
--- a/12345.sh
+++ b/12345.sh
@@ -18,7 +18,7 @@ IPFSNODEID=$(cat ~/.ipfs/config | jq -r .Identity.PeerID)
 myIP=$(hostname -I | awk '{print $1}' | head -n 1)
 isLAN=$(route -n |awk '$1 == "0.0.0.0" {print $2}' | grep -E "/(^127\.)|(^192\.168\.)|(^10\.)|(^172\.1[6-9]\.)|(^172\.2[0-9]\.)|(^172\.3[0-1]\.)|(^::1$)|(^[fF][cCdD])/")
 
-myDOMAINName=$(hostname -d 2>/dev/null || domainname 2>/dev/null)
+myDOMAINName=$(hostname -d 2>/dev/null) && [ -z "$myDOMAINName" ] && myDOMAINName=$(domainname 2>/dev/null)
 myHOSTName=$(hostname |sed 's/\.'${myDOMAINName}'$//')
 [ -n "$myDOMAINName" ] && myHOSTName="${myHOSTName}.${myDOMAINName}" || myDOMAINName=${myHOSTName#*.}
 [ -z "$myDOMAINName" ] && myDOMAINName=localhost
diff --git a/docker/astroport.mk b/docker/astroport.mk
index fe34eb1a..b505fea5 100644
--- a/docker/astroport.mk
+++ b/docker/astroport.mk
@@ -4,7 +4,7 @@ DOCKER_IMAGES_MYOS                        := x2go:xfce-debian
 ENV_VARS                                  += HOST_ASTROPORT_SERVICE_DOMAIN HOST_ASTROPORT_SERVICE_NAME HOST_ASTROPORT_SERVICE_1234_TAGS
 HOST_ASTROPORT_SERVICE_DOMAIN             ?= $(firstword $(DOMAIN))
 HOST_ASTROPORT_SERVICE_NAME               ?= $(HOSTNAME)
-HOST_ASTROPORT_SERVICE_1234_TAGS          ?= $(call tagprefix,HOST_ASTROPORT,1234)
+HOST_ASTROPORT_SERVICE_1234_TAGS          ?= $(call tagprefix,astroport)
 HOST_ASTROPORT_UFW_UPDATE                 := 1234/tcp 12245:12445/tcp 45720/tcp
 MAKE_VARS                                 += SSH_PORT User host
 SERVICE                                   := astroport