diff --git a/roles/moodle/templates/moodle_installer b/roles/moodle/templates/moodle_installer
index 1595b9209..efbeb1859 100755
--- a/roles/moodle/templates/moodle_installer
+++ b/roles/moodle/templates/moodle_installer
@@ -1,8 +1,8 @@
 #!/bin/bash -x
-sudo -u {{ apache_user }} /usr/bin/php {{moodle_base}}/admin/cli/install.php \
---wwwroot=http://schoolserver.lan/moodle --dataroot={{moodle_data}} \
---dbtype=pgsql --dbname=moodle --dbuser=Admin --dbpass=changeme \
+sudo -u {{ apache_user }} /usr/bin/php {{ moodle_base }}/admin/cli/install.php \
+--wwwroot=http://{{ iiab_hostname }}.{{ iiab_domain }}/moodle --dataroot={{ moodle_data }} \
+--dbtype=pgsql --dbname={{ moodle_database_name }} --dbuser=Admin --dbpass=changeme \
 --fullname=Your_School --shortname=School \
 --adminuser=admin --adminpass=changeme \
 --non-interactive --agree-license
-chown {{ apache_user}}:{{ apache_user }} {{ moodle_base }}/config.php
+chown {{ apache_user }}:{{ apache_user }} {{ moodle_base }}/config.php
\ No newline at end of file
diff --git a/roles/network/tasks/hosts.yml b/roles/network/tasks/hosts.yml
index b8827feea..693400c54 100644
--- a/roles/network/tasks/hosts.yml
+++ b/roles/network/tasks/hosts.yml
@@ -2,7 +2,7 @@
 - name: Configure short hostname in /etc/hosts
   lineinfile: dest=/etc/hosts
               regexp='^127\.0\.0\.1'
-              line='127.0.0.1            localhost.localdomain   localhost   {{ iiab_hostname }}'
+              line='127.0.0.1            localhost.localdomain   localhost  box {{ iiab_hostname }}'
               owner=root
               group=root
               mode=0644
@@ -16,14 +16,14 @@
 - name: Configure fqdn in /etc/hosts with LAN
   lineinfile: dest=/etc/hosts
               regexp='^172\.18\.96\.1'
-              line='172.18.96.1            {{ iiab_hostname }}.{{ iiab_domain }}      {{ iiab_hostname }}'
+              line='172.18.96.1            {{ iiab_hostname }}.{{ iiab_domain }} {{ iiab_hostname }} box'
               state=present
   when: iiab_lan_iface != "none" and not installing
 
 - name: Configure fqdn in /etc/hosts appliance mode
   lineinfile: dest=/etc/hosts
               regexp='^127\.0\.0\.1'
-              line='127.0.0.1            localhost.localdomain   localhost {{ iiab_hostname }}.{{ iiab_domain }} {{ iiab_hostname }}'
+              line='127.0.0.1            localhost.localdomain localhost {{ iiab_hostname }}.{{ iiab_domain }} {{ iiab_hostname }} box '
               owner=root
               group=root
               mode=0644