diff --git a/build-scripts/package-msi b/build-scripts/package-msi
index d8320a057..fce07d99e 100755
--- a/build-scripts/package-msi
+++ b/build-scripts/package-msi
@@ -120,6 +120,7 @@ pre() {
     # Copy default leech2 config (ENT-14100)
     install -d "$P"/.leech2
     install -m 644 "$BASEDIR"/cfengine/dist"$BUILDPREFIX"/.leech2/config.json "$P"/.leech2/
+    install -m 644 "$BASEDIR"/cfengine/dist"$BUILDPREFIX"/.leech2/containers-mapping.json "$P"/.leech2/
 
     # Copy WiX source file for MSI generation
     cp "$BASEDIR"/buildscripts/packaging/cfengine-nova/cfengine-nova.wxs "$P"
diff --git a/packaging/cfengine-nova/cfengine-nova.wxs b/packaging/cfengine-nova/cfengine-nova.wxs
index d10b4d017..aedba9fbb 100644
--- a/packaging/cfengine-nova/cfengine-nova.wxs
+++ b/packaging/cfengine-nova/cfengine-nova.wxs
@@ -183,6 +183,9 @@
               <Component Id='leech2_config.json' Guid='1781E340-7772-4715-833D-DFAAE22A83EF' Win64='$(var.isWin64)'>
                 <File Id='leech2_config.json' Name='config.json' KeyPath='yes' DiskId='1' Source='$(var.CfSourceDir)\.leech2\config.json' />
               </Component>
+              <Component Id='leech2_containers_mapping.json' Guid='5A8C0942-B51D-448D-9A81-1459BC79A9C7' Win64='$(var.isWin64)'>
+                <File Id='leech2_containers_mapping.json' Name='containers-mapping.json' KeyPath='yes' DiskId='1' Source='$(var.CfSourceDir)\.leech2\containers-mapping.json' />
+              </Component>
             </Directory>
           </Directory>
         </Directory>
@@ -230,6 +233,7 @@
 	    <ComponentRef Id='openssl.cnf' />
 
 	    <ComponentRef Id='leech2_config.json' />
+	    <ComponentRef Id='leech2_containers_mapping.json' />
       </Feature>
 
       <UI>