diff --git a/roles/webserver/files/etc/apache2/sites-available/ftp.thunix.net.conf b/roles/webserver/files/etc/apache2/sites-available/ftp.thunix.net.conf
index 00c1001..058356f 100644
--- a/roles/webserver/files/etc/apache2/sites-available/ftp.thunix.net.conf
+++ b/roles/webserver/files/etc/apache2/sites-available/ftp.thunix.net.conf
@@ -2,14 +2,14 @@
     ServerAdmin webmaster@thunix.net
     ServerName ftp.thunix.net
     ServerAlias ftp.thunixme5v4rnoby.onion
-    DocumentRoot /var/ftp
+    DocumentRoot /var/www/ftp.thunix.cf
     ErrorLog ${APACHE_LOG_DIR}/error.log
     CustomLog ${APACHE_LOG_DIR}/access.log combined
     <Directorymatch "^/.*/\.git/">
                 Order deny,allow
                 Deny from all
     </Directorymatch>
-    <Directory /var/ftp>
+    <Directory /var/www/ftp.thunix.cf>
       IndexOptions FancyIndexing NameWidth=* FoldersFirst ScanHTMLTitles DescriptionWidth=*
       HeaderName HEADER.html
       ReadmeName README.html
@@ -18,28 +18,3 @@
       ErrorDocument 404 default
     </Directory>
 </VirtualHost>
-<IfModule mod_ssl.c>
-<VirtualHost *:443>
-    ServerAdmin webmaster@thunix.net
-    ServerName ftp.thunix.net
-    DocumentRoot /var/ftp
-    ErrorLog ${APACHE_LOG_DIR}/error.log
-    CustomLog ${APACHE_LOG_DIR}/access.log combined
-    <Directorymatch "^/.*/\.git/">
-                Order deny,allow
-                Deny from all
-        </Directorymatch>
-    <Directory /var/ftp>
-      IndexOptions FancyIndexing NameWidth=* FoldersFirst ScanHTMLTitles DescriptionWidth=*
-      HeaderName HEADER.html
-      ReadmeName README.html
-      AllowOverride FileInfo Indexes
-      Options Indexes SymLinksIfOwnerMatch FollowSymLinks
-      ErrorDocument 404 default
-    </Directory>
-
-Include /etc/letsencrypt/options-ssl-apache.conf
-SSLCertificateFile /etc/letsencrypt/live/ftp.thunix.net/fullchain.pem
-SSLCertificateKeyFile /etc/letsencrypt/live/ftp.thunix.net/privkey.pem
-</VirtualHost>
-</IfModule>
diff --git a/roles/webserver/files/etc/apache2/sites-available/lukewarmcat.codes.conf b/roles/webserver/files/etc/apache2/sites-available/lukewarmcat.codes.conf
index bdba5bf..97e883f 100644
--- a/roles/webserver/files/etc/apache2/sites-available/lukewarmcat.codes.conf
+++ b/roles/webserver/files/etc/apache2/sites-available/lukewarmcat.codes.conf
@@ -8,4 +8,7 @@
 		Order deny,allow
 		Deny from all
 	</Directorymatch>
-</VirtualHost>
\ No newline at end of file
+RewriteEngine on
+RewriteCond %{SERVER_NAME} =lukewarmcat.codes
+RewriteRule ^ https://%{SERVER_NAME}%{REQUEST_URI} [END,NE,R=permanent]
+</VirtualHost>
diff --git a/roles/webserver/files/etc/apache2/sites-available/mightywcms.conf b/roles/webserver/files/etc/apache2/sites-available/mightywcms.conf
index 85cf043..a55e8d5 100644
--- a/roles/webserver/files/etc/apache2/sites-available/mightywcms.conf
+++ b/roles/webserver/files/etc/apache2/sites-available/mightywcms.conf
@@ -2,8 +2,8 @@
     ServerAdmin naglfar@thunix.net
     ServerName mightywcms.thunix.net
     DocumentRoot /var/www/MightyWCMS
-    ErrorLog ${APACHE_LOG_DIR}/mightywcms/error.log
-    CustomLog ${APACHE_LOG_DIR}/mightywcms/access.log combined
+    ErrorLog ${APACHE_LOG_DIR}/error.mightywcms.log
+    CustomLog ${APACHE_LOG_DIR}/access.mightywcms.log combined
     <Directory /var/www/MightyWCMS>
             Options Indexes FollowSymLinks
             AllowOverride All
