diff --git a/pungi/phases/image_build.py b/pungi/phases/image_build.py
index dc856aeb..286c72b5 100644
--- a/pungi/phases/image_build.py
+++ b/pungi/phases/image_build.py
@@ -6,7 +6,7 @@ import time
 from kobo import shortcuts
 
 from pungi.util import get_variant_data, resolve_git_url, makedirs, get_mtime, get_file_size, failable
-from pungi.phases.base import PhaseBase
+from pungi.phases.base import ConfigGuardedPhase
 from pungi.linker import Linker
 from pungi.paths import translate_path
 from pungi.wrappers.kojiwrapper import KojiWrapper
@@ -14,22 +14,14 @@ from kobo.threads import ThreadPool, WorkerThread
 from productmd.images import Image
 
 
-class ImageBuildPhase(PhaseBase):
+class ImageBuildPhase(ConfigGuardedPhase):
     """class for wrapping up koji image-build"""
     name = "image_build"
 
     def __init__(self, compose):
-        PhaseBase.__init__(self, compose)
+        super(ImageBuildPhase, self).__init__(compose)
         self.pool = ThreadPool(logger=self.compose._logger)
 
-    def skip(self):
-        if PhaseBase.skip(self):
-            return True
-        if not self.compose.conf.get(self.name):
-            self.compose.log_info("Config section '%s' was not found. Skipping" % self.name)
-            return True
-        return False
-
     def _get_install_tree(self, image_conf, variant):
         """
         Get a path to os tree for a variant specified in `install_tree_from` or
diff --git a/pungi/phases/live_images.py b/pungi/phases/live_images.py
index 43e7c24e..bcd04773 100644
--- a/pungi/phases/live_images.py
+++ b/pungi/phases/live_images.py
@@ -27,7 +27,7 @@ from productmd.images import Image
 
 from pungi.wrappers.kojiwrapper import KojiWrapper
 from pungi.wrappers.iso import IsoWrapper
-from pungi.phases.base import PhaseBase
+from pungi.phases.base import ConfigGuardedPhase
 from pungi.util import get_arch_variant_data, resolve_git_url, makedirs, get_mtime, get_file_size, failable
 from pungi.paths import translate_path
 
@@ -38,8 +38,8 @@ if sys.version_info[0] == 3:
         return (a > b) - (a < b)
 
 
-class LiveImagesPhase(PhaseBase):
-    name = "liveimages"
+class LiveImagesPhase(ConfigGuardedPhase):
+    name = "live_images"
 
     config_options = (
         {
@@ -75,16 +75,9 @@ class LiveImagesPhase(PhaseBase):
     )
 
     def __init__(self, compose):
-        PhaseBase.__init__(self, compose)
+        super(LiveImagesPhase, self).__init__(compose)
         self.pool = ThreadPool(logger=self.compose._logger)
 
-    def skip(self):
-        if PhaseBase.skip(self):
-            return True
-        if not self.compose.conf.get("live_images"):
-            return True
-        return False
-
     def _get_extra_repos(self, arch, variant, extras):
         repo = []
         for extra in extras:
@@ -194,11 +187,6 @@ class LiveImagesPhase(PhaseBase):
         return self.compose.get_image_name(arch, variant, disc_type=disc_type,
                                            disc_num=None, format=format)
 
-    def stop(self, *args, **kwargs):
-        PhaseBase.stop(self, *args, **kwargs)
-        if self.skip():
-            return
-
 
 class CreateLiveImageThread(WorkerThread):
     EXTS = ('.iso', '.raw.xz')
diff --git a/pungi/phases/livemedia_phase.py b/pungi/phases/livemedia_phase.py
index 6fad470b..8d95bd72 100644
--- a/pungi/phases/livemedia_phase.py
+++ b/pungi/phases/livemedia_phase.py
@@ -5,7 +5,7 @@ import time
 from kobo import shortcuts
 
 from pungi.util import get_variant_data, resolve_git_url, makedirs, get_mtime, get_file_size, failable
-from pungi.phases.base import PhaseBase
+from pungi.phases.base import ConfigGuardedPhase
 from pungi.linker import Linker
 from pungi.paths import translate_path
 from pungi.wrappers.kojiwrapper import KojiWrapper
@@ -13,7 +13,7 @@ from kobo.threads import ThreadPool, WorkerThread
 from productmd.images import Image
 
 
-class LiveMediaPhase(PhaseBase):
+class LiveMediaPhase(ConfigGuardedPhase):
     """class for wrapping up koji spin-livemedia"""
     name = 'live_media'
 
@@ -50,14 +50,6 @@ class LiveMediaPhase(PhaseBase):
         self.pool = ThreadPool(logger=self.compose._logger)
         self._global_ksurl = None
 
-    def skip(self):
-        if super(LiveMediaPhase, self).skip():
-            return True
-        if not self.compose.conf.get(self.name):
-            self.compose.log_info("Config section '%s' was not found. Skipping" % self.name)
-            return True
-        return False
-
     def _get_repos(self, image_conf, variant):
         """
         Get a comma separated list of repos. First included are those