diff --git a/doc/_static/phases.png b/doc/_static/phases.png
index f0564b1a..e7cc2b16 100644
Binary files a/doc/_static/phases.png and b/doc/_static/phases.png differ
diff --git a/doc/_static/phases.svg b/doc/_static/phases.svg
index 013f4f40..23ddefcd 100644
--- a/doc/_static/phases.svg
+++ b/doc/_static/phases.svg
@@ -7,58 +7,58 @@
    xmlns="http://www.w3.org/2000/svg"
    xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
    xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   inkscape:export-ydpi="90"
-   inkscape:export-xdpi="90"
-   inkscape:export-filename="/home/lsedlar/repos/pungi/doc/_static/phases.png"
-   sodipodi:docname="phases.svg"
-   inkscape:version="0.92.2 5c3e80d, 2017-08-06"
-   version="1.1"
-   id="svg2"
-   viewBox="0 0 669.66458 255.18195"
+   width="669.66455"
    height="255.18195"
-   width="669.66455">
+   viewBox="0 0 669.66458 255.18195"
+   id="svg2"
+   version="1.1"
+   inkscape:version="1.0 (4035a4f, 2020-05-01)"
+   sodipodi:docname="phases.svg"
+   inkscape:export-filename="/home/lsedlar/repos/pungi/doc/_static/phases.png"
+   inkscape:export-xdpi="90"
+   inkscape:export-ydpi="90">
   <sodipodi:namedview
-     fit-margin-bottom="0"
-     fit-margin-right="0"
-     fit-margin-left="0"
-     fit-margin-top="0"
-     inkscape:guide-bbox="true"
-     showguides="true"
-     inkscape:document-rotation="0"
-     units="px"
-     inkscape:window-maximized="1"
-     inkscape:window-y="1"
-     inkscape:window-x="0"
-     inkscape:window-height="1035"
-     inkscape:window-width="1920"
-     showgrid="false"
-     inkscape:current-layer="layer1"
-     inkscape:document-units="px"
-     inkscape:cy="127.3243"
-     inkscape:cx="420.82921"
-     inkscape:zoom="1.5"
-     inkscape:pageshadow="2"
-     inkscape:pageopacity="1"
-     borderopacity="1.0"
-     bordercolor="#666666"
+     id="base"
      pagecolor="#ffffff"
-     id="base" />
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="1"
+     inkscape:pageshadow="2"
+     inkscape:zoom="1.5"
+     inkscape:cx="420.82921"
+     inkscape:cy="127.3243"
+     inkscape:document-units="px"
+     inkscape:current-layer="layer1"
+     showgrid="false"
+     inkscape:window-width="1920"
+     inkscape:window-height="1035"
+     inkscape:window-x="0"
+     inkscape:window-y="23"
+     inkscape:window-maximized="1"
+     units="px"
+     inkscape:document-rotation="0"
+     showguides="true"
+     inkscape:guide-bbox="true"
+     fit-margin-top="0"
+     fit-margin-left="0"
+     fit-margin-right="0"
+     fit-margin-bottom="0" />
   <defs
      id="defs4">
     <marker
-       inkscape:stockid="Arrow1Lend"
-       orient="auto"
-       refY="0"
-       refX="0"
-       id="Arrow1Lend"
+       inkscape:isstock="true"
        style="overflow:visible"
-       inkscape:isstock="true">
+       id="Arrow1Lend"
+       refX="0"
+       refY="0"
+       orient="auto"
+       inkscape:stockid="Arrow1Lend">
       <path
-         id="path4451"
-         d="M 0,0 5,-5 -12.5,0 5,5 Z"
-         style="fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:1.00000003pt;stroke-opacity:1"
+         inkscape:connector-curvature="0"
          transform="matrix(-0.8,0,0,-0.8,-10,0)"
-         inkscape:connector-curvature="0" />
+         style="fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:1.00000003pt;stroke-opacity:1"
+         d="M 0,0 5,-5 -12.5,0 5,5 Z"
+         id="path4451" />
     </marker>
   </defs>
   <metadata
