diff --git a/src/pages/[...topicId].astro b/src/pages/[roadmapId]/[...topicId].astro
similarity index 59%
rename from src/pages/[...topicId].astro
rename to src/pages/[roadmapId]/[...topicId].astro
index 404e3a5c5..e205eae1e 100644
--- a/src/pages/[...topicId].astro
+++ b/src/pages/[roadmapId]/[...topicId].astro
@@ -1,16 +1,25 @@
 ---
-import Breadcrumbs from '../components/Breadcrumbs.astro';
-import RoadmapBanner from '../components/RoadmapBanner.astro';
-import BaseLayout from '../layouts/BaseLayout.astro';
-import { getTopicFiles, TopicFileType } from '../lib/topic';
+import Breadcrumbs from '../../components/Breadcrumbs.astro';
+import RoadmapBanner from '../../components/RoadmapBanner.astro';
+import BaseLayout from '../../layouts/BaseLayout.astro';
+import { getTopicFiles, TopicFileType } from '../../lib/topic';
 
 export async function getStaticPaths() {
   const topicPathMapping = await getTopicFiles();
 
-  return Object.keys(topicPathMapping).map((topicSlug) => ({
-    params: { topicId: topicSlug.replace(/^\//, '') },
-    props: topicPathMapping[topicSlug],
-  }));
+  return Object.keys(topicPathMapping).map((topicSlug) => {
+    const topicDetails = topicPathMapping[topicSlug];
+    const roadmapId = topicDetails.roadmapId;
+    const topicId = topicSlug.replace(`/${roadmapId}/`, '');
+
+    return {
+      params: {
+        topicId,
+        roadmapId,
+      },
+      props: topicDetails,
+    };
+  });
 }
 
 const { topicId } = Astro.params;