diff --git a/setup.sh b/setup.sh
index 9b3eacf..00952e3 100644
--- a/setup.sh
+++ b/setup.sh
@@ -12,7 +12,7 @@
 init() {
   echo "Starting initialization"
   echo $fqdn > /etc/hostname
-  sed -i -e "s/$default_hostname/$fqdn $hostname/g" /etc/hosts
+  #sed -i -e "s/$default_hostname/$fqdn $hostname/g" /etc/hosts
   localectl set-keymap $keymap
   timedatectl set-timezone $timezone
   systemctl disable apt-daily-upgrade.timer
@@ -55,10 +55,6 @@ set_cups_conf() {
   cp $run_directory_path/cupsd.conf $cups_conf_path/cupsd.conf
 }
 
-set_sane_conf() {
-  systemctl enable saned.socket # FIXME that really needed?
-}
-
 ssh_pubkey() {
   echo "Getting SSH public key"
   sudo -H -u $user mkdir /home/$user/.ssh
@@ -87,7 +83,7 @@ tls_cert() {
 set_apache() {
   echo "Setting up Apache HTTP Server"
   cp $run_directory_path/apache-sites/scanservjs.conf $apache_sites_directory_path/
-  a2dissite *
+  a2dissite 000-default
   a2ensite scanservjs
   a2enmod ssl proxy proxy_http proxy_http2
 }
@@ -103,8 +99,8 @@ fi
 run_directory_path=$(pwd)
 
 # Set parameters
-default_hostname='pine64'
-hostname='pn1'
+#default_hostname='pine64'
+#hostname='pn1'
 fqdn='pn1.hr.kto.black'
 keymap='fr'
 timezone='Europe/Paris'
@@ -127,9 +123,8 @@ apache_sites_directory_path='/etc/apache2/sites-available'
 init
 install_packages
 add_users
-get_conf
+get_sync
 set_cups_conf
-set_sane_conf
 ssh_pubkey
 set_sshd_conf
 install_scanservjs