diff --git a/pungi/phases/createrepo.py b/pungi/phases/createrepo.py
index 9d580363..6468229c 100644
--- a/pungi/phases/createrepo.py
+++ b/pungi/phases/createrepo.py
@@ -186,7 +186,7 @@ def create_variant_repo(compose, arch, variant, pkg_type):
         import yaml
         modules = {"modules": []}
         for mmd in variant.mmds:
-            modules["modules"].append(mmd.dumps())
+            modules["modules"].append(yaml.safe_load(mmd.dumps()))
         tmp_dir = compose.mkdtemp(prefix="pungi_")
         modules_path = os.path.join(tmp_dir, "modules.yaml")
         with open(modules_path, "w") as outfile:
diff --git a/pungi/phases/pkgset/sources/source_koji.py b/pungi/phases/pkgset/sources/source_koji.py
index 15d7d88d..8f275ad3 100644
--- a/pungi/phases/pkgset/sources/source_koji.py
+++ b/pungi/phases/pkgset/sources/source_koji.py
@@ -77,6 +77,7 @@ def get_module(session, module_info, strict=False):
     query = dict(
         variant_id=module_info['variant_id'],
         variant_version=module_info['variant_version'],
+        active=True,
     )
     if module_info.get('variant_release'):
         query['variant_release'] = module_info['variant_release']