diff --git a/src/core/runtime/src/store-stack-output-step.ts b/src/core/runtime/src/store-stack-output-step.ts
index d3d1de0eb..9864d2c27 100644
--- a/src/core/runtime/src/store-stack-output-step.ts
+++ b/src/core/runtime/src/store-stack-output-step.ts
@@ -44,10 +44,16 @@ export const handler = async (input: StoreStackOutputInput) => {
 
   const outputs: StackOutput[] = [];
   for await (const summary of stacks) {
-    if (!summary.StackName.match(`${acceleratorPrefix}(.*)-Phase${phaseNumber}`)) {
+    if (!summary.StackName.match(`${acceleratorPrefix}(.*)-Phase${phaseNumber}`) && !summary.ParentId) {
       console.warn(`Skipping stack with name "${summary.StackName}"`);
       continue;
     }
+    if (summary.ParentId) {
+      if (!summary.ParentId.match(`${acceleratorPrefix}(.*)-Phase${phaseNumber}`)) {
+        console.warn(`Skipping stack with name "${summary.StackName}"`);
+        continue;
+      }
+    }
     const stack = await cfn.describeStack(summary.StackName);
     if (!stack) {
       console.warn(`Could not load stack with name "${summary.StackName}"`);