diff --git a/packages/app/src/App.tsx b/packages/app/src/App.tsx
index 4dacbbc007..81e8769951 100644
--- a/packages/app/src/App.tsx
+++ b/packages/app/src/App.tsx
@@ -27,7 +27,7 @@ import {
   RELATION_PROVIDES_API,
 } from '@backstage/catalog-model';
 import { createApp } from '@backstage/app-defaults';
-import { AppRouter, FlatRoutes } from '@backstage/core-app-api';
+import { AppRouter, FeatureFlagged, FlatRoutes } from '@backstage/core-app-api';
 import {
   AlertDisplay,
   OAuthRequestDialog,
@@ -208,49 +208,59 @@ const routes = (
         <LightBox />
       </TechDocsAddons>
     </Route>
-    <Route
-      path="/create"
-      element={
-        <ScaffolderPage
-          defaultPreviewTemplate={defaultPreviewTemplate}
-          groups={[
-            {
-              title: 'Recommended',
-              filter: entity =>
-                entity?.metadata?.tags?.includes('recommended') ?? false,
-            },
-          ]}
-        />
-      }
-    >
-      <ScaffolderFieldExtensions>
-        <LowerCaseValuePickerFieldExtension />
-      </ScaffolderFieldExtensions>
-      <ScaffolderLayouts>
-        <TwoColumnLayout />
-      </ScaffolderLayouts>
-    </Route>
-    <Route
-      path="/create/next"
-      element={
-        <NextScaffolderPage
-          groups={[
-            {
-              title: 'Recommended',
-              filter: entity =>
-                entity?.metadata?.tags?.includes('recommended') ?? false,
-            },
-          ]}
-        />
-      }
-    >
-      <ScaffolderFieldExtensions>
-        <DelayingComponentFieldExtension />
-      </ScaffolderFieldExtensions>
-      <ScaffolderLayouts>
-        <TwoColumnLayout />
-      </ScaffolderLayouts>
-    </Route>
+
+    <FeatureFlagged with="scaffolder-next">
+      <Route
+        path="/create"
+        element={
+          <>
+            <NextScaffolderPage
+              groups={[
+                {
+                  title: 'Recommended',
+                  filter: entity =>
+                    entity?.metadata?.tags?.includes('recommended') ?? false,
+                },
+              ]}
+            />
+          </>
+        }
+      >
+        <ScaffolderFieldExtensions>
+          <DelayingComponentFieldExtension />
+        </ScaffolderFieldExtensions>
+        <ScaffolderLayouts>
+          <TwoColumnLayout />
+        </ScaffolderLayouts>
+      </Route>
+    </FeatureFlagged>
+
+    <FeatureFlagged without="scaffolder-next">
+      <Route
+        path="/create"
+        element={
+          <>
+            <ScaffolderPage
+              groups={[
+                {
+                  title: 'Recommended',
+                  filter: entity =>
+                    entity?.metadata?.tags?.includes('recommended') ?? false,
+                },
+              ]}
+            />
+          </>
+        }
+      >
+        <ScaffolderFieldExtensions>
+          <DelayingComponentFieldExtension />
+        </ScaffolderFieldExtensions>
+        <ScaffolderLayouts>
+          <TwoColumnLayout />
+        </ScaffolderLayouts>
+      </Route>
+    </FeatureFlagged>
+
     <Route path="/explore" element={<ExplorePage />} />
     <Route
       path="/tech-radar"