diff --git a/pungi/phases/live_images.py b/pungi/phases/live_images.py
index 86f33d63..1ae4c381 100644
--- a/pungi/phases/live_images.py
+++ b/pungi/phases/live_images.py
@@ -272,7 +272,10 @@ class CreateLiveImageThread(WorkerThread):
             for rpm_path in rpm_paths:
                 shutil.copy2(rpm_path, cmd["dest_dir"])
 
-        self._write_manifest(destination)
+        if cmd['type'] == 'live':
+            # ISO manifest only makes sense for live images
+            self._write_manifest(destination)
+
         self._add_to_images(compose, variant, arch, cmd['type'], self._get_format(image_path), destination)
 
         self.pool.log_info("[DONE ] %s" % msg)
diff --git a/tests/test_liveimagesphase.py b/tests/test_liveimagesphase.py
index 72bc5359..aea61770 100755
--- a/tests/test_liveimagesphase.py
+++ b/tests/test_liveimagesphase.py
@@ -469,11 +469,7 @@ class TestCreateLiveImageThread(PungiTestCase):
         self.assertEqual(copy2.mock_calls,
                          [mock.call('/path/to/image-a.b-sda.raw.xz', self.topdir + '/compose/Client/amd64/iso/image-name')])
 
-        write_manifest_cmd = ' && '.join([
-            'cd ' + self.topdir + '/compose/Client/amd64/iso',
-            'isoinfo -R -f -i image-name | grep -v \'/TRANS.TBL$\' | sort >> image-name.manifest'
-        ])
-        self.assertEqual(run.mock_calls, [mock.call(write_manifest_cmd)])
+        self.assertEqual(run.mock_calls, [])
         self.assertEqual(koji_wrapper.get_create_image_cmd.mock_calls,
                          [mock.call('Test', '20151203.0.t', 'rhel-7.0-candidate',
                                     'amd64', '/path/to/ks_file',