diff --git a/playbooks/groups/torrent.yml b/playbooks/groups/torrent.yml
index 8863d4e1ea..69fa1a877e 100644
--- a/playbooks/groups/torrent.yml
+++ b/playbooks/groups/torrent.yml
@@ -36,10 +36,21 @@
   - openvpn/client
   - torrent
 
+  - role: httpd/mod_ssl
+
+  - role: httpd/certificate
+    name: wildcard-2014.fedoraproject.org
+    SSLCertificateChainFile: wildcard-2014.fedoraproject.org.intermediate.cert
+
+  - role: httpd/website
+    name: torrent.fedoraproject.org
+    cert_name: "{{wildcard_cert_name}}"
+
   tasks:
   - include: "{{ tasks }}/yumrepos.yml"
   - include: "{{ tasks }}/2fa_client.yml"
   - include: "{{ tasks }}/motd.yml"
+  - include: "{{ tasks }}/apache.yml"
 
   handlers:
   - include: "{{ handlers }}/restart_services.yml"
diff --git a/roles/torrent/files/opentracker-ipv6.conf b/roles/torrent/files/opentracker-ipv6.conf
index 8008e50e81..3dcff00ab7 100644
--- a/roles/torrent/files/opentracker-ipv6.conf
+++ b/roles/torrent/files/opentracker-ipv6.conf
@@ -7,7 +7,7 @@
 #      If no listen option is given (here or on the command line), opentracker
 #      listens on 0.0.0.0:6969 tcp and udp.
 #
-listen.tcp_udp [2610:28:3090:3001:dead:beef:cafe:fed7]:6969
+listen.tcp_udp [2610:28:3090:3001:dead:beef:cafe:fed8]:6969
 # listen.tcp_udp 192.168.0.1:80
 # listen.tcp_udp 10.0.0.5:6969
 #
diff --git a/roles/torrent/files/spins-httpd.conf b/roles/torrent/files/spins-httpd.conf
index f86bb0c078..7997241826 100644
--- a/roles/torrent/files/spins-httpd.conf
+++ b/roles/torrent/files/spins-httpd.conf
@@ -1,21 +1,4 @@
- <VirtualHost *:80>
-      ##
-      # Domain: torrent.fedoraproject.org
-      # Owner: admin@fedoraproject.org
-      #
-      ServerAdmin admin@fedoraproject.org
-
-      DocumentRoot "/srv/torrent/spins"
-
-      ServerName spins.fedoraproject.org
-
-      ErrorLog "| /usr/sbin/rotatelogs /var/log/httpd/spins.fedoraproject.org-error.log-%Y%m%d 86400 -300"
-      CustomLog "| /usr/sbin/rotatelogs /var/log/httpd/spins.fedoraproject.org-access.log-%Y%m%d 86400 -300" common
-
-      RewriteEngine On
-      RewriteRule /favicon\.ico$ http://fedoraproject.org/static/images/favicon.ico [P]
-
-      <Directory "/srv/torrent/spins">
+<Directory "/srv/torrent/spins">
         Options Indexes FollowSymLinks
-      </Directory>
- </VirtualHost>
+        Require all granted
+</Directory>
diff --git a/roles/torrent/files/torrent-httpd.conf b/roles/torrent/files/torrent-httpd.conf
index aa531a6c16..d8b6a1aa8b 100644
--- a/roles/torrent/files/torrent-httpd.conf
+++ b/roles/torrent/files/torrent-httpd.conf
@@ -1,54 +1,4 @@
-NameVirtualHost *:80
-
-LoadModule deflate_module modules/mod_deflate.so
-
-<Location />
-    # Insert filter
-    SetOutputFilter DEFLATE
-
-    # Netscape 4.x has some problems...
-    BrowserMatch ^Mozilla/4 gzip-only-text/html
-
-    # Netscape 4.06-4.08 have some more problems
-    BrowserMatch ^Mozilla/4\.0[678] no-gzip
-
-    # MSIE masquerades as Netscape, but it is fine
-    # BrowserMatch \bMSIE !no-gzip !gzip-only-text/html
-
-    # NOTE: Due to a bug in mod_setenvif up to Apache 2.0.48
-    # the above regex won't work. You can use the following
-    # workaround to get the desired effect:
-    BrowserMatch \bMSI[E] !no-gzip !gzip-only-text/html
-
-    # Don't compress images
-    SetEnvIfNoCase Request_URI \
-    \.(?:gif|jpe?g|png)$ no-gzip dont-vary
-
-    # Make sure proxies don't deliver the wrong content
-    Header append Vary User-Agent env=!dont-vary
-</Location>
-
-FileETag MTime Size
-
- <VirtualHost *:80>
-      ##
-      # Domain: torrent.fedoraproject.org
-      # Owner: admin@fedoraproject.org
-      #
-      ServerAdmin admin@fedoraproject.org
-
-      DocumentRoot "/srv/torrent/www"
-
-      ServerName torrent.fedoraproject.org
-      ServerAlias torrents.fedoraproject.org
-
-      ErrorLog "| /usr/sbin/rotatelogs /var/log/httpd/torrent.fedoraproject.org-error.log-%Y%m%d 86400 -300"
-      CustomLog "| /usr/sbin/rotatelogs /var/log/httpd/torrent.fedoraproject.org-access.log-%Y%m%d 86400 -300" common
-
-      RewriteEngine On
-      RewriteRule /favicon\.ico$ http://fedoraproject.org/static/images/favicon.ico [P]
-
-      <Directory "/srv/torrent/www">
-        Options Indexes FollowSymLinks
-      </Directory>
- </VirtualHost>
+<Directory "/srv/torrent/www">
+  Options Indexes FollowSymLinks
+  Require all granted
+</Directory>