diff --git a/playbooks/groups/proxies.yml b/playbooks/groups/proxies.yml
index 55ef183578..6627629e3f 100644
--- a/playbooks/groups/proxies.yml
+++ b/playbooks/groups/proxies.yml
@@ -72,55 +72,36 @@
   pre_tasks:
   #
   # When we have a prerelease we also need to drop the config files.
-  - block:
-
-     - name: Remove prerelease-to-final-spins-1
-       file: path=/etc/httpd/conf.d/spins.fedoraproject.org/prerelease-to-final-spins-1-redirectmatch.conf state=absent
-
-     - name: Remove prerelease-to-final-spins-2
-       file: path=/etc/httpd/conf.d/spins.fedoraproject.org/prerelease-to-final-spins-2-redirectmatch.conf state=absent
-
-     - name: Remove prerelease-to-final-labs-1
-       file: path=/etc/httpd/conf.d/labs.fedoraproject.org/prerelease-to-final-labs-1-redirectmatch.conf state=absent
-
-     - name: Remove prerelease-to-final-labs-2
-       file: path=/etc/httpd/conf.d/labs.fedoraproject.org/prerelease-to-final-labs-2-redirectmatch.conf state=absent
-
-     - name: Remove prerelease-to-final-arm-1
-       file: path=/etc/httpd/conf.d/arm.fedoraproject.org/prerelease-to-final-arm-1-redirectmatch.conf state=absent
-
-     - name: Remove prerelease-to-final-arm-2
-       file: path=/etc/httpd/conf.d/arm.fedoraproject.org/prerelease-to-final-arm-2-redirectmatch.conf state=absent
-
-     - name: Remove prerelease-to-final-gfo
-       file: path=/etc/httpd/conf.d/getfedora.org/prerelease-to-final-gfo-redirectmatch.conf state=absent
-
-     - name: Remove prerelease-to-final-spins
-       file: path=/etc/httpd/conf.d/spins.fedoraproject.org/prerelease-to-final-spins-redirectmatch.conf state=absent
-
-     - name: Remove prerelease-to-final-labs
-       file: path=/etc/httpd/conf.d/labs.fedoraproject.org/prerelease-to-final-labs-redirectmatch.conf state=absent
-
-     - name: Remove prerelease-to-final-arm
-       file: path=/etc/httpd/conf.d/arm.fedoraproject.org/prerelease-to-final-arm-redirectmatch.conf state=absent
-    when: env == "staging"
 
+#  - name: Remove prerelease-to-final-spins-1
+#    file: path=/etc/httpd/conf.d/spins.fedoraproject.org/prerelease-to-final-spins-1-redirectmatch.conf state=absent
 #
-# The above when should be: 
+#  - name: Remove prerelease-to-final-spins-2
+#    file: path=/etc/httpd/conf.d/spins.fedoraproject.org/prerelease-to-final-spins-2-redirectmatch.conf state=absent
 #
-# When there is a final release and we want redirects
-# in both staging and prod
+#  - name: Remove prerelease-to-final-labs-1
+#    file: path=/etc/httpd/conf.d/labs.fedoraproject.org/prerelease-to-final-labs-1-redirectmatch.conf state=absent
 #
-#   when: not env
+#  - name: Remove prerelease-to-final-labs-2
+#    file: path=/etc/httpd/conf.d/labs.fedoraproject.org/prerelease-to-final-labs-2-redirectmatch.conf state=absent
 #
-# When there is a prerelease only in staging
+#  - name: Remove prerelease-to-final-arm-1
+#    file: path=/etc/httpd/conf.d/arm.fedoraproject.org/prerelease-to-final-arm-1-redirectmatch.conf state=absent
 #
-#   when: env == 'staging'
+#  - name: Remove prerelease-to-final-arm-2
+#    file: path=/etc/httpd/conf.d/arm.fedoraproject.org/prerelease-to-final-arm-2-redirectmatch.conf state=absent
 #
-# When there is a prerelease in production and staging
+#  - name: Remove prerelease-to-final-gfo
+#    file: path=/etc/httpd/conf.d/getfedora.org/prerelease-to-final-gfo-redirectmatch.conf state=absent
 #
-#   when: env
+#  - name: Remove prerelease-to-final-spins
+#    file: path=/etc/httpd/conf.d/spins.fedoraproject.org/prerelease-to-final-spins-redirectmatch.conf state=absent
 #
+#  - name: Remove prerelease-to-final-labs
+#    file: path=/etc/httpd/conf.d/labs.fedoraproject.org/prerelease-to-final-labs-redirectmatch.conf state=absent
+#
+#  - name: Remove prerelease-to-final-arm
+#    file: path=/etc/httpd/conf.d/arm.fedoraproject.org/prerelease-to-final-arm-redirectmatch.conf state=absent
 
   roles:
   - httpd/proxy
diff --git a/playbooks/include/proxies-redirects.yml b/playbooks/include/proxies-redirects.yml
index cef43cefdf..a7429ecdd7 100644
--- a/playbooks/include/proxies-redirects.yml
+++ b/playbooks/include/proxies-redirects.yml
@@ -248,67 +248,106 @@
 # When there is no prerelease we redirect the prerelease urls
 # back to the main release.
 # This should be disabled when there is a prerelease
-#
 
