diff --git a/.changeset/wicked-emus-deny.md b/.changeset/wicked-emus-deny.md
new file mode 100644
index 0000000000..ff6788dbb2
--- /dev/null
+++ b/.changeset/wicked-emus-deny.md
@@ -0,0 +1,8 @@
+---
+'@backstage/create-app': patch
+'@backstage/plugin-scaffolder-backend': patch
+---
+
+Moved sample software templates to the [backstage/software-templates](https://github.com/backstage/software-templates) repository. If you previously referenced the sample templates straight from `scaffolder-backend` plugin in the main [backstage/backstage](https://github.com/backstage/backstage) repository in your `app-config.yaml`, these references will need to be updated.
+
+See https://github.com/backstage/software-templates
diff --git a/packages/create-app/templates/default-app/app-config.yaml.hbs b/packages/create-app/templates/default-app/app-config.yaml.hbs
index 9a04f38c14..81e4c3a739 100644
--- a/packages/create-app/templates/default-app/app-config.yaml.hbs
+++ b/packages/create-app/templates/default-app/app-config.yaml.hbs
@@ -100,11 +100,11 @@ catalog:
 
     # Backstage example templates
     - type: url
-      target: https://github.com/backstage/backstage/blob/master/plugins/scaffolder-backend/sample-templates/react-ssr-template/template.yaml
+      target: https://github.com/backstage/software-templates/blob/master/scaffolder-templates/react-ssr-template/template.yaml
       rules:
         - allow: [Template]
     - type: url
-      target: https://github.com/backstage/backstage/blob/master/plugins/scaffolder-backend/sample-templates/springboot-grpc-template/template.yaml
+      target: https://github.com/backstage/software-templates/blob/master/scaffolder-templates/springboot-grpc-template/template.yaml
       rules:
         - allow: [Template]
     - type: url
@@ -112,6 +112,6 @@ catalog:
       rules:
         - allow: [Template]
     - type: url
-      target: https://github.com/backstage/backstage/blob/master/plugins/scaffolder-backend/sample-templates/docs-template/template.yaml
+      target: https://github.com/backstage/software-templates/blob/master/scaffolder-templates/docs-template/template.yaml
       rules:
         - allow: [Template]
diff --git a/plugins/scaffolder-backend/sample-templates/all-templates.yaml b/plugins/scaffolder-backend/sample-templates/all-templates.yaml
index a5bcd864b1..2d5adb8e3b 100644
--- a/plugins/scaffolder-backend/sample-templates/all-templates.yaml
+++ b/plugins/scaffolder-backend/sample-templates/all-templates.yaml
@@ -5,5 +5,10 @@ metadata:
   description: A collection of all Backstage example templates
 spec:
   targets:
-    - ./local-templates.yaml
     - ./remote-templates.yaml
+
+# For local development of a template, you can reference your local templates here.
+# Examples:
+#
+#   - ./local-template/template.yaml
+#   - ../all-templates/local/template.yaml
diff --git a/plugins/scaffolder-backend/sample-templates/local-templates.yaml b/plugins/scaffolder-backend/sample-templates/local-templates.yaml
deleted file mode 100644
index 3b3acbae7e..0000000000
--- a/plugins/scaffolder-backend/sample-templates/local-templates.yaml
+++ /dev/null
@@ -1,13 +0,0 @@
-apiVersion: backstage.io/v1alpha1
-kind: Location
-metadata:
-  name: example-templates-local
-  description: A collection of locally available Backstage example templates
-spec:
-  targets:
-    - ./docs-template/template.yaml
-    - ./react-ssr-template/template.yaml
-    - ./create-react-app/template.yaml
-    - ./springboot-grpc-template/template.yaml
-    - ./v1beta2-demo/template.yaml
-    - ./pull-request/template.yaml
diff --git a/plugins/scaffolder-backend/sample-templates/remote-templates.yaml b/plugins/scaffolder-backend/sample-templates/remote-templates.yaml
index 7846a0994e..81787b4297 100644
--- a/plugins/scaffolder-backend/sample-templates/remote-templates.yaml
+++ b/plugins/scaffolder-backend/sample-templates/remote-templates.yaml
@@ -7,3 +7,9 @@ spec:
   type: url
   targets:
     - https://github.com/spotify/cookiecutter-golang/blob/master/template.yaml
+    - https://github.com/backstage/software-templates/blob/main/scaffolder-templates/create-react-app/template.yaml
+    - https://github.com/backstage/software-templates/blob/main/scaffolder-templates/docs-template/template.yaml
+    - https://github.com/backstage/software-templates/blob/main/scaffolder-templates/pull-request/template.yaml
+    - https://github.com/backstage/software-templates/blob/main/scaffolder-templates/react-ssr-template/template.yaml
+    - https://github.com/backstage/software-templates/blob/main/scaffolder-templates/springboot-grpc-template/template.yaml
+    - https://github.com/backstage/software-templates/blob/main/scaffolder-templates/v1beta2-demo/template.yaml