diff --git a/common/modules/pkgselect/PackageSelectViewStep.cpp b/common/modules/pkgselect/PackageSelectViewStep.cpp
index 6cae74c..0bc6da3 100644
--- a/common/modules/pkgselect/PackageSelectViewStep.cpp
+++ b/common/modules/pkgselect/PackageSelectViewStep.cpp
@@ -324,6 +324,23 @@ void PackageSelectViewStep::onLeave()
             presentSnapList.append(snapId);
         }
 
+        // As a temporary measure until OEM is refactored in the 25.10 cycle,
+        // we need to ensure that Calamares and its necessary dependencies are
+        // installed on the target, iff this is a stacked squashfs.
+        // FIXME: remove in favor of more nuanced stacked squashfs
+        // functionality in 25.10
+        // Ref: https://discourse.ubuntu.com/t/implementation-of-ship-live-within-a-squashfs/57510
+        //      LP: #2104343
+        if (isStackedSquashfs) {
+            QVector<QString> stage_two_packages = {"calamares", "kdialog"};
+            for (QString& package_name : stage_two_packages) {
+                QVariantMap package_details;
+                package_details.insert("id", package_name);
+                package_details.insert("snap", false);
+                selectedPackagesList.append(package_details);
+            }
+        }
+
         globalData.insert("packages_to_install", selectedPackagesList);
         if (!isStackedSquashfs) {
             QVariantList installerPackages = m_configurationMap.value("packages").toMap().value("installer_remove_packages").toList();
diff --git a/debian/changelog b/debian/changelog
index abbf370..0527c76 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -6,6 +6,13 @@ calamares-settings-ubuntu (1:25.04.25) UNRELEASED; urgency=medium
     this list, use FindGrp instead of FindPkg, and only add it to the list if
     there is a valid candidate. Additionally, add these items to an unordered
     set, to eliminate deduplication (LP: #2106773).
+  * [pkgselect] As a temporary measure until OEM is refactored in the 25.10
+    cycle, we need to ensure that Calamares and its necessary dependencies are
+    installed on the target, iff this is a stacked squashfs. We're doing this
+    in pkgselect instead of pkgselectprocess because pkgselect already knows
+    about stacked squashfses, it's what provides the final "additional install
+    list" to be considered by checkpackage-backend, and this is a temporary
+    fix anyway (LP: #2104343).
 
  -- Simon Quigley <tsimonq2@ubuntu.com>  Sat, 12 Apr 2025 00:23:39 -0500