diff --git a/rootfs/etc/my_init.d/startup.sh b/rootfs/etc/my_init.d/startup.sh
index 79d260c..7948b50 100755
--- a/rootfs/etc/my_init.d/startup.sh
+++ b/rootfs/etc/my_init.d/startup.sh
@@ -1,7 +1,5 @@
 #!/bin/bash
 
-# save HOSTNAME
-export XHOSTNAME="$HOSTNAME"
 export TERM=xterm
 MYPASS=
 
@@ -57,9 +55,8 @@ fi
 
 # auto ssl on start
 if [ -f /bin/vesta-auto-ssl.sh ]; then
-	echo "[i] running /bin/vesta-auto-ssl.sh"
-    export HOSTNAME="$XHOSTNAME"
-	bash /bin/vesta-auto-ssl.sh
+    echo "[i] running /bin/vesta-auto-ssl.sh"
+    bash /bin/vesta-auto-ssl.sh
 fi
 
 if [ ! -z "$MYPASS" ]; then
diff --git a/rootfs/sysprepz/admin/bin/vesta-auto-ssl.sh b/rootfs/sysprepz/admin/bin/vesta-auto-ssl.sh
index 4e7ca9d..2fdffd7 100755
--- a/rootfs/sysprepz/admin/bin/vesta-auto-ssl.sh
+++ b/rootfs/sysprepz/admin/bin/vesta-auto-ssl.sh
@@ -1,11 +1,10 @@
 #!/bin/bash
 
-domain="$HOSTNAME"
-
 # get environment variables
 source /etc/container_environment.sh
 
 VESTA_PATH='/usr/local/vesta'
+domain=`/bin/hostname --fqdn`
 user='admin'
 
 # only run if hostname is valid, regex check if it has a period