diff --git a/playbooks/groups/proxies-redirects.yml b/playbooks/groups/proxies-redirects.yml
index b4d3269579..fa72f2f38c 100644
--- a/playbooks/groups/proxies-redirects.yml
+++ b/playbooks/groups/proxies-redirects.yml
@@ -161,8 +161,8 @@
   # Cloudy bits
   - role: httpd/redirect
     name: cloud-front-page
-    website: fedoraproject.org
-    target: https://fedoraproject.org/en/get-fedora#clouds
+    website: cloud.fedoraproject.org
+    target: http://fedoraproject.org/en/get-fedora#clouds
 
   - role: httpd/redirectmatch
     name: redirect-cloudstart
@@ -173,25 +173,25 @@
   ## Cloud image redirects
   # Redirects/pointers for fedora 21 BASE cloud images
   - role: httpd/redirect
-    name: cloud-64bit-21
+    name: cloud-base-64bit-21
     website: cloud.fedoraproject.org
     path: /fedora-21.x86_64.qcow2
     target: http://download.fedoraproject.org/pub/fedora/linux/releases/21/Cloud/Images/x86_64/Fedora-Cloud-Base-20141203-21.x86_64.qcow2
 
   - role: httpd/redirect
-    name: cloud-64bit-21-raw
+    name: cloud-base-64bit-21-raw
     website: cloud.fedoraproject.org
     path: /fedora-21.x86_64.raw.xz
     target: http://download.fedoraproject.org/pub/fedora/linux/releases/21/Cloud/Images/x86_64/Fedora-Cloud-Base-20141203-21.x86_64.raw.xz
 
   - role: httpd/redirect
-    name: cloud-32bit-21-raw
+    name: cloud-base-32bit-21-raw
     website: cloud.fedoraproject.org
-    path: /fedora-21.i386.raw
+    path: /fedora-21.i386.raw.xz
     target: http://download.fedoraproject.org/pub/fedora/linux/releases/21/Cloud/Images/i386/Fedora-Cloud-Base-20141203-21.i386.raw.xz
 
   - role: httpd/redirect
-    name: cloud-32bit-21
+    name: cloud-base-32bit-21
     website: cloud.fedoraproject.org
     path: /fedora-21.i386.qcow2
     target: http://download.fedoraproject.org/pub/fedora/linux/releases/21/Cloud/Images/i386/Fedora-Cloud-Base-20141203-21.i386.qcow2
@@ -200,26 +200,26 @@
   - role: httpd/redirect
     name: cloud-atomic-64bit-21
     website: cloud.fedoraproject.org
-    path: /fedora-21.x86_64.qcow2
+    path: /fedora-atomic-21.x86_64.qcow2
     target: http://download.fedoraproject.org/pub/fedora/linux/releases/21/Cloud/Images/x86_64/Fedora-Cloud-Atomic-20141203-21.x86_64.qcow2
 
   - role: httpd/redirect
     name: cloud-atomic-64bit-21-raw
     website: cloud.fedoraproject.org
-    path: /fedora-21.x86_64.raw.xz
+    path: /fedora-atomic-21.x86_64.raw.xz
     target: http://download.fedoraproject.org/pub/fedora/linux/releases/21/Cloud/Images/x86_64/Fedora-Cloud-Atomic-20141203-21.x86_64.raw.xz
 
   # Except, there are no 32bit atomic images atm.
   #- role: httpd/redirect
   #  name: cloud-atomic-32bit-21-raw
   #  website: cloud.fedoraproject.org
-  #  path: /fedora-21.i386.raw
+  #  path: /fedora-atomic-21.i386.raw.xz
   #  target: http://download.fedoraproject.org/pub/fedora/linux/releases/21/Cloud/Images/i386/Fedora-Cloud-Atomic-20141203-21.i386.raw.xz
 
   #- role: httpd/redirect
   #  name: cloud-atomic-32bit-21
   #  website: cloud.fedoraproject.org
-  #  path: /fedora-21.i386.qcow2
+  #  path: /fedora-atomic-21.i386.qcow2
   #  target: http://download.fedoraproject.org/pub/fedora/linux/releases/21/Cloud/Images/i386/Fedora-Cloud-Atomic-20141203-21.i386.qcow2
 
   # Redirects/pointers for fedora 20 cloud images
@@ -244,7 +244,7 @@
   - role: httpd/redirect
     name: cloud-32bit-20-raw
     website: cloud.fedoraproject.org
-    path: /fedora-20.i386.raw
+    path: /fedora-20.i386.raw.xz
     target: http://download.fedoraproject.org/pub/fedora/linux/updates/20/Images/i386/Fedora-i386-20-20140407-sda.raw.xz
 
   # Redirects/pointers for fedora 19 cloud images