diff --git a/roles/saas-mediawiki/nginx/files/vhosts/nasqueron.org/agora.conf b/roles/saas-mediawiki/nginx/files/vhosts/nasqueron.org/agora.conf
index 8234640..bf4038f 100644
--- a/roles/saas-mediawiki/nginx/files/vhosts/nasqueron.org/agora.conf
+++ b/roles/saas-mediawiki/nginx/files/vhosts/nasqueron.org/agora.conf
@@ -1,38 +1,40 @@
 #   -------------------------------------------------------------
 #   Webserver
 #   - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
 #   Project:        Nasqueron
 #   Site:           agora.nasqueron.org
 #   License:        Trivial work, not eligible to copyright
 #   Source file:    roles/saas-mediawiki/nginx/files/vhosts/nasqueron.org/agora.conf
 #   -------------------------------------------------------------
 #
 #   <auto-generated>
 #       This file is managed by our rOPS SaltStack repository.
 #
 #       Changes to this file may cause incorrect behavior
 #       and will be lost if the state is redeployed.
 #   </auto-generated>
 
 server {
     listen 80;
     listen [::]:80;
     server_name agora.nasqueron.org;
 
     include includes/letsencrypt;
 
     return 301 https://agora.nasqueron.org$request_uri;
 }
 
 server {
     server_name agora.nasqueron.org;
 
     include includes/tls;
     ssl_certificate /usr/local/etc/letsencrypt/live/agora.nasqueron.org/fullchain.pem;
     ssl_certificate_key /usr/local/etc/letsencrypt/live/agora.nasqueron.org/privkey.pem;
 
     error_log /var/log/www/nasqueron.org/agora-error.log;
     access_log /var/log/www/nasqueron.org/agora-access.log;
 
+    include includes/letsencrypt;
+
     include includes/mediawiki-root;
 }
diff --git a/roles/webserver-legacy/nginx/files/vhosts/wolfplex.org/www.conf b/roles/webserver-legacy/nginx/files/vhosts/wolfplex.org/www.conf
index 97a66b9..d1c5a3d 100644
--- a/roles/webserver-legacy/nginx/files/vhosts/wolfplex.org/www.conf
+++ b/roles/webserver-legacy/nginx/files/vhosts/wolfplex.org/www.conf
@@ -1,109 +1,115 @@
 #   -------------------------------------------------------------
 #   Webserver
 #   - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
 #   Project:        Wolfplex
 #   Site:           www.wolfplex.org
 #   License:        Trivial work, not eligible to copyright
 #   Source file:    roles/webserver-legacy/nginx/files/vhosts/wolfplex.org/www.conf
 #   -------------------------------------------------------------
 #
 #   <auto-generated>
 #       This file is managed by our rOPS SaltStack repository.
 #
 #       Changes to this file may cause incorrect behavior
 #       and will be lost if the state is redeployed.
 #   </auto-generated>
 
 #   ---------------------------------------------------------
 #   Canonical site
 #   - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
 
 server {
     server_name www.wolfplex.org;
 
     include includes/tls;
     ssl_certificate /usr/local/etc/letsencrypt/live/www.wolfplex.org/fullchain.pem;
     ssl_certificate_key /usr/local/etc/letsencrypt/live/www.wolfplex.org/privkey.pem;
 
     error_log /var/log/www/wolfplex.org/www-error.log;
     access_log /var/log/www/wolfplex.org/www-access.log;
 
     root /var/wwwroot/wolfplex.org/www;
     index index.html index.php;
 
     include includes/letsencrypt;
 
     #   ---------------------------------------------------------
     #   Wiki
     #   - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
 
     location / {
         # Use the wiki as home page
         rewrite ^/$ /wiki;
 
         # Link to the most relevant page to present the project
         rewrite /presentation/?$ /w/index.php?title=Presentation last;
 
         # Link to the most relevant page for bulletin/news information:
         rewrite /b/?$ /w/index.php?title=Bulletin:Main last;
     }
 
     include includes/mediawiki-wiki;
 
     #   ---------------------------------------------------------
     #   Etherpad
     #   - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
 
     location /pad {
         rewrite ^/pad/(.*)$ https://pad.wolfplex.be/p/$1 last;
     }
 
     #   ---------------------------------------------------------
     #   Other php-fpm services
     #   - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
 
     location ~ \.php$ {
         fastcgi_pass unix:/var/run/web/www.wolfplex.org/php-fpm.sock;
         fastcgi_index index.php;
         fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name;
         include includes/fastcgi_params;
     }
 }
 
 #   ---------------------------------------------------------
 #   Redirects for http:// or .be to https://...org
 #   - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
 
 server {
     listen          80;
     listen          [::]:80;
     server_name     www.wolfplex.org www.wolfplex.be;
 
     include includes/letsencrypt;
 
     return 301 https://www.wolfplex.org$request_uri;
 }
 
 server {
     server_name www.wolfplex.be;
 
     include includes/tls;
     ssl_certificate /usr/local/etc/letsencrypt/live/www.wolfplex.org/fullchain.pem;
     ssl_certificate_key /usr/local/etc/letsencrypt/live/www.wolfplex.org/privkey.pem;
 
-    return 301 https://www.wolfplex.org$request_uri;
+    include includes/letsencrypt;
+
+    location / {
+        return 301 https://www.wolfplex.org$request_uri;
+    }
 }
 
 server {
     listen          80;
     listen          [::]:80;
     server_name     wiki.wolfplex.org wiki.wolfplex.be;
 
     include includes/tls;
     ssl_certificate /usr/local/etc/letsencrypt/live/www.wolfplex.org/fullchain.pem;
     ssl_certificate_key /usr/local/etc/letsencrypt/live/www.wolfplex.org/privkey.pem;
 
     include includes/letsencrypt;
 
-    return 301 https://www.wolfplex.org/wiki$request_uri;
+    location / {
+        return 301 https://www.wolfplex.org/wiki$request_uri;
+    }
 }