@@ -69,441 +69,442 @@
         <dc:format>image/svg+xml</dc:format>
         <dc:type
            rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title></dc:title>
+        <dc:title />
       </cc:Work>
     </rdf:RDF>
   </metadata>
   <g
-     inkscape:label="Vrstva 1"
-     inkscape:groupmode="layer"
+     transform="matrix(1.066667,0,0,1.066667,-78.473216,-910.85239)"
      id="layer1"
-     transform="matrix(1.066667,0,0,1.066667,-78.473216,-910.85239)">
+     inkscape:groupmode="layer"
+     inkscape:label="Vrstva 1">
     <g
-       id="g3411"
-       transform="translate(71.99326,-80.817124)">
+       transform="translate(98.243246,-80.817124)"
+       id="g3411">
       <rect
-         transform="matrix(0,1,1,0,0,0)"
-         y="49.250374"
-         x="953.49097"
-         height="49.214859"
-         width="26.295755"
+         style="fill:#8ae234;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
          id="rect3340"
-         style="fill:#8ae234;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
+         width="26.295755"
+         height="49.214859"
+         x="953.49097"
+         y="49.250374"
+         transform="matrix(0,1,1,0,0,0)" />
       <text
-         id="text3360"
-         y="970.26605"
+         xml:space="preserve"
+         style="font-style:normal;font-weight:normal;line-height:0%;font-family:sans-serif;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
          x="51.554729"
-         style="font-style:normal;font-weight:normal;line-height:0%;font-family:sans-serif;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-         xml:space="preserve"><tspan
-           style="font-size:13.14789963px;line-height:1.25"
-           y="970.26605"
-           x="51.554729"
-           id="tspan3362"
-           sodipodi:role="line">Pkgset</tspan></text>
-    </g>
-    <g
-       id="g3446"
-       transform="translate(-22.545013,-80.817124)">
-      <rect
-         transform="matrix(0,1,1,0,0,0)"
-         style="fill:#e9b96e;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-         id="rect3338-1"
-         width="26.295755"
-         height="115.80065"
-         x="953.49097"
-         y="554.10059" />
-      <text
-         id="text3384-0"
-         y="971.54041"
-         x="556.95709"
-         style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;line-height:0%;font-family:sans-serif;-inkscape-font-specification:'sans-serif, Normal';text-align:start;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-         xml:space="preserve"><tspan
-           style="font-size:13.14750004px;line-height:1.25"
-           id="tspan3391"
+         y="970.26605"
+         id="text3360"><tspan
            sodipodi:role="line"
-           x="556.95709"
-           y="971.54041">ImageChecksum</tspan></text>
+           id="tspan3362"
+           x="51.554729"
+           y="970.26605"
+           style="font-size:13.1479px;line-height:1.25">Pkgset</tspan></text>
     </g>
     <g
-       id="g3398"
-       transform="translate(101.37893,-80.817124)">
+       transform="translate(58.253953,-80.817124)"
+       id="g3398">
       <rect
-         transform="matrix(0,1,1,0,0,0)"
-         style="fill:#3465a4;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-         id="rect3400"
-         width="26.295755"
-         height="46.01757"
+         y="553.98242"
          x="953.49097"
-         y="553.98242" />
+         height="46.01757"
+         width="26.295755"
+         id="rect3400"
+         style="fill:#3465a4;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+         transform="matrix(0,1,1,0,0,0)" />
       <text
-         id="text3396"
-         y="971.33813"
-         x="557.61566"
+         xml:space="preserve"
          style="font-style:normal;font-weight:normal;line-height:0%;font-family:sans-serif;letter-spacing:0px;word-spacing:0px;fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-         xml:space="preserve"><tspan
-           style="font-size:13.14789963px;line-height:1.25"
-           y="971.33813"
-           x="557.61566"
+         x="557.61566"
+         y="971.33813"
+         id="text3396"><tspan
+           sodipodi:role="line"
            id="tspan3398"
