diff --git a/misc/build.func b/misc/build.func
index d4f28fc..9ef473f 100644
--- a/misc/build.func
+++ b/misc/build.func
@@ -309,18 +309,17 @@ HN="${HN}"
 BRG="${BRG}"
 APT_CACHER_IP="${APT_CACHER_IP}"
 DISABLEIP6="${DISABLEIP6}"
-TAGS="${TAGS}"
-PW="${PW_CONFIG}"
+PW="${PW:-none}"
 SSH="${SSH}"
 SSH_AUTHORIZED_KEY="${SSH_AUTHORIZED_KEY}"
 VERBOSE="${VERBOSE}"
-TAGS="${TAGS}"
+TAGS="${TAGS:-none}"
 VLAN="${VLAN}"
 MTU="${MTU}"
-GATE="${GATE}"
-SD="${SD}"
-MAC="${MAC}"
-NS="${NS}"
+GATE="${GATE:-none}"
+SD="${SD:-none}"
+MAC="${MAC:-none}"
+NS="${NS:-none}"
 NET="${NET}"
 
 EOF
@@ -341,18 +340,17 @@ HN="${HN}"
 BRG="${BRG}"
 APT_CACHER_IP="${APT_CACHER_IP}"
 DISABLEIP6="${DISABLEIP6}"
-TAGS="${TAGS}"
-PW="${PW_CONFIG}"
+PW="${PW:-none}"
 SSH="${SSH}"
 SSH_AUTHORIZED_KEY="${SSH_AUTHORIZED_KEY}"
 VERBOSE="${VERBOSE}"
-TAGS="${TAGS}"
+TAGS="${TAGS:-none}"
 VLAN="${VLAN}"
 MTU="${MTU}"
-GATE="${GATE}"
-SD="${SD}"
-MAC="${MAC}"
-NS="${NS}"
+GATE="${GATE:-none}"
+SD="${SD:-none}"
+MAC="${MAC:-none}"
+NS="${NS:-none}"
 NET="${NET}"
 
 EOF