diff --git a/pungi/phases/image_build.py b/pungi/phases/image_build.py
index f1272a01..badf53ef 100644
--- a/pungi/phases/image_build.py
+++ b/pungi/phases/image_build.py
@@ -229,9 +229,8 @@ class CreateImageBuildThread(WorkerThread):
             img.disc_number = 1     # We don't expect multiple disks
             img.disc_count = 1
             img.bootable = False
-            img.subvariant = cmd["image_conf"]["image-build"]["variant"]
-            compose.im.add(variant=cmd["image_conf"]["image-build"]["variant"].uid,
-                           arch=image_info['arch'],
-                           image=img)
+            varname = cmd["image_conf"]["image-build"]["variant"].uid
+            img.subvariant = cmd["image_conf"]["image-build"].get("subvariant", varname)
+            compose.im.add(variant=varname, arch=image_info['arch'], image=img)
 
         self.pool.log_info("[DONE ] %s" % msg)