From ac63e46fa7c216cb710ddefbeeabbe93fae5fa01 Mon Sep 17 00:00:00 2001
From: Peter Robinson <pbrobinson@gmail.com>
Date: Wed, 9 Nov 2016 17:37:41 +0000
Subject: [PATCH] initial AltArch setup for final

Signed-off-by: Peter Robinson <pbrobinson@gmail.com>
---
 fedora-arm-final.conf  | 543 +++++++++++++++++++++++++++++++++++
 fedora-final.conf      | 580 +++++++++++++++++++++++++++++++++++++
 fedora-ppc-final.conf  | 548 +++++++++++++++++++++++++++++++++++
 fedora-s390-final.conf | 636 +++++++++++++++++++++++++++++++++++++++++
 release-candidate.sh   |   4 +-
 5 files changed, 2309 insertions(+), 2 deletions(-)
 create mode 100644 fedora-arm-final.conf
 create mode 100644 fedora-final.conf
 create mode 100644 fedora-ppc-final.conf
 create mode 100644 fedora-s390-final.conf

diff --git a/fedora-arm-final.conf b/fedora-arm-final.conf
new file mode 100644
index 0000000..b205e29
--- /dev/null
+++ b/fedora-arm-final.conf
@@ -0,0 +1,543 @@
+# PRODUCT INFO
+release_name = 'Fedora'
+release_short = 'Fedora'
+release_version = '25'
+release_is_layered = False
+
+# GENERAL SETTINGS
+bootable = True
+comps_file = 'comps-f25.xml' #{
+#    'scm': 'git',
+#    'repo': 'https://pagure.io/fedora-comps.git',
+#    'branch': None, # defaults to cvs/HEAD or git/master
+#    'file': 'comps-f25.xml',
+#}
+
+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 = ['aarch64']
+
+# limit tree variants
+# if undefined, all variants from variants.xml will be included
+#tree_variants = ['Server']
+tree_variants = ["Everything", "Server", "Cloud", "CloudImages", "Docker"]
+
+hashed_directories = True
+
+# RUNROOT settings
+runroot = True
+#runroot_channel = 'fedora_compose'
+runroot_channel = 'compose'
+runroot_tag = 'f25-build'
+
+# PKGSET
+pkgset_source = 'koji' # koji, repos
+
+# PKGSET - REPOS
+# pkgset_repos format: {arch: [repo1_url, repo2_url, ...]}
+# pkgset_repos = {}
+
+# PKGSET - KOJI
+pkgset_koji_tag = 'f25-compose'
+pkgset_koji_inherit = True
+
+filter_system_release_packages = False
+
+# GATHER
+gather_source = 'comps'
+gather_method = 'deps'
+check_deps = False
+greedy_method = 'build'
+
+# fomat: [(variant_uid_regex, {arch|*: [repos]})]
+# gather_lookaside_repos = []
+
+# GATHER - JSON
+# format: {variant_uid: {arch: package: [arch1, arch2, None (for any arch)]}}
+#gather_source_mapping = '/path/to/mapping.json'
+
+
+# CREATEREPO
+createrepo_c = True
+createrepo_checksum = 'sha256'
+createrepo_deltas = True
+
+# CHECKSUMS
+media_checksums = ['sha256']
+media_checksum_one_file = True
+media_checksum_base_filename = '%(release_short)s-%(variant)s-%(version)s-1.1-%(arch)s'
+#jigdo
+create_jigdo = False
+
+# BUILDINSTALL
+buildinstall_method = 'lorax'
+
+# Enables macboot on x86_64 for all variants and disables upgrade image building
+# # everywhere.
+lorax_options = [
+  ('^.*$', {
+     'x86_64': {
+         'nomacboot': False
+     }
+     '*': {
+         'noupgrade': True
+     }
+  })
+]
+
+#extra_packages = [
+#    '/mnt/packages/foo*',
+#]
+
+
+# fomat: [(variant_uid_regex, {arch|*: [packages]})]
+additional_packages = [
+    ('.*', {
+        '*': [
+            'kernel.*',
+            'dracut.*',
+            'autocorr-.*',
+            'eclipse-nls-.*',
+            'hunspell-.*',
+            'hyphen-.*',
+            'calligra-l10n-.*',
+            'kde-l10n-.*',
+            'libreoffice-langpack-.*',
+            'man-pages-.*',
+            'mythes-.*',
+        ],
+    }),
+
+    ('^Everything$', {
+        '*': [
+            '*',
+        ],
+    }),
+
+    ('^Server$', {
+        '*': [
+
+        ],
+    }),
+
+    ('^Workstation$', {
+        '*': [
+
+        ],
+    }),
+
+    ('^Cloud$', {
+        '*': [
+
+        ],
+    }),
+
+]
+
+multilib = [
+    ('^Everything$', {
+        'x86_64': ['devel', 'runtime'],
+         's390x': ['devel', 'runtime']
+    })
+]
+
+filter_packages = [
+    ('(Workstation|Server|Cloud)$', {
+        '*': [
+        '^kernel.*debug.*',
+        '^kernel-kdump.*',
+        '^kernel-tools.*',
+        '^syslog-ng.*',
+        '^astronomy-bookmarks',
+        '^generic.*',
+        '^GConf2-dbus.*',
+        '^bluez-gnome',
+        #Periods cause problems in paterns, so replace with *s
+        '^java-1.8.0-openjdk',
+        '^community-mysql.*',
+        '^jruby.*',
+        '^gimp-help-.*',
+        ]
+    }),
+]
+
+
+# format: {arch|*: [packages]}
+multilib_blacklist = {
+    '*': ['kernel', 'kernel-PAE*', 'kernel*debug*',
+        'dmraid-devel', 'kdeutils-devel', 'mkinitrd-devel',
+        'java-1.5.0-gcj-devel', 'java-1.7.0-icedtea-devel',
+        'php-devel', 'java-1.6.0-openjdk-devel',
+        'java-1.7.0-openjdk-devel', 'java-1.8.0-openjdk-devel',
+        'httpd-devel', 'tomcat-native', 'php*', 'httpd',
+        'krb5-server', 'krb5-server-ldap', 'mod_*', 'ghc-*'
+    ],
+}
+
+
+# format: {arch|*: [packages]}
+multilib_whitelist = {
+    '*': ['libgnat', 'wine', 'lmms-vst', 'nspluginwrapper',
+        'libflashsupport', 'valgrind', 'perl-libs', 'redhat-lsb',
+        'yaboot', 'syslinux-extlinux-nonlinux', 'syslinux-nonlinux',
+        'syslinux-tftpboot', 'nosync', '*-static', 'apitrace-libs',
+        'fakeroot-libs'
+    ],
+}
+
+createiso_skip = [
+        ('^Workstation$', {
+            '*': True,
+            'src': True
+        }),
+
+        ('^Server$', {
+            'src': True
+        }),
+
+        ('^Cloud$', {
+            '*': True,
+            'src': True
+        }),
+
+        ('^Everything$', {
+            '*': True,
+            'src': True
+        }),
+
+    ]
+
+# fomat: [(variant_uid_regex, {arch|*: [scm_dicts]})]
+#extra_files = [
+#    ('^(Server|Workstation|Cloud)$', {
+#        '*': [
+#            {
+#                'scm': 'rpm',
+#                'repo': 'fedora-release-%(variant_id_lower)s',
+#                'branch': None,
+#                'file': [
+#                    '/etc/pki/rpm-gpg/RPM-GPG-KEY-fedora-release',
+#                ],
+#                'target': '',
+#            },
+#        ],
+#    }),
+#]
+
+# Image name respecting Fedora's image naming policy
+image_name_format = '%(release_short)s-%(variant)s-%(disc_type)s-%(arch)s-%(version)s-1.1.iso'
+# # Use the same format for volume id
+image_volid_formats = [
+     '%(release_short)s-%(variant)s-%(disc_type)s-%(arch)s-%(version)s'
+     ]
+# No special handling for layered products, use same format as for regular images
+image_volid_layered_product_formats = []
+# Replace 'Cloud' with 'C' in volume id etc.
+volume_id_substitutions = {
+        'Rawhide': 'rawh',
+         'Images': 'img',
+    'MATE_Compiz': 'MATE',
+       'Security': 'Sec',
+ 'Electronic_Lab': 'Elec',
+       'Robotics': 'Robo',
+ 'Scientific_KDE': 'SciK',
+  'Astronomy_KDE': 'AstK',
+   'Design_suite': 'Dsgn',
+          'Games': 'Game',
+        'Jam_KDE': 'Jam',
+    'Workstation': 'WS',
+     'Everything': 'E',
+         'Server': 'S',
+          'Cloud': 'C',
+          'Alpha': 'A',
+           'Beta': 'B',
+             'TC': 'T',
+}
+
+disc_types = {
+    'boot': 'netinst',
+    'live': 'Live',
+}
+
+translate_paths = [
+   ('/mnt/koji/compose/', 'http://armpkgs.fedoraproject.org/compose/'),
+]
+
+
+# These will be inherited by live_media, live_images and image_build
+global_ksurl = 'git+https://pagure.io/fedora-kickstarts.git?#origin/f25'
+global_release = '1.1'
+global_version = '25'
+# live_images ignores this in favor of live_target
+global_target = 'f25'
+
+image_build = {
+    '^Docker$': [
+        {
+            'image-build': {
+                    'format': [('docker', 'tar.xz')]
+                    'name': 'Fedora-Docker-Base',
+                    'kickstart': 'fedora-docker-base-arm.ks',
+                    'failable': ['*'],
+                    'distro': 'Fedora-22',
+                    'disk_size': 3,
+                    'arches': ['aarch64'],
+                    'repo_from': 'Cloud',
+                    'install_tree_from': 'Cloud',
+                    'subvariant': 'Docker_Base'
+                    }
+        }
+        ],
+    '^CloudImages$': [
+        {
+            'image-build': {
+                    'format': [('qcow2','qcow2'), ('raw-xz','raw.xz')]
+                    'name': 'Fedora-Cloud-Base',
+                    'kickstart': 'fedora-cloud-base-arm.ks',
+                    'failable': ['*'],
+                    'distro': 'Fedora-22',
+                    'disk_size': 3,
+                    'arches': ['aarch64'],
+                    'repo_from': 'Cloud',
+                    'install_tree_from': 'Cloud',
+                    'subvariant': 'Cloud_Base'
+                     }
+        },
+        {
+            'image-build': {
+                    'format': [('vagrant-libvirt','vagrant-libvirt.box'), ('vagrant-virtualbox','vagrant-virtualbox.box')]
+                    'name': 'Fedora-Cloud-Base-Vagrant',
+                    'kickstart': 'fedora-cloud-base-vagrant.ks',
+                    'failable': ['*'],
+                    'distro': 'Fedora-22',
+                    'disk_size': 40,
+                    'arches': ['x86_64'],
+                    'repo_from': 'Cloud',
+                    'install_tree_from': 'Cloud',
+                    'subvariant': 'Cloud_Base',
+                    'ova-option': 'vagrant_sync_directory=/home/vagrant/sync'
+                     }
+        }
+        ],
+}
+
+live_media = {
+    '^Workstation$': [
+            {
+                'name': 'Fedora-Workstation-Live',
+                'kickstart': 'fedora-live-workstation.ks',
+                'arches': ['x86_64', 'i386'],
+                'repo_from': 'Everything',
+                'subvariant': 'Workstation'
+
+            }
+        ],
+    '^Spins': [
+            {
+                'name': 'Fedora-KDE-Live',
+                'kickstart': 'fedora-live-kde.ks',
+                'arches': ['x86_64', 'i386'],
+                'repo_from': 'Everything',
+                'install_tree_from': 'Everything',
+                'subvariant': 'KDE'
+
+            },
+            {
+                'name': 'Fedora-Xfce-Live',
+                'kickstart': 'fedora-live-xfce.ks',
+                'arches': ['x86_64', 'i386'],
+                'failable': ['*'],
+                'repo_from': 'Everything',
+                'install_tree_from': 'Everything',
+                'subvariant': 'Xfce'
+            },
+            {
+                'name': 'Fedora-SoaS-Live',
+                'kickstart': 'fedora-live-soas.ks',
+                'arches': ['x86_64', 'i386'],
+                'failable': ['*'],
+                'repo_from': 'Everything',
+                'install_tree_from': 'Everything',
+                'subvariant': 'SoaS'
+            },
+            {
+                'name': 'Fedora-Cinnamon-Live',
+                'kickstart': 'fedora-live-cinnamon.ks',
+                'arches': ['x86_64', 'i386'],
+                'failable': ['*'],
+                'repo_from': 'Everything',
+                'install_tree_from': 'Everything',
+                'subvariant': 'Cinnamon'
+            },
+            {
+                'name': 'Fedora-LXDE-Live',
+                'kickstart': 'fedora-live-lxde.ks',
+                'arches': ['x86_64', 'i386'],
+                'failable': ['*'],
+                'repo_from': 'Everything',
+                'install_tree_from': 'Everything',
+                'subvariant': 'LXDE'
+            },
+            {
+                'name': 'Fedora-MATE_Compiz-Live',
+                'kickstart': 'fedora-live-mate_compiz.ks',
+                'arches': ['x86_64', 'i386'],
+                'failable': ['*'],
+                'repo_from': 'Everything',
+                'install_tree_from': 'Everything',
+                'subvariant': 'Mate'
+            }
+        ],
+    '^Labs$': [
+            {
+                'name': 'Fedora-Astronomy_KDE-Live',
+                'kickstart': 'fedora-live-astronomy_kde.ks',
+                'arches': ['x86_64', 'i386'],
+                'failable': ['*'],
+                'repo_from': 'Everything',
+                'install_tree_from': 'Everything',
+                'subvariant': 'Astronomy_KDE'
+            },
+            {
+                'name': 'Fedora-Design_suite-Live',
+                'kickstart': 'fedora-live-design_suite.ks',
+                'arches': ['x86_64', 'i386'],
+                'failable': ['*'],
+                'repo_from': 'Everything',
+                'install_tree_from': 'Everything',
+                'subvariant': 'Design_suite'
+            },
+            {
+                'name': 'Fedora-Scientific_KDE-Live',
+                'kickstart': 'fedora-live-scientific_kde.ks',
+                'arches': ['x86_64', 'i386'],
+                'failable': ['*'],
+                'repo_from': 'Everything',
+                'install_tree_from': 'Everything',
+                'subvariant': 'Scientific_KDE'
+            },
+            {
+                'name': 'Fedora-Games-Live',
+                'kickstart': 'fedora-live-games.ks',
+                'arches': ['x86_64', 'i386'],
+                'failable': ['*'],
+                'repo_from': 'Everything',
+                'install_tree_from': 'Everything',
+                'subvariant': 'Games'
+            },
+            {
+                'name': 'Fedora-Security-Live',
+                'kickstart': 'fedora-live-security.ks',
+                'arches': ['x86_64', 'i386'],
+                'failable': ['*'],
+                'repo_from': 'Everything',
+                'install_tree_from': 'Everything',
+                'subvariant': 'Security'
+            },
+            {
+                'name': 'Fedora-Jam_KDE-Live',
+                'kickstart': 'fedora-live-jam_kde.ks',
+                'arches': ['x86_64', 'i386'],
+                'failable': ['*'],
+                'repo_from': 'Everything',
+                'install_tree_from': 'Everything',
+                'subvariant': 'Jam_KDE'
+            },
+            {
+                'name': 'Fedora-Robotics-Live',
+                'kickstart': 'fedora-live-robotics.ks',
+                'arches': ['x86_64', 'i386'],
+                'failable': ['*'],
+                'repo_from': 'Everything',
+                'install_tree_from': 'Everything',
+                'subvariant': 'Robotics'
+            }
+    ],
+}
+
+failable_deliverables = [
+    ('^.*$', {
+        # Buildinstall can fail on any variant and any arch
+        '*': ['buildinstall', 'iso', 'image-build', 'live-media', 'live', 'ostree', 'ostree-installer'],
+        'src': ['buildinstall'],
+        # Nothing on i386 blocks the compose
+        'i386': ['buildinstall', 'iso', 'live'],
+    })
+]
+
+live_target = 'f25'
+live_images_no_rename = True
+# fomat: [(variant_uid_regex, {arch|*: scm_dict})]
+live_images = [
+    ('^Workstation$', {
+        'armhfp': {
+                'kickstart': 'fedora-arm-workstation.ks',
+                'name': 'Fedora-Workstation-armhfp',
+                'type': 'appliance',
+                'failable': True,
+                }
+    }),
+    ('^Server$', {
+        'armhfp': {
+                'kickstart': 'fedora-arm-server.ks',
+                'name': 'Fedora-Server-armhfp',
+                'type': 'appliance',
+                'failable': True,
+                }
+    }),
+    ('^Spins$', {
+        'armhfp': [{
+                'kickstart': 'fedora-arm-kde.ks',
+                'name': 'Fedora-KDE-armhfp',
+                'repo_from': 'Everything',
+                'type': 'appliance',
+                'subvariant': 'KDE',
+                'failable': True,
+                },
+                {
+                'kickstart': 'fedora-arm-lxde.ks',
+                'name': 'Fedora-LXDE-armhfp',
+                'repo_from': 'Everything',
+                'type': 'appliance',
+                'subvariant': 'LXDE',
+                'failable': True,
+                },
+                {
+                'kickstart': 'fedora-arm-mate.ks',
+                'name': 'Fedora-Mate-armhfp',
+                'repo_from': 'Everything',
+                'type': 'appliance',
+                'subvariant': 'Mate',
+                'failable': True,
+                },
+                {
+                'kickstart': 'fedora-arm-minimal.ks',
+                'name': 'Fedora-Minimal-armhfp',
+                'repo_from': 'Everything',
+                'type': 'appliance',
+                'subvariant': 'Minimal',
+                'failable': False,
+                },
+                {
+                'kickstart': 'fedora-arm-soas.ks',
+                'name': 'Fedora-SoaS-armhfp',
+                'repo_from': 'Everything',
+                'type': 'appliance',
+                'subvariant': 'SoaS',
+                'failable': True,
+                },
+                {
+                'kickstart': 'fedora-arm-xfce.ks',
+                'name': 'Fedora-Xfce-armhfp',
+                'repo_from': 'Everything',
+                'type': 'appliance',
+                'subvariant': 'Xfce',
+                'failable': True,
+                },]
+    }),
+]
+
+koji_profile = 'koji'
diff --git a/fedora-final.conf b/fedora-final.conf
new file mode 100644
index 0000000..d81654c
--- /dev/null
+++ b/fedora-final.conf
@@ -0,0 +1,580 @@
+# PRODUCT INFO
+release_name = 'Fedora'
+release_short = 'Fedora'
+release_version = '25'
+release_is_layered = False
+
+# GENERAL SETTINGS
+bootable = True
+comps_file = 'comps-f25.xml' #{
+#    'scm': 'git',
+#    'repo': 'https://pagure.io/fedora-comps.git',
+#    'branch': None, # defaults to cvs/HEAD or git/master
+#    'file': 'comps-f23.xml',
+#}
+
+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']
+
+# limit tree variants
+# if undefined, all variants from variants.xml will be included
+#tree_variants = ['Server']
+
+
+hashed_directories = True
+
+# RUNROOT settings
+runroot = True
+#runroot_channel = 'fedora_compose'
+runroot_channel = 'compose'
+runroot_tag = 'f25-build'
+
+# PKGSET
+pkgset_source = 'koji' # koji, repos
+
+# PKGSET - REPOS
+# pkgset_repos format: {arch: [repo1_url, repo2_url, ...]}
+# pkgset_repos = {}
+
+# PKGSET - KOJI
+pkgset_koji_tag = 'f25-compose'
+pkgset_koji_inherit = True
+
+filter_system_release_packages = False
+
+# GATHER
+gather_source = 'comps'
+gather_method = 'deps'
+check_deps = False
+greedy_method = 'build'
+
+# fomat: [(variant_uid_regex, {arch|*: [repos]})]
+# gather_lookaside_repos = []
+
+# GATHER - JSON
+# format: {variant_uid: {arch: package: [arch1, arch2, None (for any arch)]}}
+#gather_source_mapping = '/path/to/mapping.json'
+
+
+# CREATEREPO
+createrepo_c = True
+createrepo_checksum = 'sha256'
+createrepo_deltas = True
+
+# CHECKSUMS
+media_checksums = ['sha256']
+media_checksum_one_file = True
+media_checksum_base_filename = '%(release_short)s-%(variant)s-%(version)s-1.1-%(arch)s'
+#jigdo
+create_jigdo = False
+
+# BUILDINSTALL
+buildinstall_method = 'lorax'
+
+# Enables macboot on x86_64 for all variants and disables upgrade image building
+# # everywhere.
+lorax_options = [
+  ('^.*$', {
+     'x86_64': {
+         'nomacboot': False
+     }
+     '*': {
+         'noupgrade': True
+     }
+  })
+]
+
+#extra_packages = [
+#    '/mnt/packages/foo*',
+#]
+
+
+# fomat: [(variant_uid_regex, {arch|*: [packages]})]
+additional_packages = [
+    ('.*', {
+        '*': [
+            'kernel.*',
+            'dracut.*',
+            'autocorr-.*',
+            'eclipse-nls-.*',
+            'hunspell-.*',
+            'hyphen-.*',
+            'calligra-l10n-.*',
+            'kde-l10n-.*',
+            'libreoffice-langpack-.*',
+            'man-pages-.*',
+            'mythes-.*',
+        ],
+    }),
+
+    ('^Everything$', {
+        '*': [
+            '*',
+        ],
+    }),
+
+    ('^Server$', {
+        '*': [
+
+        ],
+    }),
+
+    ('^Workstation$', {
+        '*': [
+
+        ],
+    }),
+
+    ('^Cloud$', {
+        '*': [
+
+        ],
+    }),
+
+]
+
+multilib = [
+    ('^Everything$', {
+        'x86_64': ['devel', 'runtime'],
+         's390x': ['devel', 'runtime']
+    })
+]
+
+filter_packages = [
+    ('(Workstation|Server|Cloud)$', {
+        '*': [
+        '^kernel.*debug.*',
+        '^kernel-kdump.*',
+        '^kernel-tools.*',
+        '^syslog-ng.*',
+        '^astronomy-bookmarks',
+        '^generic.*',
+        '^GConf2-dbus.*',
+        '^bluez-gnome',
+        #Periods cause problems in paterns, so replace with *s
+        '^java-1.8.0-openjdk',
+        '^community-mysql.*',
+        '^jruby.*',
+        '^gimp-help-.*',
+        ]
+    }),
+]
+
+
+# format: {arch|*: [packages]}
+multilib_blacklist = {
+    '*': ['kernel', 'kernel-PAE*', 'kernel*debug*',
+        'dmraid-devel', 'kdeutils-devel', 'mkinitrd-devel',
+        'java-1.5.0-gcj-devel', 'java-1.7.0-icedtea-devel',
+        'php-devel', 'java-1.6.0-openjdk-devel',
+        'java-1.7.0-openjdk-devel', 'java-1.8.0-openjdk-devel',
+        'httpd-devel', 'tomcat-native', 'php*', 'httpd',
+        'krb5-server', 'krb5-server-ldap', 'mod_*', 'ghc-*'
+    ],
+}
+
+
+# format: {arch|*: [packages]}
+multilib_whitelist = {
+    '*': ['libgnat', 'wine', 'lmms-vst', 'nspluginwrapper',
+        'libflashsupport', 'valgrind', 'perl-libs', 'redhat-lsb',
+        'yaboot', 'syslinux-extlinux-nonlinux', 'syslinux-nonlinux',
+        'syslinux-tftpboot', 'nosync', '*-static', 'apitrace-libs',
+        'fakeroot-libs'
+    ],
+}
+
+createiso_skip = [
+        ('^Workstation$', {
+            '*': True,
+            'src': True
+        }),
+
+        ('^Server$', {
+            'src': True
+        }),
+
+        ('^Cloud$', {
+            '*': True,
+            'src': True
+        }),
+
+        ('^Everything$', {
+            '*': True,
+            'src': True
+        }),
+
+    ]
+
+# fomat: [(variant_uid_regex, {arch|*: [scm_dicts]})]
+#extra_files = [
+#    ('^(Server|Workstation|Cloud)$', {
+#        '*': [
+#            {
+#                'scm': 'rpm',
+#                'repo': 'fedora-release-%(variant_id_lower)s',
+#                'branch': None,
+#                'file': [
+#                    '/etc/pki/rpm-gpg/RPM-GPG-KEY-fedora-release',
+#                ],
+#                'target': '',
+#            },
+#        ],
+#    }),
+#]
+
+# Image name respecting Fedora's image naming policy
+image_name_format = '%(release_short)s-%(variant)s-%(disc_type)s-%(arch)s-%(version)s-1.1.iso'
+# # Use the same format for volume id
+image_volid_formats = [
+     '%(release_short)s-%(variant)s-%(disc_type)s-%(arch)s-%(version)s'
+     ]
+# No special handling for layered products, use same format as for regular images
+image_volid_layered_product_formats = []
+# Replace 'Cloud' with 'C' in volume id etc.
+volume_id_substitutions = {
+        'Rawhide': 'rawh',
+         'Images': 'img',
+    'MATE_Compiz': 'MATE',
+       'Security': 'Sec',
+ 'Electronic_Lab': 'Elec',
+       'Robotics': 'Robo',
+ 'Scientific_KDE': 'SciK',
+  'Astronomy_KDE': 'AstK',
+   'Design_suite': 'Dsgn',
+          'Games': 'Game',
+        'Jam_KDE': 'Jam',
+    'Workstation': 'WS',
+     'Everything': 'E',
+         'Server': 'S',
+          'Cloud': 'C',
+          'Alpha': 'A',
+           'Beta': 'B',
+             'TC': 'T',
+}
+
+disc_types = {
+    'boot': 'netinst',
+    'live': 'Live',
+}
+
+translate_paths = [
+   ('/mnt/koji/compose/', 'http://kojipkgs.fedoraproject.org/compose/'),
+]
+
+
+# These will be inherited by live_media, live_images and image_build
+global_ksurl = 'git+https://pagure.io/fedora-kickstarts.git?#origin/f25'
+global_release = "1.1"
+global_version = '25'
+# live_images ignores this in favor of live_target
+global_target = 'f25'
+
+image_build = {
+    '^Docker$': [
+        {
+            'image-build': {
+                    'format': [('docker', 'tar.xz')]
+                    'name': 'Fedora-Docker-Base',
+                    'kickstart': 'fedora-docker-base.ks',
+                    'failable': ['*'],
+                    'distro': 'Fedora-22',
+                    'disk_size': 3,
+                    'arches': ['x86_64', 'armhfp'],
+                    'repo_from': 'Cloud',
+                    'install_tree_from': 'Cloud',
+                    'subvariant': 'Docker_Base'
+                    }
+        }
+        ],
+    '^CloudImages$': [
+        {
+            'image-build': {
+                    'format': [('qcow2','qcow2'), ('raw-xz','raw.xz')]
+                    'name': 'Fedora-Cloud-Base',
+                    'kickstart': 'fedora-cloud-base.ks',
+                    'failable': ['*'],
+                    'distro': 'Fedora-22',
+                    'disk_size': 3,
+                    'arches': ['x86_64'],
+                    'repo_from': 'Cloud',
+                    'install_tree_from': 'Cloud',
+                    'subvariant': 'Cloud_Base'
+                     }
+        },
+        {
+            'image-build': {
+                    'format': [('vagrant-libvirt','vagrant-libvirt.box'), ('vagrant-virtualbox','vagrant-virtualbox.box')]
+                    'name': 'Fedora-Cloud-Base-Vagrant',
+                    'kickstart': 'fedora-cloud-base-vagrant.ks',
+                    'failable': ['*'],
+                    'distro': 'Fedora-22',
+                    'disk_size': 40,
+                    'arches': ['x86_64'],
+                    'repo_from': 'Cloud',
+                    'install_tree_from': 'Cloud',
+                    'subvariant': 'Cloud_Base',
+                    'ova-option': 'vagrant_sync_directory=/home/vagrant/sync'
+                     }
+        }
+        ],
+}
+
+live_media = {
+    '^Workstation$': [
+            {
+                'name': 'Fedora-Workstation-Live',
+                'kickstart': 'fedora-live-workstation.ks',
+                'arches': ['x86_64', 'i386'],
+                'repo_from': 'Everything',
+                'subvariant': 'Workstation'
+
+            }
+        ],
+    '^Spins': [
+            {
+                'name': 'Fedora-KDE-Live',
+                'kickstart': 'fedora-live-kde.ks',
+                'arches': ['x86_64', 'i386'],
+                'repo_from': 'Everything',
+                'install_tree_from': 'Everything',
+                'subvariant': 'KDE'
+
+            },
+            {
+                'name': 'Fedora-Xfce-Live',
+                'kickstart': 'fedora-live-xfce.ks',
+                'arches': ['x86_64', 'i386'],
+                'failable': ['*'],
+                'repo_from': 'Everything',
+                'install_tree_from': 'Everything',
+                'subvariant': 'Xfce'
+            },
+            {
+                'name': 'Fedora-SoaS-Live',
+                'kickstart': 'fedora-live-soas.ks',
+                'arches': ['x86_64', 'i386'],
+                'failable': ['*'],
+                'repo_from': 'Everything',
+                'install_tree_from': 'Everything',
+                'subvariant': 'SoaS'
+            },
+            {
+                'name': 'Fedora-Cinnamon-Live',
+                'kickstart': 'fedora-live-cinnamon.ks',
+                'arches': ['x86_64', 'i386'],
+                'failable': ['*'],
+                'repo_from': 'Everything',
+                'install_tree_from': 'Everything',
+                'subvariant': 'Cinnamon'
+            },
+            {
+                'name': 'Fedora-LXDE-Live',
+                'kickstart': 'fedora-live-lxde.ks',
+                'arches': ['x86_64', 'i386'],
+                'failable': ['*'],
+                'repo_from': 'Everything',
+                'install_tree_from': 'Everything',
+                'subvariant': 'LXDE'
+            },
+            {
+                'name': 'Fedora-MATE_Compiz-Live',
+                'kickstart': 'fedora-live-mate_compiz.ks',
+                'arches': ['x86_64', 'i386'],
+                'failable': ['*'],
+                'repo_from': 'Everything',
+                'install_tree_from': 'Everything',
+                'subvariant': 'Mate'
+            }
+        ],
+    '^Labs$': [
+            {
+                'name': 'Fedora-Astronomy_KDE-Live',
+                'kickstart': 'fedora-live-astronomy_kde.ks',
+                'arches': ['x86_64', 'i386'],
+                'failable': ['*'],
+                'repo_from': 'Everything',
+                'install_tree_from': 'Everything',
+                'subvariant': 'Astronomy_KDE'
+            },
+            {
+                'name': 'Fedora-Design_suite-Live',
+                'kickstart': 'fedora-live-design_suite.ks',
+                'arches': ['x86_64', 'i386'],
+                'failable': ['*'],
+                'repo_from': 'Everything',
+                'install_tree_from': 'Everything',
+                'subvariant': 'Design_suite'
+            },
+            {
+                'name': 'Fedora-Scientific_KDE-Live',
+                'kickstart': 'fedora-live-scientific_kde.ks',
+                'arches': ['x86_64', 'i386'],
+                'failable': ['*'],
+                'repo_from': 'Everything',
+                'install_tree_from': 'Everything',
+                'subvariant': 'Scientific_KDE'
+            },
+            {
+                'name': 'Fedora-Games-Live',
+                'kickstart': 'fedora-live-games.ks',
+                'arches': ['x86_64', 'i386'],
+                'failable': ['*'],
+                'repo_from': 'Everything',
+                'install_tree_from': 'Everything',
+                'subvariant': 'Games'
+            },
+            {
+                'name': 'Fedora-Security-Live',
+                'kickstart': 'fedora-live-security.ks',
+                'arches': ['x86_64', 'i386'],
+                'failable': ['*'],
+                'repo_from': 'Everything',
+                'install_tree_from': 'Everything',
+                'subvariant': 'Security'
+            },
+            {
+                'name': 'Fedora-Jam_KDE-Live',
+                'kickstart': 'fedora-live-jam_kde.ks',
+                'arches': ['x86_64', 'i386'],
+                'failable': ['*'],
+                'repo_from': 'Everything',
+                'install_tree_from': 'Everything',
+                'subvariant': 'Jam_KDE'
+            },
+            {
+                'name': 'Fedora-Robotics-Live',
+                'kickstart': 'fedora-live-robotics.ks',
+                'arches': ['x86_64', 'i386'],
+                'failable': ['*'],
+                'repo_from': 'Everything',
+                'install_tree_from': 'Everything',
+                'subvariant': 'Robotics'
+            }
+    ],
+}
+
+failable_deliverables = [
+    ('^.*$', {
+        # Buildinstall can fail on any variant and any arch
+        '*': ['buildinstall', 'iso', 'image-build', 'live-media', 'live', 'ostree', 'ostree-installer'],
+        'src': ['buildinstall'],
+        # Nothing on i386 blocks the compose
+        'i386': ['buildinstall', 'iso', 'live'],
+    })
+]
+
+live_target = 'f25'
+live_images_no_rename = True
+# fomat: [(variant_uid_regex, {arch|*: scm_dict})]
+live_images = [
+    ('^Workstation$', {
+        'armhfp': {
+                'kickstart': 'fedora-arm-workstation.ks',
+                'name': 'Fedora-Workstation-armhfp',
+                'type': 'appliance',
+                'failable': True,
+                }
+    }),
+    ('^Server$', {
+        'armhfp': {
+                'kickstart': 'fedora-arm-server.ks',
+                'name': 'Fedora-Server-armhfp',
+                'type': 'appliance',
+                'failable': True,
+                }
+    }),
+    ('^Spins$', {
+        'armhfp': [{
+                'kickstart': 'fedora-arm-kde.ks',
+                'name': 'Fedora-KDE-armhfp',
+                'repo_from': 'Everything',
+                'type': 'appliance',
+                'subvariant': 'KDE',
+                'failable': True,
+                },
+                {
+                'kickstart': 'fedora-arm-lxde.ks',
+                'name': 'Fedora-LXDE-armhfp',
+                'repo_from': 'Everything',
+                'type': 'appliance',
+                'subvariant': 'LXDE',
+                'failable': True,
+                },
+                {
+                'kickstart': 'fedora-arm-mate.ks',
+                'name': 'Fedora-Mate-armhfp',
+                'repo_from': 'Everything',
+                'type': 'appliance',
+                'subvariant': 'Mate',
+                'failable': True,
+                },
+                {
+                'kickstart': 'fedora-arm-minimal.ks',
+                'name': 'Fedora-Minimal-armhfp',
+                'repo_from': 'Everything',
+                'type': 'appliance',
+                'subvariant': 'Minimal',
+                'failable': False,
+                },
+                {
+                'kickstart': 'fedora-arm-soas.ks',
+                'name': 'Fedora-SoaS-armhfp',
+                'repo_from': 'Everything',
+                'type': 'appliance',
+                'subvariant': 'SoaS',
+                'failable': True,
+                },
+                {
+                'kickstart': 'fedora-arm-xfce.ks',
+                'name': 'Fedora-Xfce-armhfp',
+                'repo_from': 'Everything',
+                'type': 'appliance',
+                'subvariant': 'Xfce',
+                'failable': True,
+                },]
+    }),
+]
+
+ostree = [
+    ("^ostree$", {
+        "x86_64": {
+            "treefile": "fedora-ostree-workstation.json",
+            "config_url": "https://pagure.io/workstation-ostree-config.git",
+            "config_branch": "f25",
+            "source_repo_from": "Workstation",
+            "ostree_repo": "/mnt/koji/compose/ostree/25/",
+            'failable': ['*'],
+        }
+    })
+]
+ostree_installer = [
+    ("^Workstation$", {
+        "x86_64": {
+            "source_repo_from": "Everything",
+            "release": None,
+            "installpkgs": ["fedora-productimg-workstation"],
+            "add_template": ["workstation-ostree-installer/lorax-configure-repo.tmpl"],
+            "add_template_var": [
+                "ostree_osname=fedora-workstation",
+                "ostree_ref=fedora/25/x86_64/workstation",
+            ],
+            "add_arch_template": ["workstation-ostree-installer/lorax-embed-repo.tmpl"],
+            "add_arch_template_var": [
+                "ostree_repo=https://kojipkgs.fedoraproject.org/compose/ostree/25/",
+                "ostree_osname=fedora-workstation",
+                "ostree_ref=fedora/25/x86_64/workstation",
+            ]
+            'template_repo': 'https://pagure.io/fedora-lorax-templates.git',
+            'template_branch': 'f25',
+            'failable': ['*'],
+        }
+    })
+]
+
+
+koji_profile = 'koji'
diff --git a/fedora-ppc-final.conf b/fedora-ppc-final.conf
new file mode 100644
index 0000000..7fbb8fd
--- /dev/null
+++ b/fedora-ppc-final.conf
@@ -0,0 +1,548 @@
+# PRODUCT INFO
+release_name = 'Fedora'
+release_short = 'Fedora'
+release_version = '25'
+release_is_layered = False
+
+# GENERAL SETTINGS
+bootable = True
+comps_file = 'comps-f25.xml' #{
+#    'scm': 'git',
+#    'repo': 'https://pagure.io/fedora-comps.git',
+#    'branch': None, # defaults to cvs/HEAD or git/master
+#    'file': 'comps-f25.xml',
+#}
+
+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 = ['ppc64', 'ppc64le']
+
+# limit tree variants
+# if undefined, all variants from variants.xml will be included
+#tree_variants = ['Server']
+tree_variants = ["Everything", "Server", "Cloud", "CloudImages", "Docker"]
+
+hashed_directories = True
+
+# RUNROOT settings
+runroot = True
+runroot_channel = 'compose'
+runroot_tag = 'f25-build'
+
+# PKGSET
+pkgset_source = 'koji' # koji, repos
+
+# PKGSET - REPOS
+# pkgset_repos format: {arch: [repo1_url, repo2_url, ...]}
+# pkgset_repos = {}
+
+# PKGSET - KOJI
+pkgset_koji_tag = 'f25-compose'
+pkgset_koji_inherit = True
+
+filter_system_release_packages = False
+
+# GATHER
+gather_source = 'comps'
+gather_method = 'deps'
+check_deps = False
+greedy_method = 'build'
+
+# fomat: [(variant_uid_regex, {arch|*: [repos]})]
+# gather_lookaside_repos = []
+
+# GATHER - JSON
+# format: {variant_uid: {arch: package: [arch1, arch2, None (for any arch)]}}
+#gather_source_mapping = '/path/to/mapping.json'
+
+
+# CREATEREPO
+createrepo_c = True
+createrepo_checksum = 'sha256'
+createrepo_deltas = True
+
+# CHECKSUMS
+media_checksums = ['sha256']
+media_checksum_one_file = True
+media_checksum_base_filename = '%(release_short)s-%(variant)s-%(version)s-1.1-%(arch)s'
+#jigdo
+create_jigdo = False
+
+# BUILDINSTALL
+buildinstall_method = 'lorax'
+
+# Enables macboot on x86_64 for all variants and disables upgrade image building
+# # everywhere.
+lorax_options = [
+  ('^.*$', {
+     'x86_64': {
+         'nomacboot': False
+     }
+     '*': {
+         'noupgrade': True
+     }
+  })
+]
+
+#extra_packages = [
+#    '/mnt/packages/foo*',
+#]
+
+
+# fomat: [(variant_uid_regex, {arch|*: [packages]})]
+additional_packages = [
+    ('.*', {
+        '*': [
+            'kernel.*',
+            'dracut.*',
+            'autocorr-.*',
+            'eclipse-nls-.*',
+            'hunspell-.*',
+            'hyphen-.*',
+            'calligra-l10n-.*',
+            'kde-l10n-.*',
+            'libreoffice-langpack-.*',
+            'man-pages-.*',
+            'mythes-.*',
+        ],
+    }),
+
+    ('^Everything$', {
+        '*': [
+            '*',
+        ],
+    }),
+
+    ('^Server$', {
+        '*': [
+
+        ],
+    }),
+
+    ('^Workstation$', {
+        '*': [
+
+        ],
+    }),
+
+    ('^Cloud$', {
+        '*': [
+
+        ],
+    }),
+
+]
+
+multilib = [
+    ('^Everything$', {
+        'x86_64': ['devel', 'runtime'],
+         's390x': ['devel', 'runtime']
+    })
+]
+
+filter_packages = [
+    ('(Workstation|Server|Cloud)$', {
+        '*': [
+        '^kernel.*debug.*',
+        '^kernel-kdump.*',
+        '^kernel-tools.*',
+        '^syslog-ng.*',
+        '^astronomy-bookmarks',
+        '^generic.*',
+        '^GConf2-dbus.*',
+        '^bluez-gnome',
+        #Periods cause problems in paterns, so replace with *s
+        '^java-1.8.0-openjdk',
+        '^community-mysql.*',
+        '^jruby.*',
+        '^gimp-help-.*',
+        ]
+    }),
+]
+
+
+# format: {arch|*: [packages]}
+multilib_blacklist = {
+    '*': ['kernel', 'kernel-PAE*', 'kernel*debug*',
+        'dmraid-devel', 'kdeutils-devel', 'mkinitrd-devel',
+        'java-1.5.0-gcj-devel', 'java-1.7.0-icedtea-devel',
+        'php-devel', 'java-1.6.0-openjdk-devel',
+        'java-1.7.0-openjdk-devel', 'java-1.8.0-openjdk-devel',
+        'httpd-devel', 'tomcat-native', 'php*', 'httpd',
+        'krb5-server', 'krb5-server-ldap', 'mod_*', 'ghc-*'
+    ],
+}
+
+
+# format: {arch|*: [packages]}
+multilib_whitelist = {
+    '*': ['libgnat', 'wine', 'lmms-vst', 'nspluginwrapper',
+        'libflashsupport', 'valgrind', 'perl-libs', 'redhat-lsb',
+        'yaboot', 'syslinux-extlinux-nonlinux', 'syslinux-nonlinux',
+        'syslinux-tftpboot', 'nosync', '*-static', 'apitrace-libs',
+        'fakeroot-libs'
+    ],
+}
+
+createiso_skip = [
+        ('^Workstation$', {
+            '*': True,
+            'src': True
+        }),
+
+        ('^Server$', {
+            'src': True
+        }),
+
+        ('^Cloud$', {
+            '*': True,
+            'src': True
+        }),
+
+        ('^Everything$', {
+            '*': True,
+            'src': True
+        }),
+
+    ]
+
+# fomat: [(variant_uid_regex, {arch|*: [scm_dicts]})]
+#extra_files = [
+#    ('^(Server|Workstation|Cloud)$', {
+#        '*': [
+#            {
+#                'scm': 'rpm',
+#                'repo': 'fedora-release-%(variant_id_lower)s',
+#                'branch': None,
+#                'file': [
+#                    '/etc/pki/rpm-gpg/RPM-GPG-KEY-fedora-release',
+#                ],
+#                'target': '',
+#            },
+#        ],
+#    }),
+#]
+
+# Image name respecting Fedora's image naming policy
+image_name_format = '%(release_short)s-%(variant)s-%(disc_type)s-%(arch)s-%(version)s-1.1.iso'
+# # Use the same format for volume id
+image_volid_formats = [
+     '%(release_short)s-%(variant)s-%(disc_type)s-%(arch)s-%(version)s'
+     ]
+# No special handling for layered products, use same format as for regular images
+image_volid_layered_product_formats = []
+# Replace 'Cloud' with 'C' in volume id etc.
+volume_id_substitutions = {
+        'Rawhide': 'rawh',
+         'Images': 'img',
+    'MATE_Compiz': 'MATE',
+       'Security': 'Sec',
+ 'Electronic_Lab': 'Elec',
+       'Robotics': 'Robo',
+ 'Scientific_KDE': 'SciK',
+  'Astronomy_KDE': 'AstK',
+   'Design_suite': 'Dsgn',
+          'Games': 'Game',
+        'Jam_KDE': 'Jam',
+    'Workstation': 'WS',
+     'Everything': 'E',
+         'Server': 'S',
+          'Cloud': 'C',
+          'Alpha': 'A',
+           'Beta': 'B',
+             'TC': 'T',
+}
+
+disc_types = {
+    'boot': 'netinst',
+    'live': 'Live',
+}
+
+translate_paths = [
+   ('/mnt/koji/compose/', 'http://ppcpkgs.fedoraproject.org/compose/'),
+]
+
+
+# These will be inherited by live_media, live_images and image_build
+global_ksurl = 'git+https://pagure.io/fedora-kickstarts.git?#origin/f25'
+global_release = '1.1'
+global_version = '25'
+# live_images ignores this in favor of live_target
+global_target = 'f25'
+
+image_build = {
+    '^Docker$': [
+        {
+            'image-build': {
+                    'format': [('docker', 'tar.xz')]
+                    'name': 'Fedora-Docker-Base',
+                    'kickstart': 'fedora-docker-base-ppc.ks',
+                    'failable': ['*'],
+                    'distro': 'Fedora-22',
+                    'disk_size': 3,
+                    'arches': ['ppc64','ppc64le'],
+                    'repo_from': 'Cloud',
+                    'install_tree_from': 'Cloud',
+                    'subvariant': 'Docker_Base'
+                    }
+            'factory-parameters': {
+                    'generate_icicle': 'false'
+                    }
+        }
+        ],
+    '^CloudImages$': [
+        {
+            'image-build': {
+                    'format': [('qcow2','qcow2'), ('raw-xz','raw.xz')]
+                    'name': 'Fedora-Cloud-Base',
+                    'kickstart': 'fedora-cloud-base-ppc.ks',
+                    'failable': ['*'],
+                    'distro': 'Fedora-22',
+                    'disk_size': 3,
+                    'arches': ['ppc64', 'ppc64le'],
+                    'repo_from': 'Cloud',
+                    'install_tree_from': 'Cloud',
+                    'subvariant': 'Cloud_Base'
+                     }
+            'factory-parameters': {
+                    'generate_icicle': 'false'
+                    }
+        },
+        {
+            'image-build': {
+                    'format': [('vagrant-libvirt','vagrant-libvirt.box'), ('vagrant-virtualbox','vagrant-virtualbox.box')]
+                    'name': 'Fedora-Cloud-Base-Vagrant',
+                    'kickstart': 'fedora-cloud-base-vagrant.ks',
+                    'failable': ['*'],
+                    'distro': 'Fedora-22',
+                    'disk_size': 40,
+                    'arches': ['x86_64'],
+                    'repo_from': 'Cloud',
+                    'install_tree_from': 'Cloud',
+                    'subvariant': 'Cloud_Base',
+                    'ova-option': 'vagrant_sync_directory=/home/vagrant/sync'
+                     }
+        }
+        ],
+}
+
+live_media = {
+    '^Workstation$': [
+            {
+                'name': 'Fedora-Workstation-Live',
+                'kickstart': 'fedora-live-workstation.ks',
+                'arches': ['x86_64', 'i386'],
+                'repo_from': 'Everything',
+                'subvariant': 'Workstation'
+
+            }
+        ],
+    '^Spins': [
+            {
+                'name': 'Fedora-KDE-Live',
+                'kickstart': 'fedora-live-kde.ks',
+                'arches': ['x86_64', 'i386'],
+                'repo_from': 'Everything',
+                'install_tree_from': 'Everything',
+                'subvariant': 'KDE'
+
+            },
+            {
+                'name': 'Fedora-Xfce-Live',
+                'kickstart': 'fedora-live-xfce.ks',
+                'arches': ['x86_64', 'i386'],
+                'failable': ['*'],
+                'repo_from': 'Everything',
+                'install_tree_from': 'Everything',
+                'subvariant': 'Xfce'
+            },
+            {
+                'name': 'Fedora-SoaS-Live',
+                'kickstart': 'fedora-live-soas.ks',
+                'arches': ['x86_64', 'i386'],
+                'failable': ['*'],
+                'repo_from': 'Everything',
+                'install_tree_from': 'Everything',
+                'subvariant': 'SoaS'
+            },
+            {
+                'name': 'Fedora-Cinnamon-Live',
+                'kickstart': 'fedora-live-cinnamon.ks',
+                'arches': ['x86_64', 'i386'],
+                'failable': ['*'],
+                'repo_from': 'Everything',
+                'install_tree_from': 'Everything',
+                'subvariant': 'Cinnamon'
+            },
+            {
+                'name': 'Fedora-LXDE-Live',
+                'kickstart': 'fedora-live-lxde.ks',
+                'arches': ['x86_64', 'i386'],
+                'failable': ['*'],
+                'repo_from': 'Everything',
+                'install_tree_from': 'Everything',
+                'subvariant': 'LXDE'
+            },
+            {
+                'name': 'Fedora-MATE_Compiz-Live',
+                'kickstart': 'fedora-live-mate_compiz.ks',
+                'arches': ['x86_64', 'i386'],
+                'failable': ['*'],
+                'repo_from': 'Everything',
+                'install_tree_from': 'Everything',
+                'subvariant': 'Mate'
+            }
+        ],
+    '^Labs$': [
+            {
+                'name': 'Fedora-Astronomy_KDE-Live',
+                'kickstart': 'fedora-live-astronomy_kde.ks',
+                'arches': ['x86_64', 'i386'],
+                'failable': ['*'],
+                'repo_from': 'Everything',
+                'install_tree_from': 'Everything',
+                'subvariant': 'Astronomy_KDE'
+            },
+            {
+                'name': 'Fedora-Design_suite-Live',
+                'kickstart': 'fedora-live-design_suite.ks',
+                'arches': ['x86_64', 'i386'],
+                'failable': ['*'],
+                'repo_from': 'Everything',
+                'install_tree_from': 'Everything',
+                'subvariant': 'Design_suite'
+            },
+            {
+                'name': 'Fedora-Scientific_KDE-Live',
+                'kickstart': 'fedora-live-scientific_kde.ks',
+                'arches': ['x86_64', 'i386'],
+                'failable': ['*'],
+                'repo_from': 'Everything',
+                'install_tree_from': 'Everything',
+                'subvariant': 'Scientific_KDE'
+            },
+            {
+                'name': 'Fedora-Games-Live',
+                'kickstart': 'fedora-live-games.ks',
+                'arches': ['x86_64', 'i386'],
+                'failable': ['*'],
+                'repo_from': 'Everything',
+                'install_tree_from': 'Everything',
+                'subvariant': 'Games'
+            },
+            {
+                'name': 'Fedora-Security-Live',
+                'kickstart': 'fedora-live-security.ks',
+                'arches': ['x86_64', 'i386'],
+                'failable': ['*'],
+                'repo_from': 'Everything',
+                'install_tree_from': 'Everything',
+                'subvariant': 'Security'
+            },
+            {
+                'name': 'Fedora-Jam_KDE-Live',
+                'kickstart': 'fedora-live-jam_kde.ks',
+                'arches': ['x86_64', 'i386'],
+                'failable': ['*'],
+                'repo_from': 'Everything',
+                'install_tree_from': 'Everything',
+                'subvariant': 'Jam_KDE'
+            },
+            {
+                'name': 'Fedora-Robotics-Live',
+                'kickstart': 'fedora-live-robotics.ks',
+                'arches': ['x86_64', 'i386'],
+                'failable': ['*'],
+                'repo_from': 'Everything',
+                'install_tree_from': 'Everything',
+                'subvariant': 'Robotics'
+            }
+    ],
+}
+
+failable_deliverables = [
+    ('^.*$', {
+        # Buildinstall can fail on any variant and any arch
+        '*': ['buildinstall', 'iso', 'image-build', 'live-media', 'live', 'ostree', 'ostree-installer'],
+        'src': ['buildinstall'],
+        # Nothing on i386 blocks the compose
+        'i386': ['buildinstall', 'iso', 'live'],
+    })
+]
+
+live_target = 'f25'
+live_images_no_rename = True
+# fomat: [(variant_uid_regex, {arch|*: scm_dict})]
+live_images = [
+    ('^Workstation$', {
+        'armhfp': {
+                'kickstart': 'fedora-arm-workstation.ks',
+                'name': 'Fedora-Workstation-armhfp',
+                'type': 'appliance',
+                'failable': True,
+                }
+    }),
+    ('^Server$', {
+        'armhfp': {
+                'kickstart': 'fedora-arm-server.ks',
+                'name': 'Fedora-Server-armhfp',
+                'type': 'appliance',
+                'failable': True,
+                }
+    }),
+    ('^Spins$', {
+        'armhfp': [{
+                'kickstart': 'fedora-arm-kde.ks',
+                'name': 'Fedora-KDE-armhfp',
+                'repo_from': 'Everything',
+                'type': 'appliance',
+                'subvariant': 'KDE',
+                'failable': True,
+                },
+                {
+                'kickstart': 'fedora-arm-lxde.ks',
+                'name': 'Fedora-LXDE-armhfp',
+                'repo_from': 'Everything',
+                'type': 'appliance',
+                'subvariant': 'LXDE',
+                'failable': True,
+                },
+                {
+                'kickstart': 'fedora-arm-mate.ks',
+                'name': 'Fedora-Mate-armhfp',
+                'repo_from': 'Everything',
+                'type': 'appliance',
+                'subvariant': 'Mate',
+                'failable': True,
+                },
+                {
+                'kickstart': 'fedora-arm-minimal.ks',
+                'name': 'Fedora-Minimal-armhfp',
+                'repo_from': 'Everything',
+                'type': 'appliance',
+                'subvariant': 'Minimal',
+                'failable': False,
+                },
+                {
+                'kickstart': 'fedora-arm-soas.ks',
+                'name': 'Fedora-SoaS-armhfp',
+                'repo_from': 'Everything',
+                'type': 'appliance',
+                'subvariant': 'SoaS',
+                'failable': True,
+                },
+                {
+                'kickstart': 'fedora-arm-xfce.ks',
+                'name': 'Fedora-Xfce-armhfp',
+                'repo_from': 'Everything',
+                'type': 'appliance',
+                'subvariant': 'Xfce',
+                'failable': True,
+                },]
+    }),
+]
+
+koji_profile = 'koji'
diff --git a/fedora-s390-final.conf b/fedora-s390-final.conf
new file mode 100644
index 0000000..4338947
--- /dev/null
+++ b/fedora-s390-final.conf
@@ -0,0 +1,636 @@
+# PRODUCT INFO
+release_name = 'Fedora'
+release_short = 'Fedora'
+release_version = '25'
+release_is_layered = False
+
+# GENERAL SETTINGS
+bootable = True
+comps_file = 'comps-f25.xml' #{
+#    'scm': 'git',
+#    'repo': 'https://pagure.io/fedora-comps.git',
+#    'branch': None, # defaults to cvs/HEAD or git/master
+#    'file': 'comps-f25.xml',
+#}
+
+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 = ['s390x']
+
+# limit tree variants
+# if undefined, all variants from variants.xml will be included
+#tree_variants = ['Server']
+tree_variants = ["Everything", "Server"]
+
+hashed_directories = True
+
+# RUNROOT settings
+runroot = True
+runroot_channel = 'compose'
+runroot_tag = 'f25-build'
+
+# PKGSET
+pkgset_source = 'koji' # koji, repos
+
+# PKGSET - REPOS
+# pkgset_repos format: {arch: [repo1_url, repo2_url, ...]}
+# pkgset_repos = {}
+
+# PKGSET - KOJI
+pkgset_koji_tag = 'f25-compose'
+pkgset_koji_inherit = True
+
+filter_system_release_packages = False
+
+# GATHER
+gather_source = 'comps'
+gather_method = 'deps'
+check_deps = False
+greedy_method = 'build'
+
+# fomat: [(variant_uid_regex, {arch|*: [repos]})]
+# gather_lookaside_repos = []
+
+# GATHER - JSON
+# format: {variant_uid: {arch: package: [arch1, arch2, None (for any arch)]}}
+#gather_source_mapping = '/path/to/mapping.json'
+
+
+# CREATEREPO
+createrepo_c = True
+createrepo_checksum = 'sha256'
+createrepo_deltas = True
+
+# CHECKSUMS
+media_checksums = ['sha256']
+media_checksum_one_file = True
+media_checksum_base_filename = '%(release_short)s-%(variant)s-%(version)s-1.1-%(arch)s'
+#jigdo
+create_jigdo = False
+
+# BUILDINSTALL
+buildinstall_method = 'lorax'
+
+# Enables macboot on x86_64 for all variants and disables upgrade image building
+# # everywhere.
+lorax_options = [
+  ('^.*$', {
+     'x86_64': {
+         'nomacboot': False
+     }
+     '*': {
+         'noupgrade': True
+     }
+  })
+]
+
+#extra_packages = [
+#    '/mnt/packages/foo*',
+#]
+
+
+# fomat: [(variant_uid_regex, {arch|*: [packages]})]
+additional_packages = [
+    ('.*', {
+        '*': [
+            'kernel.*',
+            'dracut.*',
+            'autocorr-.*',
+            'eclipse-nls-.*',
+            'hunspell-.*',
+            'hyphen-.*',
+            'calligra-l10n-.*',
+            'kde-l10n-.*',
+            'libreoffice-langpack-.*',
+            'man-pages-.*',
+            'mythes-.*',
+        ],
+    }),
+
+    ('^Everything$', {
+        '*': [
+            '*',
+        ],
+    }),
+
+    ('^Server$', {
+        '*': [
+
+        ],
+    }),
+
+    ('^Workstation$', {
+        '*': [
+
+        ],
+    }),
+
+    ('^Cloud$', {
+        '*': [
+
+        ],
+    }),
+
+]
+
+multilib = [
+    ('^Everything$', {
+        'x86_64': ['devel', 'runtime'],
+    })
+]
+
+filter_packages = [
+    ('(Workstation|Server|Cloud)$', {
+        '*': [
+        '^kernel.*debug.*',
+        '^kernel-kdump.*',
+        '^kernel-tools.*',
+        '^syslog-ng.*',
+        '^astronomy-bookmarks',
+        '^generic.*',
+        '^GConf2-dbus.*',
+        '^bluez-gnome',
+        #Periods cause problems in paterns, so replace with *s
+        '^java-1.8.0-openjdk',
+        '^community-mysql.*',
+        '^jruby.*',
+        '^gimp-help-.*',
+        ]
+    }),
+]
+
+
+# format: {arch|*: [packages]}
+multilib_blacklist = {
+    '*': ['kernel', 'kernel-PAE*', 'kernel*debug*',
+        'dmraid-devel', 'kdeutils-devel', 'mkinitrd-devel',
+        'java-1.5.0-gcj-devel', 'java-1.7.0-icedtea-devel',
+        'php-devel', 'java-1.6.0-openjdk-devel',
+        'java-1.7.0-openjdk-devel', 'java-1.8.0-openjdk-devel',
+        'httpd-devel', 'tomcat-native', 'php*', 'httpd',
+        'krb5-server', 'krb5-server-ldap', 'mod_*', 'ghc-*'
+    ],
+}
+
+
+# format: {arch|*: [packages]}
+multilib_whitelist = {
+    '*': ['libgnat', 'wine', 'lmms-vst', 'nspluginwrapper',
+        'libflashsupport', 'valgrind', 'perl-libs', 'redhat-lsb',
+        'yaboot', 'syslinux-extlinux-nonlinux', 'syslinux-nonlinux',
+        'syslinux-tftpboot', 'nosync', '*-static', 'apitrace-libs',
+        'fakeroot-libs'
+    ],
+}
+
+createiso_skip = [
+        ('^Workstation$', {
+            '*': True,
+            'src': True
+        }),
+
+        ('^Server$', {
+            'src': True
+        }),
+
+        ('^Cloud$', {
+            '*': True,
+            'src': True
+        }),
+
+        ('^Everything$', {
+            '*': True,
+            'src': True
+        }),
+
+    ]
+
+# fomat: [(variant_uid_regex, {arch|*: [scm_dicts]})]
+#extra_files = [
+#    ('^(Server|Workstation|Cloud)$', {
+#        '*': [
+#            {
+#                'scm': 'rpm',
+#                'repo': 'fedora-release-%(variant_id_lower)s',
+#                'branch': None,
+#                'file': [
+#                    '/etc/pki/rpm-gpg/RPM-GPG-KEY-fedora-release',
+#                ],
+#                'target': '',
+#            },
+#        ],
+#    }),
+#]
+
+# Image name respecting Fedora's image naming policy
+image_name_format = '%(release_short)s-%(variant)s-%(disc_type)s-%(arch)s-%(version)s-1.1.iso'
+# # Use the same format for volume id
+image_volid_formats = [
+     '%(release_short)s-%(variant)s-%(disc_type)s-%(arch)s-%(version)s'
+     ]
+# No special handling for layered products, use same format as for regular images
+image_volid_layered_product_formats = []
+# Replace 'Cloud' with 'C' in volume id etc.
+volume_id_substitutions = {
+        'Rawhide': 'rawh',
+         'Images': 'img',
+    'MATE_Compiz': 'MATE',
+       'Security': 'Sec',
+ 'Electronic_Lab': 'Elec',
+       'Robotics': 'Robo',
+ 'Scientific_KDE': 'SciK',
+  'Astronomy_KDE': 'AstK',
+   'Design_suite': 'Dsgn',
+          'Games': 'Game',
+        'Jam_KDE': 'Jam',
+    'Workstation': 'WS',
+     'Everything': 'E',
+         'Server': 'S',
+          'Cloud': 'C',
+          'Alpha': 'A',
+           'Beta': 'B',
+             'TC': 'T',
+}
+
+disc_types = {
+    'boot': 'netinst',
+    'live': 'Live',
+}
+
+translate_paths = [
+   ('/mnt/koji/compose/', 'http://s390pkgs.fedoraproject.org/compose/'),
+]
+
+# These will be inherited by live_media, live_images and image_build
+global_ksurl = 'git+https://pagure.io/fedora-kickstarts.git?#origin/f25'
+global_release = '1.1'
+global_version = '25'
+# live_images ignores this in favor of live_target
+global_target = 'f25'
+
+image_build = {
+    '^Docker$': [
+        {
+            'image-build': {
+                    'format': [('docker', 'tar.xz')]
+                    'name': 'Fedora-Docker-Base',
+                    'kickstart': 'fedora-docker-base.ks',
+                    'failable': ['*'],
+                    'distro': 'Fedora-22',
+                    'disk_size': 3,
+                    'arches': ['s390x'],
+                    'repo_from': 'Cloud',
+                    'install_tree_from': 'Cloud',
+                    'subvariant': 'Docker_Base'
+                    }
+        }
+        ],
+    '^CloudImages$': [
+        {
+            'image-build': {
+                    'format': [('qcow2','qcow2'), ('raw-xz','raw.xz')]
+                    'name': 'Fedora-Cloud-Base',
+                    'kickstart': 'fedora-cloud-base.ks',
+                    'failable': ['*'],
+                    'distro': 'Fedora-22',
+                    'disk_size': 3,
+                    'arches': ['s390x'],
+                    'repo_from': 'Cloud',
+                    'install_tree_from': 'Cloud',
+                    'subvariant': 'Cloud_Base'
+                     }
+        },
+        {
+            'image-build': {
+                    'format': [('vagrant-libvirt','vagrant-libvirt.box'), ('vagrant-virtualbox','vagrant-virtualbox.box')]
+                    'name': 'Fedora-Cloud-Base-Vagrant',
+                    'kickstart': 'fedora-cloud-base-vagrant.ks',
+                    'failable': ['*'],
+                    'distro': 'Fedora-22',
+                    'disk_size': 40,
+                    'arches': ['x86_64'],
+                    'repo_from': 'Cloud',
+                    'install_tree_from': 'Cloud',
+                    'subvariant': 'Cloud_Base',
+                    'ova-option': 'vagrant_sync_directory=/home/vagrant/sync'
+                     }
+        },
+        {
+            'image-build': {
+                    'format': [('qcow2','qcow2'), ('raw-xz','raw.xz')]
+                    'name': 'Fedora-Atomic',
+                    'kickstart': 'fedora-atomic.ks',
+                    'failable': ['*'],
+                    'distro': 'Fedora-22',
+                    'disk_size': 6,
+                    'arches': ['x86_64'],
+                    'repo_from': 'Cloud',
+                    'install_tree_from': 'Cloud',
+                    'subvariant': 'Atomic'
+                     }
+        },
+        {
+            'image-build': {
+                    'format': [('vagrant-libvirt','vagrant-libvirt.box'), ('vagrant-virtualbox','vagrant-virtualbox.box')]
+                    'name': 'Fedora-Atomic-Vagrant',
+                    'kickstart': 'fedora-atomic-vagrant.ks',
+                    'failable': ['*'],
+                    'distro': 'Fedora-22',
+                    'disk_size': 40,
+                    'arches': ['x86_64'],
+                    'repo_from': 'Cloud',
+                    'install_tree_from': 'Cloud',
+                    'subvariant': 'Atomic'
+                     }
+        }
+        ],
+}
+
+live_media = {
+    '^Workstation$': [
+            {
+                'name': 'Fedora-Workstation-Live',
+                'kickstart': 'fedora-live-workstation.ks',
+                'arches': ['x86_64', 'i386'],
+                'repo_from': 'Everything',
+                'subvariant': 'Workstation'
+
+            }
+        ],
+    '^Spins': [
+            {
+                'name': 'Fedora-KDE-Live',
+                'kickstart': 'fedora-live-kde.ks',
+                'arches': ['x86_64', 'i386'],
+                'repo_from': 'Everything',
+                'install_tree_from': 'Everything',
+                'subvariant': 'KDE'
+
+            },
+            {
+                'name': 'Fedora-Xfce-Live',
+                'kickstart': 'fedora-live-xfce.ks',
+                'arches': ['x86_64', 'i386'],
+                'failable': ['*'],
+                'repo_from': 'Everything',
+                'install_tree_from': 'Everything',
+                'subvariant': 'Xfce'
+            },
+            {
+                'name': 'Fedora-SoaS-Live',
+                'kickstart': 'fedora-live-soas.ks',
+                'arches': ['x86_64', 'i386'],
+                'failable': ['*'],
+                'repo_from': 'Everything',
+                'install_tree_from': 'Everything',
+                'subvariant': 'SoaS'
+            },
+            {
+                'name': 'Fedora-Cinnamon-Live',
+                'kickstart': 'fedora-live-cinnamon.ks',
+                'arches': ['x86_64', 'i386'],
+                'failable': ['*'],
+                'repo_from': 'Everything',
+                'install_tree_from': 'Everything',
+                'subvariant': 'Cinnamon'
+            },
+            {
+                'name': 'Fedora-LXDE-Live',
+                'kickstart': 'fedora-live-lxde.ks',
+                'arches': ['x86_64', 'i386'],
+                'failable': ['*'],
+                'repo_from': 'Everything',
+                'install_tree_from': 'Everything',
+                'subvariant': 'LXDE'
+            },
+            {
+                'name': 'Fedora-MATE_Compiz-Live',
+                'kickstart': 'fedora-live-mate_compiz.ks',
+                'arches': ['x86_64', 'i386'],
+                'failable': ['*'],
+                'repo_from': 'Everything',
+                'install_tree_from': 'Everything',
+                'subvariant': 'Mate'
+            }
+        ],
+    '^Labs$': [
+            {
+                'name': 'Fedora-Astronomy_KDE-Live',
+                'kickstart': 'fedora-live-astronomy_kde.ks',
+                'arches': ['x86_64', 'i386'],
+                'failable': ['*'],
+                'repo_from': 'Everything',
+                'install_tree_from': 'Everything',
+                'subvariant': 'Astronomy_KDE'
+            },
+            {
+                'name': 'Fedora-Design_suite-Live',
+                'kickstart': 'fedora-live-design_suite.ks',
+                'arches': ['x86_64', 'i386'],
+                'failable': ['*'],
+                'repo_from': 'Everything',
+                'install_tree_from': 'Everything',
+                'subvariant': 'Design_suite'
+            },
+            {
+                'name': 'Fedora-Scientific_KDE-Live',
+                'kickstart': 'fedora-live-scientific_kde.ks',
+                'arches': ['x86_64', 'i386'],
+                'failable': ['*'],
+                'repo_from': 'Everything',
+                'install_tree_from': 'Everything',
+                'subvariant': 'Scientific_KDE'
+            },
+            {
+                'name': 'Fedora-Games-Live',
+                'kickstart': 'fedora-live-games.ks',
+                'arches': ['x86_64', 'i386'],
+                'failable': ['*'],
+                'repo_from': 'Everything',
+                'install_tree_from': 'Everything',
+                'subvariant': 'Games'
+            },
+            {
+                'name': 'Fedora-Security-Live',
+                'kickstart': 'fedora-live-security.ks',
+                'arches': ['x86_64', 'i386'],
+                'failable': ['*'],
+                'repo_from': 'Everything',
+                'install_tree_from': 'Everything',
+                'subvariant': 'Security'
+            },
+            {
+                'name': 'Fedora-Jam_KDE-Live',
+                'kickstart': 'fedora-live-jam_kde.ks',
+                'arches': ['x86_64', 'i386'],
+                'failable': ['*'],
+                'repo_from': 'Everything',
+                'install_tree_from': 'Everything',
+                'subvariant': 'Jam_KDE'
+            },
+            {
+                'name': 'Fedora-Robotics-Live',
+                'kickstart': 'fedora-live-robotics.ks',
+                'arches': ['x86_64', 'i386'],
+                'failable': ['*'],
+                'repo_from': 'Everything',
+                'install_tree_from': 'Everything',
+                'subvariant': 'Robotics'
+            }
+    ],
+}
+
+failable_deliverables = [
+    ('^.*$', {
+        # Buildinstall can fail on any variant and any arch
+        '*': ['buildinstall', 'iso', 'image-build', 'live-media', 'live', 'ostree', 'ostree-installer'],
+        'src': ['buildinstall'],
+        # Nothing on i386 blocks the compose
+        'i386': ['buildinstall', 'iso', 'live'],
+    })
+]
+
+live_target = 'f25'
+live_images_no_rename = True
+# fomat: [(variant_uid_regex, {arch|*: scm_dict})]
+live_images = [
+    ('^Workstation$', {
+        'armhfp': {
+                'kickstart': 'fedora-arm-workstation.ks',
+                'name': 'Fedora-Workstation-armhfp',
+                'type': 'appliance',
+                'failable': True,
+                }
+    }),
+    ('^Server$', {
+        'armhfp': {
+                'kickstart': 'fedora-arm-server.ks',
+                'name': 'Fedora-Server-armhfp',
+                'type': 'appliance',
+                'failable': True,
+                }
+    }),
+    ('^Spins$', {
+        'armhfp': [{
+                'kickstart': 'fedora-arm-kde.ks',
+                'name': 'Fedora-KDE-armhfp',
+                'repo_from': 'Everything',
+                'type': 'appliance',
+                'subvariant': 'KDE',
+                'failable': True,
+                },
+                {
+                'kickstart': 'fedora-arm-lxde.ks',
+                'name': 'Fedora-LXDE-armhfp',
+                'repo_from': 'Everything',
+                'type': 'appliance',
+                'subvariant': 'LXDE',
+                'failable': True,
+                },
+                {
+                'kickstart': 'fedora-arm-mate.ks',
+                'name': 'Fedora-Mate-armhfp',
+                'repo_from': 'Everything',
+                'type': 'appliance',
+                'subvariant': 'Mate',
+                'failable': True,
+                },
+                {
+                'kickstart': 'fedora-arm-minimal.ks',
+                'name': 'Fedora-Minimal-armhfp',
+                'repo_from': 'Everything',
+                'type': 'appliance',
+                'subvariant': 'Minimal',
+                'failable': False,
+                },
+                {
+                'kickstart': 'fedora-arm-soas.ks',
+                'name': 'Fedora-SoaS-armhfp',
+                'repo_from': 'Everything',
+                'type': 'appliance',
+                'subvariant': 'SoaS',
+                'failable': True,
+                },
+                {
+                'kickstart': 'fedora-arm-xfce.ks',
+                'name': 'Fedora-Xfce-armhfp',
+                'repo_from': 'Everything',
+                'type': 'appliance',
+                'subvariant': 'Xfce',
+                'failable': True,
+                },]
+    }),
+]
+
+ostree = [
+    ("^Atomic$", {
+        "x86_64": {
+            "treefile": "fedora-atomic-docker-host.json",
+            "config_url": "https://pagure.io/fedora-atomic.git",
+            "config_branch": "f25",
+            "source_repo_from": "Everything",
+            "ostree_repo": "/mnt/koji/compose/atomic/25/",
+            'failable': ['*'],
+        }
+    }),
+    ("^ostree$", {
+        "x86_64": {
+            "treefile": "fedora-ostree-workstation.json",
+            "config_url": "https://pagure.io/workstation-ostree-config.git",
+            "config_branch": "f25",
+            "source_repo_from": "Workstation",
+            "ostree_repo": "/mnt/koji/compose/ostree/25/",
+            'failable': ['*'],
+        }
+    })
+]
+
+ostree_installer = [
+    ("^Atomic$", {
+        "x86_64": {
+            "source_repo_from": "Everything",
+            "release": None,
+            "installpkgs": ["fedora-productimg-atomic"],
+            "add_template": ["atomic-installer/lorax-configure-repo.tmpl"],
+            "add_template_var": [
+                "ostree_osname=fedora-atomic",
+                "ostree_ref=fedora-atomic/25/x86_64/docker-host",
+            ],
+            "add_arch_template": ["atomic-installer/lorax-embed-repo.tmpl"],
+            "add_arch_template_var": [
+                "ostree_repo=https://kojipkgs.fedoraproject.org/compose/atomic/25/",
+                "ostree_osname=fedora-atomic",
+                "ostree_ref=fedora-atomic/25/x86_64/docker-host",
+            ]
+            'template_repo': 'https://pagure.io/fedora-lorax-templates.git',
+            'template_branch': 'f25',
+            'failable': ['*'],
+        }
+    }),
+    ("^Workstation$", {
+        "x86_64": {
+            "source_repo_from": "Everything",
+            "release": None,
+            "installpkgs": ["fedora-productimg-atomic"],
+            "add_template": ["workstation-ostree-installer/lorax-configure-repo.tmpl"],
+            "add_template_var": [
+                "ostree_osname=fedora-atomic",
+                "ostree_ref=fedora-atomic/25/x86_64/docker-host",
+            ],
+            "add_arch_template": ["workstation-ostree-installer/lorax-embed-repo.tmpl"],
+            "add_arch_template_var": [
+                "ostree_repo=https://kojipkgs.fedoraproject.org/compose/ostree/25/",
+                "ostree_osname=fedora-workstation",
+                "ostree_ref=fedora/25/x86_64/workstation",
+            ]
+            'template_repo': 'https://pagure.io/fedora-lorax-templates.git',
+            'template_branch': 'f25',
+            'failable': ['*'],
+        }
+    })
+]
+
+koji_profile = 'koji'
diff --git a/release-candidate.sh b/release-candidate.sh
index f769bfb..7b42950 100755
--- a/release-candidate.sh
+++ b/release-candidate.sh
@@ -4,9 +4,9 @@ export LC_ALL=C
 
 LABEL=$1
 ARCH=$2
-CONFIG="fedora-beta.conf"
+CONFIG="fedora-final.conf"
 [ -n "$ARCH" ] && {
-CONFIG="fedora-$ARCH-beta.conf"
+CONFIG="fedora-$ARCH-final.conf"
 SPAMOPTS="--nomail"
 }
 TARGET_DIR="/mnt/koji/compose/25"