diff --git a/fedora-atomic.conf b/fedora-atomic.conf
index ddec7e9..47cf31c 100644
--- a/fedora-atomic.conf
+++ b/fedora-atomic.conf
@@ -26,7 +26,7 @@ variants_file='variants-fedora.xml'
 sigkeys = ['FDB19C98', 'E372E838'] # None = unsigned
 # limit tree architectures
 # if undefined, all architectures from variants.xml will be included
-tree_arches = ['i386', 'x86_64', 'armhfp']
+tree_arches = ['x86_64', 'armhfp']
 # limit tree variants
 # if undefined, all variants from variants.xml will be included
 tree_variants = ['Atomic', 'Cloud', 'CloudImages', 'Docker']
@@ -226,9 +226,9 @@ image_build = {
                     'distro': 'Fedora-20',
                     'disk_size': 3,
                     'arches': ['x86_64', 'armhfp'],
+                    'repo_from': 'Cloud',
                     'repo': [
-                        'http://kojipkgs.fedoraproject.org/pub/alt/releases/25/Cloud/$arch/os/',
-                        'http://download.fedoraproject.org/pub/fedora/linux/updates/25/$basearch/',
+                        'http://kojipkgs.fedoraproject.org/pub/fedora/linux/updates/25/$basearch/',
                     ],
                     'install_tree_from': 'Cloud',
                     'subvariant': 'Docker_Base'
@@ -248,9 +248,9 @@ image_build = {
                     'distro': 'Fedora-20',
                     'disk_size': 3,
                     'arches': ['x86_64', 'i386'],
+                    'repo_from': 'Cloud',
                     'repo': [
-                        'http://kojipkgs.fedoraproject.org/pub/alt/releases/25/Cloud/$arch/os/',
-                        'http://download.fedoraproject.org/pub/fedora/linux/updates/25/$basearch/',
+                        'http://kojipkgs.fedoraproject.org/pub/fedora/linux/updates/25/$basearch/',
                     ],
                     'install_tree_from': 'Cloud',
                     'subvariant': 'Cloud_Base'
@@ -268,9 +268,9 @@ image_build = {
                     'distro': 'Fedora-20',
                     'disk_size': 40,
                     'arches': ['x86_64'],
+                    'repo_from': 'Cloud',
                     'repo': [
-                        'http://kojipkgs.fedoraproject.org/pub/alt/releases/25/Cloud/$arch/os/',
-                        'http://download.fedoraproject.org/pub/fedora/linux/updates/25/$basearch/',
+                        'http://kojipkgs.fedoraproject.org/pub/fedora/linux/updates/25/$basearch/',
                     ],
                     'install_tree_from': 'Cloud',
                     'subvariant': 'Cloud_Base',
@@ -289,9 +289,9 @@ image_build = {
                     'distro': 'Fedora-20',
                     'disk_size': 6,
                     'arches': ['x86_64'],
+                    'repo_from': 'Cloud',
                     'repo': [
-                        'http://kojipkgs.fedoraproject.org/pub/alt/releases/25/Cloud/$arch/os/',
-                        'http://download.fedoraproject.org/pub/fedora/linux/updates/25/$basearch/',
+                        'http://kojipkgs.fedoraproject.org/pub/fedora/linux/updates/25/$basearch/',
                     ],
                     'install_tree_from': 'Cloud',
                     'subvariant': 'Atomic'
@@ -309,9 +309,9 @@ image_build = {
                     'distro': 'Fedora-20',
                     'disk_size': 40,
                     'arches': ['x86_64'],
+                    'repo_from': 'Cloud',
                     'repo': [
-                        'http://kojipkgs.fedoraproject.org/pub/alt/releases/25/Cloud/$arch/os/',
-                        'http://download.fedoraproject.org/pub/fedora/linux/updates/25/$basearch/',
+                        'http://kojipkgs.fedoraproject.org/pub/fedora/linux/updates/25/$basearch/',
                     ],
                     'install_tree_from': 'Cloud',
                     'subvariant': 'Atomic'