diff --git a/playbooks/groups/proxies.yml b/playbooks/groups/proxies.yml
index cd1ca74cee..3746936a03 100644
--- a/playbooks/groups/proxies.yml
+++ b/playbooks/groups/proxies.yml
@@ -73,35 +73,35 @@
   #
   # When we have a prerelease we also need to drop the config files.
 
-  - 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
+#  - 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
 
   roles:
   - httpd/proxy
diff --git a/playbooks/include/proxies-redirects.yml b/playbooks/include/proxies-redirects.yml
index 5c6de32f0a..6e86e91eb1 100644
--- a/playbooks/include/proxies-redirects.yml
+++ b/playbooks/include/proxies-redirects.yml
@@ -249,105 +249,105 @@
 # back to the main release. 
 # This should be disabled when there is a prerelease
 
-#  - 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-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
-#    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
+    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
-#    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
+    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
-#    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
+    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
-#    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
+    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
-#    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
+    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 == '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 == 'staging'
 
-  # end staging
+# 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/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
@@ -455,6 +455,19 @@
 
   ## Cloud image redirects
 
+  # Redirects/pointers for fedora 24 BASE cloud images
+  - role: httpd/redirect
+    name: cloud-base-64bit-24
+    website: cloud.fedoraproject.org
+    path: /fedora-24.x86_64.qcow2
+    target: https://download.fedoraproject.org/pub/fedora/linux/releases/24/CloudImages/x86_64/images/Fedora-Cloud-Base-24-1.2.x86_64.qcow2
+
+  - role: httpd/redirect
+    name: cloud-base-64bit-24-raw
+    website: cloud.fedoraproject.org
+    path: /fedora-24.x86_64.raw.xz
+    target: https://download.fedoraproject.org/pub/fedora/linux/releases/24/CloudImages/x86_64/images/Fedora-Cloud-Base-24-1.2.x86_64.raw.xz
+
   # Redirects/pointers for fedora 23 BASE cloud images
   - role: httpd/redirect
     name: cloud-base-64bit-23