diff --git a/bootstrap.sh b/bootstrap.sh
index a7f60bb..d4a8c36 100755
--- a/bootstrap.sh
+++ b/bootstrap.sh
@@ -43,8 +43,6 @@
 export SALT_LOG_LEVEL="--state-verbose=false -lerror"
 export SALT_OPTS="${SALT_OPTS:- --timeout=120 --state-output=changes --retcode-passthrough --force-color $SALT_LOG_LEVEL }"
 export SALT_STATE_RETRY=${SALT_STATE_RETRY:-3}
-export BOOTSTRAP_SALTSTACK=${BOOTSTRAP_SALTSTACK:-True}
-export BOOTSTRAP_SALTSTACK_OPTS=${BOOTSTRAP_SALTSTACK_OPTS:- -dX stable 2016.3 }
 
 
 # salt apt repository
@@ -79,10 +77,11 @@
 export MASTER_HOSTNAME=${MASTER_HOSTNAME:-${HOSTNAME}.${DOMAIN}}
 
 # saltstack
-BOOTSTRAP_SALTSTACK=${BOOTSTRAP_SALTSTACK:-True}
-BOOTSTRAP_SALTSTACK_OPTS=${BOOTSTRAP_SALTSTACK_OPTS:- -dX stable 2016.3 }
 SALT_SOURCE=${SALT_SOURCE:-pkg}
-SALT_VERSION=${SALT_VERSION:-latest}
+SALT_VERSION=${SALT_VERSION:-2016.3}
+BOOTSTRAP_SALTSTACK=${BOOTSTRAP_SALTSTACK:-True}
+BOOTSTRAP_SALTSTACK_VERSION=${BOOTSTRAP_SALTSTACK_VERSION:- stable $SALT_VERSION }
+BOOTSTRAP_SALTSTACK_OPTS=${BOOTSTRAP_SALTSTACK_OPTS:- -dX $BOOTSTRAP_SALTSTACK_VERSION }
 
 # environment
 if [ "$FORMULAS_SOURCE" == "git" ]; then