diff --git a/roles/odcs/base/defaults/main.yml b/roles/odcs/base/defaults/main.yml
index 8b7571a164..54b8917b3b 100644
--- a/roles/odcs/base/defaults/main.yml
+++ b/roles/odcs/base/defaults/main.yml
@@ -5,7 +5,7 @@ odcs_pdc_insecure: False
 odcs_pdc_develop: True
 odcs_target_dir: /srv/odcs
 odcs_target_dir_url: http://{{ inventory_hostname }}/composes
-odcs_allowed_clients_groups: {"sysadmin-mbs": {}, "sysadmin-osbs": {}, "modularity-wg": {"source_types": ["module"]}}
+odcs_allowed_clients_groups: {"sysadmin-mbs": {}, "sysadmin-osbs": {}, "packager": {"source_types": ["module"]}}
 odcs_allowed_clients_users: {"osbs@service": {}}
 odcs_admin_groups: ["sysadmin-mbs"]
 odcs_admin_users: []
diff --git a/roles/odcs/base/files/pungi.conf b/roles/odcs/base/files/pungi.conf
index 2c2afddfe9..b7599612cd 100644
--- a/roles/odcs/base/files/pungi.conf
+++ b/roles/odcs/base/files/pungi.conf
@@ -23,14 +23,7 @@ sigkeys = [None]
 hashed_directories = True
 
 # RUNROOT settings
-{%- if config.bootable %}
-runroot = True
-runroot_tag = "f26-build"
-runroot_channel = "compose"
-{%- else %}
 runroot = False
-{%- endif %}
-
 
 # PKGSET
 {%- if config.pkgset_source == 'repos' %}
@@ -42,23 +35,79 @@ pkgset_repos = {
 }
 {%- elif config.pkgset_source == 'koji' %}
 pkgset_source = 'koji'
+
 {%- if config.koji_tag %}
 pkgset_koji_tag = '{{ config.koji_tag }}'
+{%- else %}
+pkgset_koji_tag = ""
 {%- endif %}
+
+{%- if config.koji_module_tags %}
+pkgset_koji_module_tag = [
+{%- for tag in config.koji_module_tags %}
+    '{{ tag }}',
+{%- endfor %}
+]
+{%- endif %}
+
+{%- if config.module_defaults_url %}
+module_defaults_dir = {
+    "scm": "git",
+    "repo": '{{ config.module_defaults_url[0] }}',
+    "branch": '{{ config.module_defaults_url[1] }}',
+    "dir": ".",
+}
+{%- endif %}
+
 pkgset_koji_inherit = {{ config.pkgset_koji_inherit }}
+pkgset_koji_builds = [
+{%- for build in config.builds %}
+    '{{ build }}',
+{%- endfor %}
+]
+{%- endif %}
+
+
+{%- if config.source_type_str in ["tag", "build"] and not config.packages %}
+# In case no package is requested, include all of them.
+additional_packages = [
+    ('^Temporary$', {
+        '*': [
+            '*',
+        ],
+    }),
+]
 {%- endif %}
 
 filter_system_release_packages = False
 
+multilib = [
+    ('^.*$', {
+{%- for multilib_arch in config.multilib_arches %}
+        '{{ multilib_arch }}': {{ config.multilib_method }}
+{%- endfor%}
+    }),
+]
+
 # GATHER
 gather_source = '{{ config.gather_source }}'
 gather_method = '{{ config.gather_method }}'
 {%- if config.comps_file %}
 comps_file = '{{ config.comps_file }}'
 {%- endif %}
-check_deps = False
+check_deps = {{ config.check_deps }}
 greedy_method = 'build'
 
+gather_lookaside_repos = [
+    ('^.*$', {
+        '*': [
+{%- for lookaside_repo in config.lookaside_repos %}
+            '{{ lookaside_repo }}',
+{%- endfor %}
+        ]
+    }),
+]
+
 # CREATEREPO
 createrepo_c = True
 createrepo_checksum = 'sha256'
@@ -70,7 +119,7 @@ create_jigdo = False
 # BUILDINSTALL
 {%- if config.bootable %}
 buildinstall_method="lorax"
-buildinstall_use_guestmount=False
+buildinstall_topdir="/mnt/koji/compose/odcs"
 {%- endif %}
 
 skip_phases = [
@@ -84,10 +133,18 @@ skip_phases = [
     "live_images",
     "ostree"]
 
-link_type = 'symlink'
-
 translate_paths = [
+   ('/mnt/koji/compose/', 'http://kojipkgs.fedoraproject.org/compose/'),
 ]
 
 koji_profile = '{{ config.koji_profile }}'
 
+repoclosure_strictness = [('.*', {'*': 'off'})]
+
+{%- if config.include_devel_modules %}
+include_devel_modules = { "Temporary": [
+{%- for ns in config.include_devel_modules %}
+        '{{ ns }}',
+{%- endfor%}
+]}
+{%- endif %}