diff --git a/pungi/checks.py b/pungi/checks.py
index a77bfdd6..3821ddbb 100644
--- a/pungi/checks.py
+++ b/pungi/checks.py
@@ -780,7 +780,7 @@ def make_schema():
             "paths_module": {"type": "string"},
             "skip_phases": {
                 "type": "array",
-                "items": {"type": "string", "enum": PHASES_NAMES},
+                "items": {"type": "string", "enum": PHASES_NAMES + ["productimg"]},
                 "default": [],
             },
             "image_name_format": {
diff --git a/pungi/scripts/pungi_koji.py b/pungi/scripts/pungi_koji.py
index 7dfdd6b6..253b2c49 100644
--- a/pungi/scripts/pungi_koji.py
+++ b/pungi/scripts/pungi_koji.py
@@ -249,7 +249,7 @@ def main():
     if not opts.quiet:
         # TODO: workaround for config files containing skip_phase = productimg
         # Remove when all config files are up to date
-        if "productimg" in opts.skip_phase or "productimg" in opts.just_phase:
+        if "productimg" in opts.skip_phase + opts.just_phase + conf["skip_phases"]:
             print(
                 "WARNING: productimg phase has been removed, please remove it from "
                 "--skip-phase or --just-phase option",