-           sodipodi:role="line">Test</tspan></text>
+           x="557.61566"
+           y="971.33813"
+           style="font-size:13.1479px;line-height:1.25">Test</tspan></text>
     </g>
     <g
-       transform="translate(71.249964,-0.34404039)"
-       id="g3720">
+       id="g3720"
+       transform="translate(97.49995,-0.34404039)">
       <rect
-         transform="matrix(0,1,1,0,0,0)"
-         y="2.3186533"
-         x="873.01788"
-         height="39.669899"
-         width="26.295755"
+         style="fill:#fce94f;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
          id="rect3336"
-         style="fill:#fce94f;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
+         width="26.295755"
+         height="39.669899"
+         x="873.01788"
+         y="2.3186533"
+         transform="matrix(0,1,1,0,0,0)" />
       <text
-         id="text3356"
-         y="891.1604"
-         x="6.2600794"
+         xml:space="preserve"
          style="font-style:normal;font-weight:normal;line-height:0%;font-family:sans-serif;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-         xml:space="preserve"><tspan
-           style="font-size:13.14789963px;line-height:1.25"
-           y="891.1604"
-           x="6.2600794"
+         x="6.2600794"
+         y="891.1604"
+         id="text3356"><tspan
+           sodipodi:role="line"
            id="tspan3358"
-           sodipodi:role="line">Init</tspan></text>
+           x="6.2600794"
+           y="891.1604"
+           style="font-size:13.1479px;line-height:1.25">Init</tspan></text>
     </g>
     <path
