diff --git a/main.yml b/main.yml
index ce5d2e8..893dcf6 100644
--- a/main.yml
+++ b/main.yml
@@ -47,6 +47,7 @@
 
   roles:
   - role: install-docker
+  - role: apache
 
   tasks:
     - name: Setup docker network
@@ -58,9 +59,6 @@
             gateway: 192.168.0.1
         state: present
 
-    - name: Setup httpd
-      include_tasks: tasks/httpd.yml
-
     - name: Setup forward site reservierung.netz39.de
       include_role:
         name: setup-http-site-forward
diff --git a/tasks/httpd.yml b/roles/apache/tasks/main.yml
similarity index 100%
rename from tasks/httpd.yml
rename to roles/apache/tasks/main.yml