diff --git a/etc/fifoci.nginx b/etc/fifoci.nginx
index 145a800..edde451 100644
--- a/etc/fifoci.nginx
+++ b/etc/fifoci.nginx
@@ -1,8 +1,10 @@
 server {
     listen 443 ssl;
-    server_name fifoci.dolphin-emu.org fifoci.dolphin-emu.net;
+    listen [::]:443 ssl;
+
+    server_name fifo.ci;
 
-    access_log logs/fifoci.access.log main;
+    access_log /etc/nginx/logs/fifoci.access.log main;
 
     # FifoCI admins need to upload large DFF files, up to 100MB. Put a
     # deliberately high limit here.
@@ -23,3 +25,15 @@ server {
         expires 30d;
     }
 }
+
+server {
+    listen 80;
+    listen [::]:80;
+    listen 443 ssl;
+    listen [::]:443 ssl;
+
+    server_name fifoci.dolphin-emu.org fifoci.dolphin-emu.net;
+
+    return 301 https://fifo.ci$request_uri;
+}
+
diff --git a/frontend/fifoci/settings/base.py b/frontend/fifoci/settings/base.py
index 6e297ff..fa16459 100644
--- a/frontend/fifoci/settings/base.py
+++ b/frontend/fifoci/settings/base.py
@@ -30,7 +30,7 @@
 DEBUG = False
 TEMPLATE_DEBUG = False
 
-ALLOWED_HOSTS = ['fifoci.dolphin-emu.org']
+ALLOWED_HOSTS = ['fifo.ci']
 
 
 # Application definition