-  - block:
-     - role: httpd/redirectmatch
-       name: prerelease-to-final-gfo
-       website: getfedora.org
-       regex: /(.*)/prerelease.*$
-       target: https://stg.getfedora.org/$1
+  - role: httpd/redirectmatch
+    name: prerelease-to-final-gfo
+    website: getfedora.org
+    regex: /(.*)/prerelease.*$
+    target: https://stg.getfedora.org/$1
+    when: env == 'staging'
 
-     - role: httpd/redirectmatch
-       name: prerelease-to-final-labs-1
-       website: labs.fedoraproject.org
-       regex: /(.*)/prerelease.*$
-       target: https://labs.stg.fedoraproject.org/$1
+  - role: httpd/redirectmatch
+    name: prerelease-to-final-labs-1
+    website: labs.fedoraproject.org
+    regex: /(.*)/prerelease.*$
+    target: https://labs.stg.fedoraproject.org/$1
+    when: env == 'staging'
 
-     - role: httpd/redirectmatch
-       name: prerelease-to-final-spins-1
-       website: spins.fedoraproject.org
-       regex: /(.*)/prerelease.*$
-       target: https://spins.stg.fedoraproject.org/$1
+  - role: httpd/redirectmatch
+    name: prerelease-to-final-spins-1
+    website: spins.fedoraproject.org
+    regex: /(.*)/prerelease.*$
+    target: https://spins.stg.fedoraproject.org/$1
+    when: env == 'staging'
 
-     - role: httpd/redirectmatch
-       name: prerelease-to-final-arm-1
-       website: arm.fedoraproject.org
-       regex: /(.*)/prerelease.*$
-       target: https://arm.stg.fedoraproject.org/$1
+  - role: httpd/redirectmatch
+    name: prerelease-to-final-arm-1
+    website: arm.fedoraproject.org
+    regex: /(.*)/prerelease.*$
+    target: https://arm.stg.fedoraproject.org/$1
+    when: env == 'staging'
 
-     - role: httpd/redirectmatch
-       name: prerelease-to-final-labs-2
-       website: labs.fedoraproject.org
-       regex: /prerelease.*$
-       target: https://labs.stg.fedoraproject.org/$1
+  - role: httpd/redirectmatch
+    name: prerelease-to-final-labs-2
+    website: labs.fedoraproject.org
+    regex: /prerelease.*$
+    target: https://labs.stg.fedoraproject.org/$1
+    when: env == 'staging'
 
-     - role: httpd/redirectmatch
-       name: prerelease-to-final-spins-2
-       website: spins.fedoraproject.org
-       regex: /prerelease.*$
-       target: https://spins.stg.fedoraproject.org/$1
+  - role: httpd/redirectmatch
+    name: prerelease-to-final-spins-2
+    website: spins.fedoraproject.org
+    regex: /prerelease.*$
+    target: https://spins.stg.fedoraproject.org/$1
+    when: env == 'staging'
 
-     - role: httpd/redirectmatch
-       name: prerelease-to-final-arm-2
-       website: arm.fedoraproject.org
-       regex: /prerelease.*$
-       target: https://arm.stg.fedoraproject.org/$1
-    when: env == 'production'
+  - role: httpd/redirectmatch
+    name: prerelease-to-final-arm-2
+    website: arm.fedoraproject.org
+    regex: /prerelease.*$
+    target: https://arm.stg.fedoraproject.org/$1
+    when: env == 'staging'
 
-# The above when should be: 
-#
-# When there is a final release and we want redirects
-# in both staging and prod
-#
-#   when: env
-#
-# When there is a prerelease only in staging
-#
-#   when: env == 'production'
-#
-# When there is a prerelease in production and staging
-#
-#   when: not env
-#
+# end staging
+
+  - role: httpd/redirectmatch
+    name: prerelease-to-final-gfo
+    website: getfedora.org
+    regex: /(.*)/prerelease.*$
+    target: https://getfedora.org/$1
+    when: env != 'staging'
+
+  - role: httpd/redirectmatch
+    name: prerelease-to-final-labs-1
+    website: labs.fedoraproject.org
+    regex: /(.*)/prerelease.*$
+    target: https://labs.fedoraproject.org/$1
+    when: env != 'staging'
+
+  - role: httpd/redirectmatch
+    name: prerelease-to-final-spins-1
+    website: spins.fedoraproject.org
+    regex: /(.*)/prerelease.*$
+    target: https://spins.fedoraproject.org/$1
+    when: env != 'staging'
+
+  - role: httpd/redirectmatch
+    name: prerelease-to-final-arm-1
+    website: arm.fedoraproject.org
+    regex: /(.*)/prerelease.*$
+    target: https://arm.fedoraproject.org/$1
+    when: env != 'staging'
+
+  - role: httpd/redirectmatch
+    name: prerelease-to-final-labs-2
+    website: labs.fedoraproject.org
+    regex: /prerelease.*$
+    target: https://labs.fedoraproject.org/$1
+    when: env != 'staging'
+
+  - role: httpd/redirectmatch
+    name: prerelease-to-final-spins-2
+    website: spins.fedoraproject.org
+    regex: /prerelease.*$
+    target: https://spins.fedoraproject.org/$1
+    when: env != 'staging'
+
+  - role: httpd/redirectmatch
+    name: prerelease-to-final-arm-2
+    website: arm.fedoraproject.org
+    regex: /prerelease.*$
+    target: https://arm.fedoraproject.org/$1
+    when: env != 'staging'
 
   - role: httpd/redirect
     name: store