diff --git a/resource/composer-templates/mage-os/magento2-base/template.json b/resource/composer-templates/mage-os/magento2-base/template.json
index 3d392cc2..176351c3 100644
--- a/resource/composer-templates/mage-os/magento2-base/template.json
+++ b/resource/composer-templates/mage-os/magento2-base/template.json
@@ -367,6 +367,10 @@
         "lib/web/fotorama",
         "lib/web/fotorama"
       ],
+      [
+        "lib/web/hugerte",
+        "lib/web/hugerte"
+      ],
       [
         "lib/web/i18n",
         "lib/web/i18n"
@@ -443,10 +447,6 @@
         "lib/web/spacer.gif",
         "lib/web/spacer.gif"
       ],
-      [
-        "lib/web/tiny_mce_6",
-        "lib/web/tiny_mce_6"
-      ],
       [
         "lib/web/underscore.js",
         "lib/web/underscore.js"
diff --git a/resource/composer-templates/mage-os/product-community-edition/dependencies-template.json b/resource/composer-templates/mage-os/product-community-edition/dependencies-template.json
index 32d93c25..54d8a36d 100644
--- a/resource/composer-templates/mage-os/product-community-edition/dependencies-template.json
+++ b/resource/composer-templates/mage-os/product-community-edition/dependencies-template.json
@@ -1,9 +1,16 @@
 {
   "dependencies": {
+    "aligent/magento2-pci-4-compatibility": "https://github.com/aligent/magento2-pci-4-compatibility.git",
     "creatuity/magento2-interceptors": "https://github.com/creatuity/magento2-interceptors.git",
     "mage-os/inventory-metapackage": "https://github.com/mage-os/mageos-inventory.git",
+    "mage-os/module-automatic-translation": "https://github.com/mage-os/module-automatic-translation.git",
+    "mage-os/module-inventory-reservations-grid": "https://github.com/mage-os/module-inventory-reservations-grid.git",
+    "mage-os/module-meta-robots-tag": "https://github.com/mage-os/module-meta-robots-tag.git",
+    "mage-os/module-page-builder-template-import-export": "https://github.com/mage-os/module-pagebuilder-template-import-export.git",
+    "mage-os/module-page-builder-widget": "https://github.com/mage-os/module-page-builder-widget.git",
+    "mage-os/module-theme-optimization": "https://github.com/mage-os/module-theme-optimization.git",
     "mage-os/page-builder": "https://github.com/mage-os/mageos-magento2-page-builder.git",
     "mage-os/security-package": "https://github.com/mage-os/mageos-security-package.git",
-    "mage-os/theme-adminhtml-m137": "https://github.com/mage-os-lab/theme-adminhtml-m137.git"
+    "mage-os/theme-adminhtml-m137": "https://github.com/mage-os/theme-adminhtml-m137.git"
   }
 }
diff --git a/src/package-modules.js b/src/package-modules.js
index d77d866b..bdb68b88 100644
--- a/src/package-modules.js
+++ b/src/package-modules.js
@@ -253,6 +253,8 @@ async function createPackageForRef(instruction, package, release) {
   if (!excludes.includes('composer.json')) excludes.push('composer.json');
   if (!excludes.includes('.git/')) excludes.push('.git/');
 
+  package.composerJsonFile ??= package.composerJsonPath;
+
   let magentoName = lastTwoDirs(package.dir) || '';
   const composerJson = await getComposerJson(instruction, package, release.ref);
 
diff --git a/src/release-build-tools.js b/src/release-build-tools.js
index 5ce09db2..c59ae006 100644
--- a/src/release-build-tools.js
+++ b/src/release-build-tools.js
@@ -224,6 +224,9 @@ function updateComposerConfigFromMagentoToMageOs(instruction, release, composerC
 async function prepPackageForRelease(instruction, package, release, workingCopyPath) {
   console.log(`Preparing ${package.label}`);
 
+  // Reset value in case it was set during history mirroring
+  package.composerJsonFile = null;
+
   const composerConfig = JSON.parse(await readComposerJson(instruction.repoUrl, package.dir, release.ref));
   updateComposerConfigFromMagentoToMageOs(instruction, release, composerConfig);