diff --git a/app-config.development.yaml b/app-config.development.yaml
new file mode 100644
index 0000000000..da274ba1a8
--- /dev/null
+++ b/app-config.development.yaml
@@ -0,0 +1,11 @@
+app:
+  baseUrl: http://localhost:3000
+
+backend:
+  baseUrl: http://localhost:7000
+  listen:
+    port: 7000
+  cors:
+    origin: http://localhost:3000
+    methods: [GET, POST, PUT, DELETE]
+    credentials: true
diff --git a/app-config.yaml b/app-config.yaml
index 2620f6b9b7..da2f5f2d11 100644
--- a/app-config.yaml
+++ b/app-config.yaml
@@ -1,15 +1,11 @@
 app:
   title: Backstage Example App
-  baseUrl: http://localhost:3000
+  baseUrl: http://localhost:7000
 
 backend:
   baseUrl: http://localhost:7000
   listen:
     port: 7000
-  cors:
-    origin: http://localhost:3000
-    methods: [GET, POST, PUT, DELETE]
-    credentials: true
   database:
     client: sqlite3
     connection: ':memory:'
diff --git a/packages/create-app/templates/default-app/app-config.development.yaml b/packages/create-app/templates/default-app/app-config.development.yaml
new file mode 100644
index 0000000000..da274ba1a8
--- /dev/null
+++ b/packages/create-app/templates/default-app/app-config.development.yaml
@@ -0,0 +1,11 @@
+app:
+  baseUrl: http://localhost:3000
+
+backend:
+  baseUrl: http://localhost:7000
+  listen:
+    port: 7000
+  cors:
+    origin: http://localhost:3000
+    methods: [GET, POST, PUT, DELETE]
+    credentials: true
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 dea37814c1..f774ba8174 100644
--- a/packages/create-app/templates/default-app/app-config.yaml.hbs
+++ b/packages/create-app/templates/default-app/app-config.yaml.hbs
@@ -1,6 +1,6 @@
 app:
   title: Scaffolded Backstage App
-  baseUrl: http://localhost:3000
+  baseUrl: http://localhost:7000
 
 organization:
   name: Acme Corporation
@@ -9,10 +9,6 @@ backend:
   baseUrl: http://localhost:7000
   listen:
     port: 7000
-  cors:
-    origin: http://localhost:3000
-    methods: [GET, POST, PUT, DELETE]
-    credentials: true
   {{#if dbTypeSqlite}}
   database:
     client: sqlite3