-       style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:1.17466855px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;marker-end:url(#Arrow1Lend)"
-       d="M 100.90864,859.8891 H 654.22706"
+       inkscape:connector-curvature="0"
        id="path3642"
-       inkscape:connector-curvature="0" />
+       d="M 100.90864,859.8891 H 654.22706"
+       style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:1.17466855px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;marker-end:url(#Arrow1Lend)" />
     <g
-       transform="translate(75.925692,-0.34404039)"
-       id="g3668">
+       transform="translate(26.249988)"
+       id="g262">
       <g
-         id="g3663">
+         id="g234">
         <rect
-           style="fill:#fcaf3e;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+           transform="matrix(0,1,1,0,0,0)"
+           y="179.38934"
+           x="872.67383"
+           height="162.72726"
+           width="26.295755"
            id="rect3342"
-           width="26.295755"
-           height="231.47725"
-           x="873.01788"
-           y="103.46365"
-           transform="matrix(0,1,1,0,0,0)" />
+           style="fill:#fcaf3e;fill-rule:evenodd;stroke:none;stroke-width:0.838448px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
         <text
-           xml:space="preserve"
+           id="text3364"
+           y="890.72327"
+           x="181.69368"
            style="font-style:normal;font-weight:normal;line-height:0%;font-family:sans-serif;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-           x="105.76799"
-           y="891.06732"
-           id="text3364"><tspan
-             sodipodi:role="line"
+           xml:space="preserve"><tspan
+             style="font-size:13.1479px;line-height:1.25"
+             y="890.72327"
+             x="181.69368"
              id="tspan3366"
-             x="105.76799"
-             y="891.06732"
-             style="font-size:13.14789963px;line-height:1.25">Buildinstall</tspan></text>
+             sodipodi:role="line">Buildinstall</tspan></text>
       </g>
       <g
-         id="g3639">
+         id="g3639"
+         transform="translate(75.925692,-0.34404039)">
         <rect
-           style="fill:#729fcf;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-           id="rect3344"
-           width="26.295755"
-           height="54.197887"
-           x="905.2099"
+           transform="matrix(0,1,1,0,0,0)"
            y="103.28194"
-           transform="matrix(0,1,1,0,0,0)" />
+           x="905.2099"
+           height="54.197887"
+           width="26.295755"
+           id="rect3344"
+           style="fill:#729fcf;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
         <text
-           xml:space="preserve"
-           style="font-style:normal;font-weight:normal;line-height:0%;font-family:sans-serif;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-           x="106.1384"
+           id="text3368"
            y="923.25934"
-           id="text3368"><tspan
-             sodipodi:role="line"
-             id="tspan3370"
-             x="106.1384"
+           x="106.1384"
+           style="font-style:normal;font-weight:normal;line-height:0%;font-family:sans-serif;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+           xml:space="preserve"><tspan
+             style="font-size:13.1479px;line-height:1.25"
              y="923.25934"
-             style="font-size:13.14789963px;line-height:1.25">Gather</tspan></text>
+             x="106.1384"
+             id="tspan3370"
+             sodipodi:role="line">Gather</tspan></text>
       </g>
       <g
-         id="g3647"
-         transform="translate(-59.99997,63.749968)">
+         transform="translate(15.925722,63.405928)"
+         id="g3647">
         <g
            id="g3644">
           <rect
-             transform="matrix(0,1,1,0,0,0)"
-             y="162.92607"
-             x="905.2099"
-             height="72.729973"
-             width="26.295755"
+             style="fill:#ad7fa8;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
              id="rect3346"
-             style="fill:#ad7fa8;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
+             width="26.295755"
+             height="72.729973"
+             x="905.2099"
+             y="162.92607"
+             transform="matrix(0,1,1,0,0,0)" />
         </g>
         <text
-           xml:space="preserve"
-           style="font-style:normal;font-weight:normal;line-height:0%;font-family:sans-serif;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-           x="165.23042"
+           id="text3372"
            y="923.25934"
-           id="text3372"><tspan
-             sodipodi:role="line"
-             id="tspan3374"
-             x="165.23042"
-             y="923.25934"
-             style="font-size:13.1479px;line-height:1.25">ExtraFiles</tspan></text>
-      </g>
-      <g
-         id="g3658"
-         transform="translate(-78.74996)">
-        <rect
-           style="fill:#e9b96e;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-           id="rect3348"
-           width="26.295755"
-           height="78.636055"
-           x="905.2099"
-           y="241.10229"
-           transform="matrix(0,1,1,0,0,0)" />
-        <text
-           xml:space="preserve"
+           x="165.23042"
            style="font-style:normal;font-weight:normal;line-height:0%;font-family:sans-serif;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-           x="243.95874"
-           y="921.86945"
-           id="text3376"><tspan
-             sodipodi:role="line"
-             id="tspan3378"
-             x="243.95874"
-             y="921.86945"
-             style="font-size:13.1479px;line-height:1.25">Createrepo</tspan></text>
+           xml:space="preserve"><tspan
+             style="font-size:13.1479px;line-height:1.25"
+             y="923.25934"
+             x="165.23042"
+             id="tspan3374"
+             sodipodi:role="line">ExtraFiles</tspan></text>
       </g>
       <g
-         transform="translate(-150.564,114.11662)"
-         id="g3408">
+         transform="translate(-2.824268,-0.34404039)"
+         id="g3658">
         <rect
-           style="fill:#729fcf;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-           id="rect3350-3"
+           transform="matrix(0,1,1,0,0,0)"
+           y="241.10229"
+           x="905.2099"
+           height="78.636055"
            width="26.295755"
-           height="53.653927"
-           x="823.54675"
-           y="254.60153"
-           transform="matrix(0,1,1,0,0,0)" />
+           id="rect3348"
+           style="fill:#e9b96e;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
         <text
-           xml:space="preserve"
-           style="font-style:normal;font-weight:normal;line-height:0%;font-family:sans-serif;text-align:start;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-           x="256.90588"
-           y="840.3219"
-           id="text3380-2"><tspan
-             y="840.3219"
-             x="256.90588"
-             sodipodi:role="line"
-             id="tspan3406"
-             style="font-size:13.14789963px;line-height:1.25">OSTree</tspan></text>
+           id="text3376"
+           y="921.86945"
+           x="243.95874"
+           style="font-style:normal;font-weight:normal;line-height:0%;font-family:sans-serif;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+           xml:space="preserve"><tspan
+             style="font-size:13.1479px;line-height:1.25"
+             y="921.86945"
+             x="243.95874"
+             id="tspan3378"
+             sodipodi:role="line">Createrepo</tspan></text>
       </g>
       <g
-         id="g288"
-         transform="translate(-328.39105,-85.517823)">
+         id="g3408"
+         transform="translate(-74.638308,113.77258)">
+        <rect
+           transform="matrix(0,1,1,0,0,0)"
+           y="254.60153"
+           x="823.54675"
+           height="53.653927"
+           width="26.295755"
+           id="rect3350-3"
+           style="fill:#729fcf;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
+        <text
+           id="text3380-2"
+           y="840.3219"
+           x="256.90588"
+           style="font-style:normal;font-weight:normal;line-height:0%;font-family:sans-serif;text-align:start;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+           xml:space="preserve"><tspan
+             style="font-size:13.1479px;line-height:1.25"
+             id="tspan3406"
+             sodipodi:role="line"
+             x="256.90588"
+             y="840.3219">OSTree</tspan></text>
+      </g>
+      <g
+         transform="translate(-252.46536,-85.861863)"
+         id="g288">
         <g
-           id="g3653"
-           transform="translate(0.56706579)">
+           transform="translate(0.56706579)"
+           id="g3653">
           <rect
-             transform="matrix(0,1,1,0,0,0)"
-             y="490.33765"
-             x="1022.637"
-             height="101.85102"
-             width="26.295755"
+             style="fill:#fcaf3e;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
              id="rect3428"
-             style="fill:#fcaf3e;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
+             width="26.295755"
+             height="101.85102"
+             x="1022.637"
+             y="490.33765"
+             transform="matrix(0,1,1,0,0,0)" />
           <text
-             id="text3430"
-             y="1039.4121"
-             x="492.642"
+             xml:space="preserve"
              style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;line-height:0%;font-family:sans-serif;-inkscape-font-specification:'sans-serif, Normal';text-align:start;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-             xml:space="preserve"><tspan
-               style="font-size:12px;line-height:0"
-               y="1039.4121"
-               x="492.642"
+             x="492.642"
+             y="1039.4121"
+             id="text3430"><tspan
+               id="tspan283"
                sodipodi:role="line"
-               id="tspan283">OSTreeInstaller</tspan></text>
+               x="492.642"
+               y="1039.4121"
+               style="font-size:12px;line-height:0">OSTreeInstaller</tspan></text>
         </g>
       </g>
     </g>
     <g
-       id="g1061">
+       transform="translate(-41.24998)"
+       id="g300">
       <g
-         id="g3458"
-         transform="translate(-0.959604,-80.817124)">
-        <rect
-           y="420.13605"
-           x="953.49097"
-           height="102.36562"
-           width="26.295755"
-           id="rect3338"
-           style="fill:#edd400;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-           transform="matrix(0,1,1,0,0,0)" />
-        <text
-           xml:space="preserve"
-           style="font-style:normal;font-weight:normal;line-height:0%;font-family:sans-serif;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-           x="422.99252"
-           y="971.54041"
-           id="text3384"><tspan
-             style="font-size:13.14789963px;line-height:1.25"
-             sodipodi:role="line"
-             id="tspan3386"
-             x="422.99252"
-             y="971.54041">Createiso</tspan></text>
-      </g>
-      <g
-         transform="translate(-1.216051,-84.525321)"
-         id="g3453">
-        <rect
-           style="fill:#73d216;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-           id="rect3352"
-           width="26.295755"
-           height="101.85102"
-           x="989.65247"
-           y="420.39337"
-           transform="matrix(0,1,1,0,0,0)" />
-        <text
-           xml:space="preserve"
-           style="font-style:normal;font-weight:normal;line-height:0%;font-family:sans-serif;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-           x="422.69772"
-           y="1006.4276"
-           id="text3388"><tspan
-             style="font-size:13.14789963px;line-height:1.25"
-             sodipodi:role="line"
-             id="tspan3390"
-             x="422.69772"
-             y="1006.4276">LiveImages</tspan></text>
-      </g>
-      <g
-         transform="translate(-1.216051,-88.485966)"
-         id="g3448">
-        <rect
-           style="fill:#f57900;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-           id="rect3354"
-           width="26.295755"
-           height="101.85102"
-           x="1026.0664"
-           y="420.39337"
-           transform="matrix(0,1,1,0,0,0)" />
-        <text
-           xml:space="preserve"
-           style="font-style:normal;font-weight:normal;line-height:0%;font-family:sans-serif;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-           x="422.69772"
-           y="1042.8416"
-           id="text3392"><tspan
-             style="font-size:13.14789963px;line-height:1.25"
-             sodipodi:role="line"
-             id="tspan3394"
-             x="422.69772"
-             y="1042.8416">ImageBuild</tspan></text>
-      </g>
-      <g
-         transform="translate(-1.923143,-92.80219)"
-         id="g3443">
+         id="g162">
         <rect
            transform="matrix(0,1,1,0,0,0)"
-           y="421.10046"
-           x="1062.8359"
-           height="101.85102"
-           width="26.295755"
-           id="rect3422"
-           style="fill:#edd400;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
+           style="fill:#e9b96e;fill-rule:evenodd;stroke:none;stroke-width:2.42332px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+           id="rect3338-1"
+           width="154.42072"
+           height="115.80065"
+           x="872.67383"
+           y="527.8056" />
         <text
-           id="text3424"
-           y="1079.6111"
-           x="423.40482"
-           style="font-style:normal;font-weight:normal;line-height:0%;font-family:sans-serif;text-align:start;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-           xml:space="preserve"><tspan
-             style="font-size:13.14789963px;line-height:1.25"
-             y="1079.6111"
-             x="423.40482"
-             sodipodi:role="line"
-             id="tspan3434">LiveMedia</tspan></text>
-      </g>
-      <g
-         id="g204">
-        <rect
-           transform="matrix(0,1,1,0,0,0)"
-           y="419.17731"
-           x="1002.4871"
-           height="101.85102"
-           width="26.295755"
-           id="rect290"
-           style="fill:#c17d11;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
-        <text
-           id="text294"
-           y="1019.2621"
-           x="421.48166"
+           id="text3384-0"
+           y="950.72327"
+           x="530.66211"
            style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;line-height:0%;font-family:sans-serif;-inkscape-font-specification:'sans-serif, Normal';text-align:start;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
            xml:space="preserve"><tspan
-             style="font-size:12px;line-height:0"
-             id="tspan301"
+             style="font-size:13.1475px;line-height:1.25"
+             id="tspan3391"
              sodipodi:role="line"
-             x="421.48166"
-             y="1019.2621">OSBS</tspan></text>
+             x="530.66211"
+             y="950.72327">ImageChecksum</tspan></text>
       </g>
       <g
-         id="g3819"
-         transform="translate(-29.683562,-17.293167)">
+         transform="translate(-0.959604,-80.817124)"
+         id="g3458">
         <rect
            transform="matrix(0,1,1,0,0,0)"
-           y="448.86087"
-           x="1052.2335"
+           style="fill:#edd400;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+           id="rect3338"
+           width="26.295755"
+           height="102.36562"
+           x="953.49097"
+           y="420.13605" />
+        <text
+           id="text3384"
+           y="971.54041"
+           x="422.99252"
+           style="font-style:normal;font-weight:normal;line-height:0%;font-family:sans-serif;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+           xml:space="preserve"><tspan
+             y="971.54041"
+             x="422.99252"
+             id="tspan3386"
+             sodipodi:role="line"
+             style="font-size:13.1479px;line-height:1.25">Createiso</tspan></text>
+      </g>
+      <g
+         id="g3453"
+         transform="translate(-1.216051,-84.525321)">
+        <rect
+           transform="matrix(0,1,1,0,0,0)"
+           y="420.39337"
+           x="989.65247"
            height="101.85102"
            width="26.295755"
-           id="rect3801"
+           id="rect3352"
            style="fill:#73d216;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
         <text
-           id="text3805"
-           y="1069.0087"
+           id="text3388"
+           y="1006.4276"
+           x="422.69772"
+           style="font-style:normal;font-weight:normal;line-height:0%;font-family:sans-serif;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+           xml:space="preserve"><tspan
+             y="1006.4276"
+             x="422.69772"
+             id="tspan3390"
+             sodipodi:role="line"
+             style="font-size:13.1479px;line-height:1.25">LiveImages</tspan></text>
+      </g>
+      <g
+         id="g3448"
+         transform="translate(-1.216051,-88.485966)">
+        <rect
+           transform="matrix(0,1,1,0,0,0)"
+           y="420.39337"
+           x="1026.0664"
+           height="101.85102"
+           width="26.295755"
+           id="rect3354"
+           style="fill:#f57900;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
+        <text
+           id="text3392"
+           y="1042.8416"
+           x="422.69772"
+           style="font-style:normal;font-weight:normal;line-height:0%;font-family:sans-serif;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+           xml:space="preserve"><tspan
+             y="1042.8416"
+             x="422.69772"
+             id="tspan3394"
+             sodipodi:role="line"
+             style="font-size:13.1479px;line-height:1.25">ImageBuild</tspan></text>
+      </g>
+      <g
+         id="g3443"
+         transform="translate(-1.923143,-92.80219)">
+        <rect
+           style="fill:#edd400;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+           id="rect3422"
+           width="26.295755"
+           height="101.85102"
+           x="1062.8359"
+           y="421.10046"
+           transform="matrix(0,1,1,0,0,0)" />
+        <text
+           xml:space="preserve"
+           style="font-style:normal;font-weight:normal;line-height:0%;font-family:sans-serif;text-align:start;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+           x="423.40482"
+           y="1079.6111"
+           id="text3424"><tspan
+             id="tspan3434"
+             sodipodi:role="line"
+             x="423.40482"
+             y="1079.6111"
+             style="font-size:13.1479px;line-height:1.25">LiveMedia</tspan></text>
+      </g>
+      <g
+         id="g145">
+        <rect
+           style="fill:#c17d11;fill-rule:evenodd;stroke:none;stroke-width:1.48416px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+           id="rect290"
+           width="26.295755"
+           height="224.35098"
+           x="1034.3621"
+           y="419.17731"
+           transform="matrix(0,1,1,0,0,0)" />
+        <text
+           xml:space="preserve"
+           style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;line-height:0%;font-family:sans-serif;-inkscape-font-specification:'sans-serif, Normal';text-align:start;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+           x="421.48166"
+           y="1051.1371"
+           id="text294"><tspan
+             y="1051.1371"
+             x="421.48166"
+             sodipodi:role="line"
+             id="tspan301"
+             style="font-size:12px;line-height:0">OSBS</tspan></text>
+      </g>
+      <g
+         transform="translate(-29.683562,-51.043149)"
+         id="g3819">
+        <rect
+           style="fill:#73d216;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+           id="rect3801"
+           width="26.295755"
+           height="101.85102"
+           x="1052.2335"
+           y="448.86087"
+           transform="matrix(0,1,1,0,0,0)" />
+        <text
+           xml:space="preserve"
+           style="font-style:normal;font-weight:normal;line-height:0%;font-family:sans-serif;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
            x="451.16522"
-           style="font-style:normal;font-weight:normal;line-height:0%;font-family:sans-serif;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-           xml:space="preserve"><tspan
-             id="tspan3812"
-             y="1069.0087"
+           y="1069.0087"
+           id="text3805"><tspan
+             style="font-size:13.1479px;line-height:1.25"
+             sodipodi:role="line"
              x="451.16522"
-             sodipodi:role="line"
-             style="font-size:13.14789963px;line-height:1.25">ExtraIsos</tspan></text>
+             y="1069.0087"
+             id="tspan3812">ExtraIsos</tspan></text>
       </g>
       <g
-         id="g1031">
-        <rect
-           transform="matrix(0,1,1,0,0,0)"
-           style="fill:#5ed4ec;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-           id="rect206"
-           width="26.295755"
-           height="102.36562"
-           x="1066.8611"
-           y="418.66275" />
-        <text
-           id="text210"
-           y="1084.9105"
-           x="421.51923"
-           style="font-style:normal;font-weight:normal;line-height:0%;font-family:sans-serif;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-           xml:space="preserve"><tspan
+         id="g157">
+        <g
+           id="g1031">
+          <rect
+             transform="matrix(0,1,1,0,0,0)"
+             style="fill:#5ed4ec;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+             id="rect206"
+             width="26.295755"
+             height="102.36562"
+             x="1066.8611"
+             y="418.66275" />
+          <text
+             id="text210"
              y="1084.9105"
              x="421.51923"
-             id="tspan208"
-             sodipodi:role="line"
-             style="font-size:13.14789963px;line-height:1.25">Repoclosure</tspan></text>
-      </g>
-      <g
-         id="g1031">
+             style="font-style:normal;font-weight:normal;line-height:0%;font-family:sans-serif;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+             xml:space="preserve"><tspan
+               y="1084.9105"
+               x="421.51923"
+               id="tspan208"
+               sodipodi:role="line"
+               style="font-size:13.1479px;line-height:1.25">Repoclosure</tspan></text>
+        </g>
         <rect
-           transform="matrix(0,1,1,0,0,0)"
-           style="fill:#5ed4ec;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-           id="rect206"
-           width="26.295755"
-           height="102.36562"
+           y="418.66275"
            x="1066.8611"
-           y="418.66275" />
+           height="224.24059"
+           width="26.295755"
+           id="rect87"
+           style="fill:#5ed4ec;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1.48006px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+           transform="matrix(0,1,1,0,0,0)" />
         <text
-           id="text210"
-           y="1084.9105"
-           x="421.51923"
+           xml:space="preserve"
            style="font-style:normal;font-weight:normal;line-height:0%;font-family:sans-serif;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-           xml:space="preserve"><tspan
-             y="1084.9105"
-             x="421.51923"
-             id="tspan208"
+           x="421.51923"
+           y="1084.9105"
+           id="text91"><tspan
+             style="font-size:13.1479px;line-height:1.25"
              sodipodi:role="line"
-             style="font-size:13.1479px;line-height:1.25">Repoclosure</tspan></text>
+             id="tspan89"
+             x="421.51923"
+             y="1084.9105">Repoclosure</tspan></text>
       </g>
     </g>
   </g>
diff --git a/pungi/scripts/pungi_koji.py b/pungi/scripts/pungi_koji.py
index 253b2c49..1fab656c 100644
--- a/pungi/scripts/pungi_koji.py
+++ b/pungi/scripts/pungi_koji.py
@@ -460,22 +460,24 @@ def run_compose(
             timestamp = pungi.metadata.write_discinfo(compose, arch, variant)
             pungi.metadata.write_media_repo(compose, arch, variant, timestamp)
 
-    # Start all phases for image artifacts
+    # Run phases for image artifacts in parallel
     compose_images_schema = (
         createiso_phase,
         extra_isos_phase,
         liveimages_phase,
         image_build_phase,
         livemedia_phase,
+    )
+    compose_images_phase = pungi.phases.WeaverPhase(compose, compose_images_schema)
+    extra_phase_schema = (
+        (compose_images_phase, image_checksum_phase),
         osbs_phase,
         repoclosure_phase,
     )
-    compose_images_phase = pungi.phases.WeaverPhase(compose, compose_images_schema)
-    compose_images_phase.start()
-    compose_images_phase.stop()
+    extra_phase = pungi.phases.WeaverPhase(compose, extra_phase_schema)
 
-    image_checksum_phase.start()
-    image_checksum_phase.stop()
+    extra_phase.start()
+    extra_phase.stop()
 
     pungi.metadata.write_compose_info(compose)
     if not (