diff --git a/roles/4-server-options/meta/main.yml b/roles/4-server-options/meta/main.yml
index 73438a60f..7aec1a69c 100644
--- a/roles/4-server-options/meta/main.yml
+++ b/roles/4-server-options/meta/main.yml
@@ -1,4 +1,5 @@
 dependencies:
+    - { role: home-page, tags: ['home-page'] }
     - { role: sshd, tags: ['services','sshd','base'] }
     - { role: network, tags: ['services','base','network'] }
     - { role: postgresql, tags: ['services','postgresql','base'], when: postgresql_install }
diff --git a/roles/httpd/tasks/home-page.yml b/roles/home-page/tasks/main.yml
similarity index 86%
rename from roles/httpd/tasks/home-page.yml
rename to roles/home-page/tasks/main.yml
index 522f97fe2..b5d57c82a 100644
--- a/roles/httpd/tasks/home-page.yml
+++ b/roles/home-page/tasks/main.yml
@@ -7,7 +7,7 @@
 
 - name: Install admin home page into apache2
   template: src=iiab-home-page.conf
-             dest=/etc/{{ apache_config_dir }}/iiab-home-page.conf
+            dest=/etc/{{ apache_config_dir }}/iiab-home-page.conf
 
 - name: Enable the home page
   file: src=/etc/{{ apache_config_dir }}/iiab-home-page.conf
diff --git a/roles/httpd/templates/iiab-home-page.conf b/roles/home-page/templates/iiab-home-page.conf
similarity index 100%
rename from roles/httpd/templates/iiab-home-page.conf
rename to roles/home-page/templates/iiab-home-page.conf
diff --git a/roles/httpd/tasks/main.yml b/roles/httpd/tasks/main.yml
index 3d7e271c6..0470303e0 100644
--- a/roles/httpd/tasks/main.yml
+++ b/roles/httpd/tasks/main.yml
@@ -146,8 +146,6 @@
   tags:
     - base
 
-- include: home-page.yml
-
 - name: place the script to generate home pages
   template: src=refresh-wiki-docs.sh
             dest=/usr/bin/iiab-refresh-wiki-docs