diff --git a/roles/webserver/files/etc/apache2/sites-available/rpm.thunix.net.conf b/roles/webserver/files/etc/apache2/sites-available/rpm.thunix.net.conf
index 8af25b3..f9f5e2d 100644
--- a/roles/webserver/files/etc/apache2/sites-available/rpm.thunix.net.conf
+++ b/roles/webserver/files/etc/apache2/sites-available/rpm.thunix.net.conf
@@ -10,20 +10,3 @@
 		Deny from all
     </Directorymatch>
 </VirtualHost>
-<IfModule mod_ssl.c>
-<VirtualHost *:443>
-    ServerAdmin webmaster@thunix.net
-    ServerName rpm.thunix.net
-    ServerAlias rpm.thunixme5v4rnoby.onion
-    DocumentRoot /var/www/rpm.thunix.net
-    ErrorLog ${APACHE_LOG_DIR}/error.log
-    CustomLog ${APACHE_LOG_DIR}/access.log combined
-    <Directorymatch "^/.*/\.git/">
-                Order deny,allow
-                Deny from all
-    </Directorymatch>
-Include /etc/letsencrypt/options-ssl-apache.conf
-SSLCertificateFile /etc/letsencrypt/live/rpm.thunix.net/fullchain.pem
-SSLCertificateKeyFile /etc/letsencrypt/live/rpm.thunix.net/privkey.pem
-</VirtualHost>
-</IfModule>
diff --git a/roles/webserver/files/etc/apache2/sites-available/staticadventures.netlib.re.conf b/roles/webserver/files/etc/apache2/sites-available/staticadventures.netlib.re.conf
index fbc557e..c58e5df 100644
--- a/roles/webserver/files/etc/apache2/sites-available/staticadventures.netlib.re.conf
+++ b/roles/webserver/files/etc/apache2/sites-available/staticadventures.netlib.re.conf
@@ -8,21 +8,7 @@
                 Order deny,allow
                 Deny from all
     </Directorymatch>
+RewriteEngine on
+RewriteCond %{SERVER_NAME} =staticadventures.netlib.re
+RewriteRule ^ https://%{SERVER_NAME}%{REQUEST_URI} [END,NE,R=permanent]
 </VirtualHost>
-
-<IfModule mod_ssl.c>
-<VirtualHost *:443>
-    ServerAdmin staticadventures@riseup.net
-    ServerName staticadventures.netlib.re
-    DocumentRoot /var/www/staticadventures.netlib.re
-    ErrorLog ${APACHE_LOG_DIR}/error.log
-    CustomLog ${APACHE_LOG_DIR}/access.log combined
-    <Directorymatch "^/.*/\.git/">
-                Order deny,allow
-                Deny from all
-    </Directorymatch>
-    SSLCertificateFile /etc/letsencrypt/live/staticadventures.netlib.re/fullchain.pem
-    SSLCertificateKeyFile /etc/letsencrypt/live/staticadventures.netlib.re/privkey.pem
-    Include /etc/letsencrypt/options-ssl-apache.conf
-</VirtualHost>
-</IfModule>
diff --git a/roles/webserver/files/etc/apache2/sites-available/stats.thunix.net.conf b/roles/webserver/files/etc/apache2/sites-available/stats.thunix.net.conf
index 3b32279..6ed95d1 100644
--- a/roles/webserver/files/etc/apache2/sites-available/stats.thunix.net.conf
+++ b/roles/webserver/files/etc/apache2/sites-available/stats.thunix.net.conf
@@ -10,20 +10,3 @@
                 Deny from all
     </Directorymatch>
 </VirtualHost>
-
-<IfModule mod_ssl.c>
-<VirtualHost *:443>
-    ServerAdmin webmaster@thunix.net
-    ServerName stats.thunix.net
-    DocumentRoot /var/www/stats.thunix.net
-    ErrorLog ${APACHE_LOG_DIR}/error.log
-    CustomLog ${APACHE_LOG_DIR}/access.log combined
-    <Directorymatch "^/.*/\.git/">
-                Order deny,allow
-                Deny from all
-    </Directorymatch>
-    SSLCertificateFile /etc/letsencrypt/live/stats.thunix.net/fullchain.pem
-    SSLCertificateKeyFile /etc/letsencrypt/live/stats.thunix.net/privkey.pem
-    Include /etc/letsencrypt/options-ssl-apache.conf
-</VirtualHost>
-</IfModule>