diff --git a/setup/so-functions b/setup/so-functions
index 53c539a1b..c4e7d48e0 100755
--- a/setup/so-functions
+++ b/setup/so-functions
@@ -1530,6 +1530,9 @@ influxdb_pillar() {
 }
 
 make_some_dirs() {
+	mkdir -p /nsm
+	mkdir -p "$default_salt_dir"
+	mkdir -p "$local_salt_dir"
 	mkdir -p $local_salt_dir/pillar/minions
 	mkdir -p $local_salt_dir/salt/firewall/hostgroups
 	mkdir -p $local_salt_dir/salt/firewall/portgroups
diff --git a/setup/so-variables b/setup/so-variables
index a753bc91b..52dd3a9e5 100644
--- a/setup/so-variables
+++ b/setup/so-variables
@@ -29,7 +29,6 @@ export error_log
 filesystem_root=$(df / | awk '$3 ~ /[0-9]+/ { print $2 * 1000 }')
 export filesystem_root
 
-mkdir -p /nsm
 filesystem_nsm=$(df /nsm | awk '$3 ~ /[0-9]+/ { print $2 * 1000 }')
 export filesystem_nsm
 
@@ -59,10 +58,8 @@ export percentage_str='Getting started'
 export DEBIAN_FRONTEND=noninteractive
 
 export default_salt_dir=/opt/so/saltstack/default
-mkdir -p "$default_salt_dir"
 
 export local_salt_dir=/opt/so/saltstack/local
-mkdir -p "$local_salt_dir"
 
 SCRIPTDIR=$(pwd)
 export SCRIPTDIR