diff --git a/fedora.conf b/fedora.conf
index 91457e2..245871f 100644
--- a/fedora.conf
+++ b/fedora.conf
@@ -42,8 +42,6 @@ pkgset_source = 'koji' # koji, repos
 # pkgset_repos = {}
 
 # PKGSET - KOJI
-pkgset_koji_path_prefix = '/mnt/koji/'
-pkgset_koji_url = 'http://koji.fedoraproject.org/kojihub'
 pkgset_koji_tag = 'f25'
 pkgset_koji_inherit = False
 
@@ -63,10 +61,6 @@ greedy_method = 'build'
 #gather_source_mapping = '/path/to/mapping.json'
 
 
-link_files = 'hardlink-or-copy'
-
-notification_script = '/usr/bin/pungi-fedmsg-notification'
-
 # CREATEREPO
 createrepo_c = True
 createrepo_checksum = 'sha256'
@@ -284,7 +278,6 @@ global_target = 'f25'
 image_build = {
     '^Docker$': [
         {
-            'failable': ['*'],
             'image-build': {
                     'format': [('docker', 'tar.xz')]
                     'name': 'Fedora-Docker-Base',
@@ -295,12 +288,12 @@ image_build = {
                     'repo_from': 'Cloud',
                     'install_tree_from': 'Cloud',
                     'subvariant': 'Docker_Base'
+                    'failable': ['*'],
                     }
         }
         ],
     '^CloudImages$': [
         {
-            'failable': ['*'],
             'image-build': {
                     'format': [('qcow2','qcow2'), ('raw-xz','raw.xz')]
                     'name': 'Fedora-Cloud-Base',
@@ -311,10 +304,10 @@ image_build = {
                     'repo_from': 'Cloud',
                     'install_tree_from': 'Cloud',
                     'subvariant': 'Cloud_Base'
+                    'failable': ['*'],
                      }
         },
         {
-            'failable': ['*'],
             'image-build': {
                     'format': [('vagrant-libvirt','vagrant-libvirt.box'), ('vagrant-virtualbox','vagrant-virtualbox.box')]
                     'name': 'Fedora-Cloud-Base-Vagrant',
@@ -326,10 +319,10 @@ image_build = {
                     'install_tree_from': 'Cloud',
                     'subvariant': 'Cloud_Base',
                     'ova-option': 'vagrant_sync_directory=/home/vagrant/sync'
+                    'failable': ['*'],
                      }
         },
         {
-            'failable': ['*'],
             'image-build': {
                     'format': [('qcow2','qcow2'), ('raw-xz','raw.xz')]
                     'name': 'Fedora-Atomic',
@@ -340,10 +333,10 @@ image_build = {
                     'repo_from': 'Cloud',
                     'install_tree_from': 'Cloud',
                     'subvariant': 'Atomic'
+                    'failable': ['*'],
                      }
         },
         {
-            'failable': ['*'],
             'image-build': {
                     'format': [('vagrant-libvirt','vagrant-libvirt.box'), ('vagrant-virtualbox','vagrant-virtualbox.box')]
                     'name': 'Fedora-Atomic-Vagrant',
@@ -354,6 +347,7 @@ image_build = {
                     'repo_from': 'Cloud',
                     'install_tree_from': 'Cloud',
                     'subvariant': 'Atomic'
+                    'failable': ['*'],
                      }
         }
         ],
@@ -603,7 +597,6 @@ ostree_installer = [
         "x86_64": {
             "source_repo_from": "Everything",
             "release": None,
-            "filename": "%(release_short)s-%(variant)s-%(arch)s-%(version)s-%(date)s.iso",
             "installpkgs": ["fedora-productimg-atomic"],
             "add_template": ["atomic-installer/lorax-configure-repo.tmpl"],
             "add_template_var": [
@@ -625,7 +618,6 @@ ostree_installer = [
         "x86_64": {
             "source_repo_from": "Everything",
             "release": None,
-            "filename": "%(release_short)s-%(variant)s-%(arch)s-%(version)s-%(date)s.iso",
             "installpkgs": ["fedora-productimg-atomic"],
             "add_template": ["workstation-ostree-installer/lorax-configure-repo.tmpl"],
             "add_template_var": [
@@ -645,5 +637,4 @@ ostree_installer = [
     })
 ]
 
-release_id_allow_missing = True
 koji_profile = 'koji'