diff --git a/roles/1-prep/templates/.iiab.env.j2.un~ b/roles/1-prep/templates/.iiab.env.j2.un~
index b9f549ce1..f4f008fed 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 07e8766b6..1f6220dfb 100644
--- a/roles/1-prep/templates/iiab.env.j2
+++ b/roles/1-prep/templates/iiab.env.j2
@@ -10,3 +10,4 @@ OS={{ ansible_local.local_facts.os }}
 OS_VER={{ ansible_local.local_facts.os_ver }}
 WWWROOT={{ doc_root }}
 STAGE=1
+FQDN={{ iiab-fqdn }}
diff --git a/roles/httpd/templates/010-iiab.conf.j2 b/roles/httpd/templates/010-iiab.conf.j2
index aa3cbe231..2558f9c94 100755
--- a/roles/httpd/templates/010-iiab.conf.j2
+++ b/roles/httpd/templates/010-iiab.conf.j2
@@ -176,8 +176,8 @@ DocumentRoot "{{ doc_root }}"
 <VirtualHost *:80>
    ErrorLog /var/log/apache2/error.log
    CustomLog /var/log/apache2/access.log combined
-   ServerName box
-   ServerAlias box.lan
+   ServerName {{ iiab_hostname }}
+   ServerAlias server.lan
    <Directory "{{ doc_root }}">
        Options Indexes FollowSymLinks
        AllowOverride None
diff --git a/roles/network/files/mac.template b/roles/network/files/mac.template
index 658aa6b98..049c2ff19 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://box.lan/home">{{ btn1 }}</a>
+         <a class="button" href="http://server.lan/home">{{ btn1 }}</a>
       </div>
   </body>
 </html>
diff --git a/roles/network/files/simple.template b/roles/network/files/simple.template
index 152a1607c..3919528fb 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://box.lan/home","_system");
+        window.open("http://server.lan/home","_system");
         $.ajax("/home_selected");
      }