diff --git a/app-config.yaml b/app-config.yaml
index b8506429b4..b3ca3c7203 100644
--- a/app-config.yaml
+++ b/app-config.yaml
@@ -283,12 +283,6 @@ catalog:
     # Backstage end-to-end tests of TechDocs
     - type: file
       target: ../../cypress/e2e-fixture.catalog.info.yaml
-
-    - type: file
-      target: '../../template-test.yaml'
-
-    - type: url
-      target: https://github.com/benjdlambert/software-templates/blob/main/scaffolder-templates/react-ssr-template/template.yaml
 scaffolder:
   # Use to customize default commit author info used when new components are created
   # defaultAuthor:
diff --git a/packages/app/src/App.tsx b/packages/app/src/App.tsx
index e17e0e80a8..befd3274f3 100644
--- a/packages/app/src/App.tsx
+++ b/packages/app/src/App.tsx
@@ -59,7 +59,7 @@ import { LighthousePage } from '@backstage/plugin-lighthouse';
 import { NewRelicPage } from '@backstage/plugin-newrelic';
 import {
   ScaffolderFieldExtensions,
-  NextScaffolderPage,
+  ScaffolderPage,
   scaffolderPlugin,
 } from '@backstage/plugin-scaffolder';
 import { SearchPage } from '@backstage/plugin-search';
@@ -178,7 +178,7 @@ const routes = (
     <Route
       path="/create"
       element={
-        <NextScaffolderPage
+        <ScaffolderPage
           groups={[
             {
               title: 'Recommended',