diff --git a/Makefile b/Makefile
index c922566..8fbcb1f 100644
--- a/Makefile
+++ b/Makefile
@@ -6,6 +6,15 @@ configure:
 		--ask-become-pass \
 		ansible/configuration.yml
 
+configure-web-server:
+	ansible-playbook \
+		--inventory "ansible/hosts_prod" \
+		--extra-vars='ansible_python_interpreter=/usr/bin/python3' \
+		--user=av \
+		--ask-become-pass \
+		--tags webserver \
+		ansible/configuration.yml
+
 dry-run:
 	ansible-playbook \
 		--inventory "ansible/hosts_prod" \
diff --git a/ansible/roles/homepage/meta/main.yml b/ansible/roles/homepage/meta/main.yml
index 358afb4..47d0af9 100644
--- a/ansible/roles/homepage/meta/main.yml
+++ b/ansible/roles/homepage/meta/main.yml
@@ -8,7 +8,7 @@ dependencies:
       - '{{ homepage_domain }}'
       - 'www.{{ homepage_domain }}'
     tags:
-      - ssl
+      - webserver
 
   - role: blocks/static-site
     static_site_name: '{{ homepage_name }}'
diff --git a/ansible/roles/homepage/templates/homepage.conf.j2 b/ansible/roles/homepage/templates/homepage.conf.j2
index a79d96c..b2908b0 100755
--- a/ansible/roles/homepage/templates/homepage.conf.j2
+++ b/ansible/roles/homepage/templates/homepage.conf.j2
@@ -28,4 +28,13 @@ server {
         index index.html;
         try_files $uri $uri/ =404;
     }
+
+    error_page 404 /404/;
+
+    location = /404/ {
+        root {{ homepage_dir }}/current;
+        index index.html;
+        try_files $uri $uri/ =409;
+        internal;
+    }
 }