diff --git a/roles/libravatar/templates/httpd/libravatar.conf b/roles/libravatar/templates/httpd/libravatar.conf
index 79da0b047b..adebf87472 100644
--- a/roles/libravatar/templates/httpd/libravatar.conf
+++ b/roles/libravatar/templates/httpd/libravatar.conf
@@ -17,20 +17,6 @@ RewriteEngine on
     RewriteRule "^/?(.*)" "https://{{ server_name }}/$1" [L,R=301,NE]
 </VirtualHost>
 
-<VirtualHost *:443>
-    ServerName {{ server_name }}
-    ServerAlias {{ server_alias }}
-
-    SSLCertificateFile    /etc/letsencrypt/live/{{ server_name }}/cert.pem
-    SSLCertificateKeyFile  /etc/letsencrypt/live/{{ server_name }}/privkey.pem
-    SSLCertificateChainFile /etc/letsencrypt/live/{{ server_name }}/fullchain.pem
-    Header always add Strict-Transport-Security "max-age=31536000; preload"
-
-    RewriteRule ^/\.well-known/(.*) /var/www/html/.well-known/$1 [L]
-
-    Include /etc/httpd/conf.d/libravatar-app.include
-</VirtualHost>
-
 <VirtualHost *:443>
     ServerName {{ server_seccdn_name }}
 
@@ -45,15 +31,30 @@ RewriteEngine on
 </VirtualHost>
 
 <VirtualHost *:443>
+    ServerAlias {{ server_redirect_name }}
+
     SSLCertificateFile    /etc/letsencrypt/live/{{ server_name }}/cert.pem
     SSLCertificateKeyFile  /etc/letsencrypt/live/{{ server_name }}/privkey.pem
     SSLCertificateChainFile /etc/letsencrypt/live/{{ server_name }}/fullchain.pem
     Header always add Strict-Transport-Security "max-age=31536000; preload"
 
-    ServerAlias {{ server_redirect_name }}
     RewriteRule "^/?(.*)" "https://{{ server_name }}/$1" [L,R=301,NE]
 </VirtualHost>
 
+<VirtualHost *:443>
+    ServerName {{ server_name }}
+    ServerAlias {{ server_alias }}
+
+    SSLCertificateFile    /etc/letsencrypt/live/{{ server_name }}/cert.pem
+    SSLCertificateKeyFile  /etc/letsencrypt/live/{{ server_name }}/privkey.pem
+    SSLCertificateChainFile /etc/letsencrypt/live/{{ server_name }}/fullchain.pem
+    Header always add Strict-Transport-Security "max-age=31536000; preload"
+
+    RewriteRule ^/\.well-known/(.*) /var/www/html/.well-known/$1 [L]
+
+    Include /etc/httpd/conf.d/libravatar-app.include
+</VirtualHost>
+
 <IfModule mod_status.c>
     ExtendedStatus On
     <Location /server-status>