diff --git a/doc/configuration.rst b/doc/configuration.rst
index f52257fb..f698821f 100644
--- a/doc/configuration.rst
+++ b/doc/configuration.rst
@@ -1240,7 +1240,7 @@ Options
 
     Format: ``[(variant_uid_regex, {arch|*: bool})]``
 
-**create_jigdo** = True
+**create_jigdo** = False
     (*bool*) -- controls the creation of jigdo from ISO
 
 **create_optional_isos** = False
diff --git a/doc/examples.rst b/doc/examples.rst
index 956383da..701a5f5a 100644
--- a/doc/examples.rst
+++ b/doc/examples.rst
@@ -83,7 +83,6 @@ This is a shortened configuration for Fedora Radhide compose as of 2019-10-14.
 
     # CREATEISO
     iso_hfs_ppc64le_compatible = False
-    create_jigdo = False
 
     # BUILDINSTALL
     buildinstall_method = 'lorax'
diff --git a/pungi/checks.py b/pungi/checks.py
index 66f852b0..b1ecf61b 100644
--- a/pungi/checks.py
+++ b/pungi/checks.py
@@ -53,7 +53,7 @@ from . import util
 
 
 def is_jigdo_needed(conf):
-    return conf.get("create_jigdo", True)
+    return conf.get("create_jigdo", False)
 
 
 def is_isohybrid_needed(conf):
@@ -609,7 +609,7 @@ def make_schema():
             "runroot_ssh_init_template": {"type": "string"},
             "runroot_ssh_install_packages_template": {"type": "string"},
             "runroot_ssh_run_template": {"type": "string"},
-            "create_jigdo": {"type": "boolean", "default": True},
+            "create_jigdo": {"type": "boolean", "default": False},
             "check_deps": {"type": "boolean", "default": True},
             "require_all_comps_packages": {"type": "boolean", "default": False},
             "bootable": {
diff --git a/pungi/phases/createiso.py b/pungi/phases/createiso.py
index 706ba577..895c588c 100644
--- a/pungi/phases/createiso.py
+++ b/pungi/phases/createiso.py
@@ -518,7 +518,7 @@ def add_iso_to_metadata(
 
 
 def run_createiso_command(
-    num, compose, bootable, arch, cmd, mounts, log_file, with_jigdo=True
+    num, compose, bootable, arch, cmd, mounts, log_file, with_jigdo=False
 ):
     packages = [
         "coreutils",
diff --git a/tests/data/dummy-pungi.conf b/tests/data/dummy-pungi.conf
index 5225f34d..d27423d4 100644
--- a/tests/data/dummy-pungi.conf
+++ b/tests/data/dummy-pungi.conf
@@ -109,5 +109,3 @@ extra_isos = {
         'filename': 'extra-{filename}',
     }]
 }
-
-create_jigdo = False
diff --git a/tests/test_createiso_phase.py b/tests/test_createiso_phase.py
index 180760a5..937f2137 100644
--- a/tests/test_createiso_phase.py
+++ b/tests/test_createiso_phase.py
@@ -120,8 +120,8 @@ class CreateisoPhaseTest(helpers.PungiTestCase):
                     graft_points="dummy-graft-points",
                     arch="x86_64",
                     supported=True,
-                    jigdo_dir="%s/compose/Server/x86_64/jigdo" % self.topdir,
-                    os_tree="%s/compose/Server/x86_64/os" % self.topdir,
+                    jigdo_dir=None,
+                    os_tree=None,
                     hfs_compat=True,
                     use_xorrisofs=False,
                 )
@@ -246,8 +246,8 @@ class CreateisoPhaseTest(helpers.PungiTestCase):
                     arch="x86_64",
                     buildinstall_method="lorax",
                     supported=True,
