diff --git a/roles/modernpaste/tasks/main.yml b/roles/modernpaste/tasks/main.yml
index e3acb4088b..34f7d8ce87 100644
--- a/roles/modernpaste/tasks/main.yml
+++ b/roles/modernpaste/tasks/main.yml
@@ -42,7 +42,7 @@
   notify: reload httpd
 
 - name: modernpaste apache config
-  copy: src=modern-paste.conf dest=/etc/httpd/conf.d/modern-paste.conf owner=root group=root mode=644
+  template: src=modern-paste.conf dest=/etc/httpd/conf.d/modern-paste.conf owner=root group=root mode=644
   tags:
   - config
   - modernpaste
@@ -50,6 +50,7 @@
 
 - name: Apply modernpaste hotfixes for forcing 1 week expiry (1)
   copy: src=post.html dest=/usr/share/modern-paste/app/templates/paste/post.html owner=root group=root mode=644
+  when: env != 'staging'
   tags:
   - hotfix
   - modernpaste
@@ -57,6 +58,7 @@
 
 - name: Apply modernpaste hotfixes for forcing 1 week expiry (2)
   copy: src=paste.py dest=/usr/share/modern-paste/app/api/paste.py owner=root group=root mode=644
+  when: env != 'staging'
   tags:
   - hotfix
   - modernpaste
diff --git a/roles/modernpaste/files/modern-paste.conf b/roles/modernpaste/templates/modern-paste.conf
similarity index 99%
rename from roles/modernpaste/files/modern-paste.conf
rename to roles/modernpaste/templates/modern-paste.conf
index 3a7e321083..bd3378514c 100644
--- a/roles/modernpaste/files/modern-paste.conf
+++ b/roles/modernpaste/templates/modern-paste.conf
@@ -108,7 +108,10 @@ WSGISocketPrefix run/wsgi
 
 RewriteEngine on
 #LogLevel alert rewrite:trace6
+
+{% if env != 'staging' %}
 RewriteRule login / [L,R]
+{% endif %}
 
 RewriteCond %{HTTP_USER_AGENT} ^fpaste\/0\.3.*$ [OR]
 RewriteCond %{HTTP_USER_AGENT} ^Python\-urllib.*$