diff --git a/CHANGELOG.md b/CHANGELOG.md
index e29d71880f7..fa38a14b3f8 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,2 +1,3 @@
 - Fix Next.js dynamic and static OG images. (#6592)
 - Address a regression introduced in 13.0.1 when emulating Vite applications. (#6599)
+- Add RSC headers of Next.js app directory pages to Hosting headers. (#6608)
diff --git a/scripts/webframeworks-deploy-tests/tests.ts b/scripts/webframeworks-deploy-tests/tests.ts
index 8f3c75287d5..4cf69096f46 100644
--- a/scripts/webframeworks-deploy-tests/tests.ts
+++ b/scripts/webframeworks-deploy-tests/tests.ts
@@ -131,6 +131,36 @@ describe("webframeworks", function (this) {
                   },
                 ],
               },
+              {
+                headers: [
+                  {
+                    key: "x-next-cache-tags",
+                    value:
+                      "_N_T_/layout,_N_T_/app/layout,_N_T_/app/image/layout,_N_T_/app/image/page,_N_T_/app/image",
+                  },
+                ],
+                source: "/base/app/image",
+              },
+              {
+                headers: [
+                  {
+                    key: "x-next-cache-tags",
+                    value:
+                      "_N_T_/layout,_N_T_/app/layout,_N_T_/app/ssg/layout,_N_T_/app/ssg/page,_N_T_/app/ssg",
+                  },
+                ],
+                source: "/base/app/ssg",
+              },
+              {
+                headers: [
+                  {
+                    key: "x-next-cache-tags",
+                    value:
+                      "_N_T_/layout,_N_T_/app/layout,_N_T_/app/isr/layout,_N_T_/app/isr/page,_N_T_/app/isr",
+                  },
+                ],
+                source: "/base/app/isr",
+              },
             ],
             cleanUrls: true,
             trailingSlash: false,
diff --git a/src/frameworks/next/utils.ts b/src/frameworks/next/utils.ts
index 94b23b40a25..32ff9325e7b 100644
--- a/src/frameworks/next/utils.ts
+++ b/src/frameworks/next/utils.ts
@@ -363,7 +363,7 @@ export async function getHeadersFromMetaFiles(
 
   await Promise.all(
     Object.entries(appPathRoutesManifest).map(async ([key, source]) => {
-      if (basename(key) !== "route") return;
+      if (!["route", "page"].includes(basename(key))) return;
       const parts = source.split("/").filter((it) => !!it);
       const partsOrIndex = parts.length > 0 ? parts : ["index"];