diff --git a/ttm/config/openSUSE:Leap:15.0:Images.yaml b/ttm/config/openSUSE:Leap:15.0:Images.yaml
index cf82d70a..9630420b 100644
--- a/ttm/config/openSUSE:Leap:15.0:Images.yaml
+++ b/ttm/config/openSUSE:Leap:15.0:Images.yaml
@@ -1,4 +1,3 @@
-is_image_product: true
 jobs_num: 13
 openqa_group: openSUSE Leap 15.0 Images
 openqa_server: https://openqa.opensuse.org
diff --git a/ttm/config/openSUSE:Leap:15.1:ARM:Images.yaml b/ttm/config/openSUSE:Leap:15.1:ARM:Images.yaml
index 49f741af..38bd638b 100644
--- a/ttm/config/openSUSE:Leap:15.1:ARM:Images.yaml
+++ b/ttm/config/openSUSE:Leap:15.1:ARM:Images.yaml
@@ -1,4 +1,3 @@
-is_image_product: true
 jobs_num: 2
 openqa_group: openSUSE Leap 15.1 AArch64 Images
 openqa_server: https://openqa.opensuse.org
diff --git a/ttm/config/openSUSE:Leap:15.1:Images.yaml b/ttm/config/openSUSE:Leap:15.1:Images.yaml
index 89033e6c..52eb2827 100644
--- a/ttm/config/openSUSE:Leap:15.1:Images.yaml
+++ b/ttm/config/openSUSE:Leap:15.1:Images.yaml
@@ -1,4 +1,3 @@
-is_image_product: true
 jobs_num: 13
 openqa_group: openSUSE Leap 15.1 Images
 openqa_server: https://openqa.opensuse.org
diff --git a/ttm/manager.py b/ttm/manager.py
index 725ea0d2..6e3c1380 100644
--- a/ttm/manager.py
+++ b/ttm/manager.py
@@ -200,9 +200,9 @@ class ToTestManager(ToolBase.ToolBase):
 
         if self.project.take_source_from_product:
             if self.project.is_image_product:
-                return self.iso_build_version(self.project, self.project.image_products[0].package,
+                return self.iso_build_version(self.project.name, self.project.image_products[0].package,
                                               arch=self.project.image_products[0].archs[0])
-            return self.iso_build_version(self.project, self.project.main_products[0])
+            return self.iso_build_version(self.project.name, self.project.main_products[0])
         else:
             return self.release_version()
 
diff --git a/ttm/totest.py b/ttm/totest.py
index edea6321..eaff9b5a 100755
--- a/ttm/totest.py
+++ b/ttm/totest.py
@@ -28,7 +28,6 @@ class ToTest(object):
         self.do_not_release = False
         self.need_same_build_number = False
         self.set_snapshot_number = False
-        self.is_image_product = False
         self.take_source_from_product = False
         self.arch = 'x86_64'
         self.openqa_server = None
@@ -50,6 +49,7 @@ class ToTest(object):
         self.jobs_num = 42
         self.load_config()
         self.test_project = '%s:%s' % (project, self.test_subproject)
+        self.is_image_product = not len(self.main_products)
 
     def load_config(self):
         config = yaml.load(open('ttm/config/{}.yaml'.format(self.name)))
@@ -70,10 +70,10 @@ class ToTest(object):
 
     def set_products(self, products):
         # plain arrays
-        setattr(self, 'main_products', products['main'])
-        setattr(self, 'ftp_products', products['ftp'])
+        setattr(self, 'main_products', products.get('main', []))
+        setattr(self, 'ftp_products', products.get('ftp', []))
 
         # image products
-        setattr(self, 'livecd_products', self.parse_images(products['livecds']))
-        setattr(self, 'image_products', self.parse_images(products['images']))
-        setattr(self, 'container_products', self.parse_images(products['container']))
+        setattr(self, 'livecd_products', self.parse_images(products.get('livecds', [])))
+        setattr(self, 'image_products', self.parse_images(products.get('images', [])))
+        setattr(self, 'container_products', self.parse_images(products.get('container', [])))