-                    jigdo_dir="%s/compose/Server/x86_64/jigdo" % self.topdir,
-                    os_tree="%s/compose/Server/x86_64/os" % self.topdir,
+                    jigdo_dir=None,
+                    os_tree=None,
                     hfs_compat=True,
                     use_xorrisofs=False,
                 ),
@@ -258,8 +258,8 @@ class CreateisoPhaseTest(helpers.PungiTestCase):
                     graft_points="dummy-graft-points",
                     arch="src",
                     supported=True,
-                    jigdo_dir="%s/compose/Server/source/jigdo" % self.topdir,
-                    os_tree="%s/compose/Server/source/tree" % self.topdir,
+                    jigdo_dir=None,
+                    os_tree=None,
                     hfs_compat=True,
                     use_xorrisofs=False,
                 ),
@@ -390,8 +390,8 @@ class CreateisoPhaseTest(helpers.PungiTestCase):
                     graft_points="dummy-graft-points",
                     arch="src",
                     supported=True,
-                    jigdo_dir="%s/compose/Server/source/jigdo" % self.topdir,
-                    os_tree="%s/compose/Server/source/tree" % self.topdir,
+                    jigdo_dir=None,
+                    os_tree=None,
                     hfs_compat=True,
                     use_xorrisofs=False,
                 )
@@ -497,8 +497,8 @@ class CreateisoPhaseTest(helpers.PungiTestCase):
                     graft_points="dummy-graft-points",
                     arch="x86_64",
                     supported=True,
-                    jigdo_dir="%s/compose/Server/x86_64/jigdo" % self.topdir,
-                    os_tree="%s/compose/Server/x86_64/os" % self.topdir,
+                    jigdo_dir=None,
+                    os_tree=None,
                     hfs_compat=False,
                     use_xorrisofs=False,
                 )
@@ -580,7 +580,7 @@ class CreateisoThreadTest(helpers.PungiTestCase):
                     cmd["cmd"],
                     channel=None,
                     mounts=[self.topdir],
-                    packages=["coreutils", "genisoimage", "isomd5sum", "jigdo"],
+                    packages=["coreutils", "genisoimage", "isomd5sum"],
                     use_shell=True,
                     weight=None,
                 )
@@ -750,7 +750,6 @@ class CreateisoThreadTest(helpers.PungiTestCase):
                         "coreutils",
                         "genisoimage",
                         "isomd5sum",
-                        "jigdo",
                         "lorax",
                         "which",
                     ],
diff --git a/tests/test_extra_isos_phase.py b/tests/test_extra_isos_phase.py
index 7b7c7346..9dcd75e1 100644
--- a/tests/test_extra_isos_phase.py
+++ b/tests/test_extra_isos_phase.py
@@ -148,7 +148,7 @@ class ExtraIsosThreadTest(helpers.PungiTestCase):
                     log_file=os.path.join(
                         self.topdir, "logs/x86_64/extraiso-my.iso.x86_64.log"
                     ),
-                    with_jigdo=True,
+                    with_jigdo=False,
                 )
             ],
         )
@@ -298,7 +298,7 @@ class ExtraIsosThreadTest(helpers.PungiTestCase):
                     log_file=os.path.join(
                         self.topdir, "logs/x86_64/extraiso-my.iso.x86_64.log"
                     ),
-                    with_jigdo=True,
+                    with_jigdo=False,
                 )
             ],
         )
@@ -374,7 +374,7 @@ class ExtraIsosThreadTest(helpers.PungiTestCase):
                     log_file=os.path.join(
                         self.topdir, "logs/x86_64/extraiso-my.iso.x86_64.log"
                     ),
-                    with_jigdo=True,
+                    with_jigdo=False,
                 )
             ],
         )
@@ -445,7 +445,7 @@ class ExtraIsosThreadTest(helpers.PungiTestCase):
                     log_file=os.path.join(
                         self.topdir, "logs/src/extraiso-my.iso.src.log"
                     ),
-                    with_jigdo=True,
+                    with_jigdo=False,
                 )
             ],
         )