diff --git a/roles/pagure/frontend/templates/0_pagure.conf b/roles/pagure/frontend/templates/0_pagure.conf
index 792a74e049..38edf4e475 100644
--- a/roles/pagure/frontend/templates/0_pagure.conf
+++ b/roles/pagure/frontend/templates/0_pagure.conf
@@ -28,6 +28,17 @@ WSGIDaemonProcess paguredocs user=git group=git maximum-requests=1000 display-na
 {% endif %}
 </VirtualHost>
 
+<VirtualHost *:80>
+{% if env == 'pagure-staging' %}
+  ServerName releases.stg.pagure.org
+  Redirect permanent / https://releases.stg.pagure.org/
+{% else %}
+  ServerName releases.pagure.org
+  Redirect permanent / https://releases.pagure.org/
+{% endif %}
+</VirtualHost>
+
+
 
 ## End of redirects http -> https
 
@@ -77,23 +88,6 @@ WSGIDaemonProcess paguredocs user=git group=git maximum-requests=1000 display-na
    </IfModule>
   </Location>
 
-  <Location /releases>
-   WSGIProcessGroup pagure
-   <IfModule mod_authz_core.c>
-      # Apache 2.4
-      Require all granted
-   </IfModule>
-   <IfModule !mod_authz_core.c>
-       # Apache 2.2
-      Order deny,allow
-      Allow from all
-   </IfModule>
-  </Location>
-
-  <Directory /var/www/releases>
-    Options +Indexes
-  </Directory>
-
 </VirtualHost>
 
 
@@ -153,3 +147,31 @@ WSGIDaemonProcess paguredocs user=git group=git maximum-requests=1000 display-na
     </IfModule>
    </Location>
 </VirtualHost>
+
+<VirtualHost *:443>
+{% if env == 'pagure-staging' %}
+  ServerName releases.stg.pagure.org
+{% else %}
+  ServerName releases.pagure.org
+{% endif %}
+
+  <Location />
+   WSGIProcessGroup pagure
+   <IfModule mod_authz_core.c>
+      # Apache 2.4
+      Require all granted
+   </IfModule>
+   <IfModule !mod_authz_core.c>
+       # Apache 2.2
+      Order deny,allow
+      Allow from all
+   </IfModule>
+  </Location>
+
+  <Directory /var/www/releases>
+    Options +Indexes
+    Options NameWidth=*
+  </Directory>
+
+</VirtualHost>
+
diff --git a/roles/pagure/frontend/templates/pagure.cfg b/roles/pagure/frontend/templates/pagure.cfg
index 43998e6a9b..fefc03a6f0 100644
--- a/roles/pagure/frontend/templates/pagure.cfg
+++ b/roles/pagure/frontend/templates/pagure.cfg
@@ -112,7 +112,7 @@ REMOTE_GIT_FOLDER = '/srv/git/remotes'
 GITOLITE_CONFIG = '/srv/git/.gitolite/conf/gitolite.conf'
 
 ### Path of the release folder
-UPLOAD_FOLDER = 'releases/'
+UPLOAD_FOLDER_URL = 'https://releases.pagure.org/'
 UPLOAD_FOLDER_PATH = '/var/www/' + UPLOAD_FOLDER