diff --git a/new_host.sh b/new_host.sh
index df098f599487e52df87ac41b7f4ec66a1b068042..c77238ca07c1d0a47abf2915b2d60de3ddf8efc7 100755
--- a/new_host.sh
+++ b/new_host.sh
@@ -4,11 +4,14 @@ FQDN=$1
 
 # Add the host
 ipa-getkeytab -p host/${FQDN} -k /tmp/${FQDN}.keytab || exit 1
-eyaml encrypt --pkcs7-public-key=public_key.pkcs7.pem --output=block --label=ipa_client::keytab_content --file=/tmp/${FQDN}.keytab | tee nodes/${FQDN}.yaml
+/opt/puppetlabs/puppet/bin/eyaml encrypt --pkcs7-public-key=public_key.pkcs7.pem --output=block --label=ipa_client::keytab_content --file=/tmp/${FQDN}.keytab | tee nodes/${FQDN}.yaml
 shred /tmp/${FQDN}.keytab || exit 1
 rm /tmp/${FQDN}.keytab
 
 ROOT_PASSWORD=`pwgen -s 16 -N 1`
-echo ${ROOT_PASSWORD} | mkpasswd -R 5000000 -s -m sha-512 | eyaml encrypt --pkcs7-public-key=public_key.pkcs7.pem --output=block --label=root::password --stdin | tee nodes/${FQDN}.yaml
-echo "Generated password for the server: ${ROOT_PASSWORD}"
-echo "Save it or delete it from nodes/${FQDN}.yaml"
+echo ${ROOT_PASSWORD} | mkpasswd -R 5000000 -s -m sha-512 | /opt/puppetlabs/puppet/bin/eyaml encrypt --pkcs7-public-key=public_key.pkcs7.pem --output=block --label=profiles::root::password --stdin | tee nodes/${FQDN}.yaml
+echo ""
+echo "The output above has been saved to nodes/${FQDN}.yaml." 
+echo "Please commit the file and push it."
+echo -e "\e[32mGenerated password for the server:\e[39m ${ROOT_PASSWORD}"
+echo -e "\e[35mSave the password or delete the entry from nodes/${FQDN}.yaml\e[39m"