diff --git a/docs/features/software-templates/configuration.md b/docs/features/software-templates/configuration.md
index bbf35557ce..c266fa1217 100644
--- a/docs/features/software-templates/configuration.md
+++ b/docs/features/software-templates/configuration.md
@@ -107,29 +107,6 @@ Default secrets are resolved from environment variables and accessible via `${{
 
 **Security Note:** Secrets are automatically masked in logs and are only available to backend actions, never exposed to the frontend.
 
-## Disabling Docker in Docker situation (Optional)
-
-Software templates use the `fetch:template` action by default, which requires no
-external dependencies and offers a
-[Cookiecutter-compatible mode](https://backstage.io/docs/features/software-templates/builtin-actions#using-cookiecuttercompat-mode).
-There is also a `fetch:cookiecutter` action, which uses
-[Cookiecutter](https://github.com/cookiecutter/cookiecutter) directly for
-templating. By default, the `fetch:cookiecutter` action will use the
-[scaffolder-backend/Cookiecutter](https://github.com/backstage/backstage/blob/master/plugins/scaffolder-backend/scripts/Cookiecutter.dockerfile)
-docker image.
-
-If you are running Backstage from a Docker container and you want to avoid
-calling a container inside a container, you can set up Cookiecutter in your own
-image, this will use the local installation instead.
-
-You can do so by including the following lines in the last step of your
-`Dockerfile`:
-
-```Dockerfile
-RUN apt-get update && apt-get install -y python3 python3-pip
-RUN pip3 install cookiecutter
-```
-
 ## Customizing the ScaffolderPage with Grouping and Filtering
 
 Once you have more than a few software templates you may want to customize your
diff --git a/microsite/docusaurus.config.ts b/microsite/docusaurus.config.ts
index 718a337b01..5b69e26237 100644
--- a/microsite/docusaurus.config.ts
+++ b/microsite/docusaurus.config.ts
@@ -237,7 +237,7 @@ const config: Config = {
           },
           {
             from: '/docs/features/software-templates/testing-scaffolder-alpha',
-            to: '/docs/features/software-templates/migrating-to-rjsf-v5',
+            to: '/docs/features/software-templates/',
           },
           {
             from: '/docs/auth/glossary',
@@ -291,6 +291,10 @@ const config: Config = {
             from: '/docs/plugins/existing-plugins',
             to: '/docs/plugins/',
           },
+          {
+            from: '/docs/features/software-templates/migrating-to-rjsf-v5',
+            to: '/docs/features/software-templates/',
+          },
         ],
       }),
     [
diff --git a/mkdocs.yml b/mkdocs.yml
index cbf8b91477..827e7ac763 100644
--- a/mkdocs.yml
+++ b/mkdocs.yml
@@ -8,6 +8,7 @@ plugins:
   - redirects:
       redirect_maps:
         'index.md': 'overview/what-is-backstage.md'
+        'features/software-templates/migrating-from-v1beta2-to-v1beta3.md': 'features/software-templates/index.md'
 
 # For sidebar navigation on https://backstage.io/, see `microsite/sidebars.js`
 nav: