diff --git a/preseed/finish.sh b/preseed/finish.sh
index 6d41fbb..2bb84ce 100755
--- a/preseed/finish.sh
+++ b/preseed/finish.sh
@@ -1,22 +1,25 @@
 #!/bin/bash
 
 set -e
 
-PUPPET_MASTER=pergamon.internal.softwareheritage.org
+PUPPET_MASTER=pergamon
+PUPPET_MASTER_FQDN="$PUPPET_MASTER.internal.softwareheritage.org"
 LOCATION=sesi_rocquencourt
 
 apt-get update
 
 apt-get -o Dpkg::Options::="--force-confdef" -o Dpkg::Options::="--force-confold" -y dist-upgrade
 
 systemctl disable puppet.service
 
 mkdir -p /etc/facter/facts.d
 echo "location=$LOCATION" > /etc/facter/facts.d/location.txt
 
+echo "192.168.100.29 $PUPPET_MASTER_FQDN $PUPPET_MASTER" >> /etc/hosts
+
 # first time around, this will:
 # - update the node's puppet agent configuration defining the puppet master
 # - generate the certificates with the appropriate fqdn
 # - unfortunately, for now, this fails though, when not being able to
 #   install the apt-transport-https package
-puppet agent --server $PUPPET_MASTER --waitforcert 60 --test
+puppet agent --server $PUPPET_MASTER_FQDN --waitforcert 60 --test