diff --git a/bootstrap.sh b/bootstrap.sh
index 11b38a2..52393d4 100755
--- a/bootstrap.sh
+++ b/bootstrap.sh
@@ -69,7 +69,9 @@
 export FORMULAS_SALT_MASTER
 
 # system / host
-export HOSTNAME=${HOSTNAME:-cfg01}
+export HOSTNAME=${HOSTNAME:-`hostname -s`}
+export HOSTNAME=${HOSTNAME//.*/}
+export DOMAIN=${DOMAIN:-`hostname -d`}
 export DOMAIN=${DOMAIN:-bootstrap.local}
 
 # salt