diff --git a/teams/team.sh b/teams/team.sh
index 2b55e9e..cb58587 100755
--- a/teams/team.sh
+++ b/teams/team.sh
@@ -5,5 +5,5 @@
 
 awk -F';' '\
   { fname=$1;gsub(/\s+/,_,$1); sname=tolower(substr($1,1,1)substr($1,index(fname," "))); split($4, key ," "); }
-  { print "FNAME=\\\""fname"\\\"", "SNAME=\\\""sname"\\\"", "KEY=\\\""key[1]" "key[2]"\\\"","EMAIL="$2" envsubst < team.template > "tolower($1)".yml" }'\
-  < $1 | xargs -n11 echo
+  { print "FNAME=\""fname"\"", "SNAME=\""sname"\"", "KEY=\""key[1]" "key[2]"\"","EMAIL="$2" envsubst < team.template > "tolower($1)".yml" }'\
+  < $1
diff --git a/teams/team.template b/teams/team.template
index 496c817..ae1dfc2 100644
--- a/teams/team.template
+++ b/teams/team.template
@@ -5,13 +5,12 @@
         ${SNAME}:
           enabled: true
           name: ${SNAME}
-          sudo: true
+          sudo: ${_param:linux_system_user_sudo}
           full_name: ${FNAME}
           home: /home/${SNAME}
           email: ${EMAIL}
   openssh:
     server:
-      enabled: true
       user:
         ${SNAME}:
           enabled: true