diff --git a/roles/1-prep/templates/.iiab.env.j2.un~ b/roles/1-prep/templates/.iiab.env.j2.un~
index f4f008fed..870f3493e 100644
Binary files a/roles/1-prep/templates/.iiab.env.j2.un~ and b/roles/1-prep/templates/.iiab.env.j2.un~ differ
diff --git a/roles/1-prep/templates/iiab.env.j2 b/roles/1-prep/templates/iiab.env.j2
index 1f6220dfb..93176035b 100644
--- a/roles/1-prep/templates/iiab.env.j2
+++ b/roles/1-prep/templates/iiab.env.j2
@@ -10,4 +10,4 @@ OS={{ ansible_local.local_facts.os }}
 OS_VER={{ ansible_local.local_facts.os_ver }}
 WWWROOT={{ doc_root }}
 STAGE=1
-FQDN={{ iiab-fqdn }}
+FQDN={{ iiab_fqdn }}
diff --git a/roles/network/files/mac.template b/roles/network/files/mac.template
index 049c2ff19..c430d1958 100644
--- a/roles/network/files/mac.template
+++ b/roles/network/files/mac.template
@@ -48,7 +48,7 @@
       <br><br>
       <br><br>
       <br><br>
-         <a class="button" href="http://server.lan/home">{{ btn1 }}</a>
+         <a class="button" href="http://iiab-server.lan/home">{{ btn1 }}</a>
       </div>
   </body>
 </html>
diff --git a/roles/network/files/simple.template b/roles/network/files/simple.template
index 3919528fb..ec140a058 100644
--- a/roles/network/files/simple.template
+++ b/roles/network/files/simple.template
@@ -69,7 +69,7 @@
     <script>
      var w = window.innerWidth;
      function homeclick(){
-        window.open("http://server.lan/home","_system");
+        window.open("http://iiab-server.lan/home","_system");
         $.ajax("/home_selected");
      }
 
diff --git a/roles/network/tasks/hosts.yml b/roles/network/tasks/hosts.yml
index cf4b38278..8c3a12a01 100644
--- a/roles/network/tasks/hosts.yml
+++ b/roles/network/tasks/hosts.yml
@@ -8,14 +8,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 }} box'
+              line='172.18.96.1     {{ iiab_hostname }}.{{ iiab_domain }} {{ iiab_hostname }} box iiab-server.lan'
               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 }} box '
+              line='127.0.0.1            localhost.localdomain localhost {{ iiab_hostname }}.{{ iiab_domain }} {{ iiab_hostname }} box iiab-server.lan'
               owner=root
               group=root
               mode=0644