diff --git a/pungi/phases/buildinstall.py b/pungi/phases/buildinstall.py
index 04081def..cb44a31c 100644
--- a/pungi/phases/buildinstall.py
+++ b/pungi/phases/buildinstall.py
@@ -77,11 +77,12 @@ class BuildinstallPhase(PhaseBase):
                 bugurl = data.get('bugurl')
             if not data.get('nomacboot', True):
                 nomacboot = False
+            if "rootfs_size" in data:
+                rootfs_size = data.get("rootfs_size")
             add_template.extend(data.get('add_template', []))
             add_arch_template.extend(data.get('add_arch_template', []))
             add_template_var.extend(data.get('add_template_var', []))
             add_arch_template_var.extend(data.get('add_arch_template_var', []))
-            rootfs_size = data.get("rootfs_size")
         output_dir = os.path.join(output_dir, variant.uid)
         output_topdir = output_dir
 
diff --git a/tests/test_buildinstall.py b/tests/test_buildinstall.py
index 46ee981d..f8f2c27c 100644
--- a/tests/test_buildinstall.py
+++ b/tests/test_buildinstall.py
@@ -251,6 +251,7 @@ class TestBuildinstallPhase(PungiTestCase):
             'release_is_layered': False,
             'buildinstall_method': 'lorax',
             'lorax_options': [
+                ('^.*$', {'*': {}}),
                 ('^Server$', {
                     'x86_64': {
                         'bugurl': 'http://example.com',
@@ -265,6 +266,7 @@ class TestBuildinstallPhase(PungiTestCase):
                 ('^Client$', {
                     '*': {'nomacboot': False}
                 }),
+                ('^.*$', {'*': {}}),
             ]
         })