diff --git a/docs/getting-started/configuration.md b/docs/getting-started/configuration.md
index 0468ed4378..f028bb9b4b 100644
--- a/docs/getting-started/configuration.md
+++ b/docs/getting-started/configuration.md
@@ -145,7 +145,7 @@ Take note of the `Client ID` and the `Client Secret`. Open `app-config.yaml`,
 and add your `clientId` and `clientSecret` to this file. It should end up
 looking like this:
 
-```
+```yaml
 auth:
   # see https://backstage.io/docs/auth/ to learn about auth providers
   environment: development
@@ -162,7 +162,7 @@ change the sign-in page, this you actually need to add in the source code.
 
 Open `packages/app/src/App.tsx` and below the last `import` line, add:
 
-```
+```typescript
 import { githubAuthApiRef } from '@backstage/core-plugin-api';
 import { SignInProviderConfig, SignInPage } from '@backstage/core-components';
 
@@ -176,7 +176,7 @@ const githubProvider: SignInProviderConfig = {
 
 Search for `const app = createApp({` in this file, and below `apis,` add:
 
-```
+```typescript
 components: {
    SignInPage: props => (
      <SignInPage
@@ -224,7 +224,7 @@ enough.
 In the `app-config.yaml`, search for `integrations:` and add your token, like we
 did in below example:
 
-```
+```yaml
 integrations:
   github:
     - host: github.com
@@ -288,7 +288,7 @@ otherwise something went terribly wrong.
 - For the repository name, type `tutorial`. Go to the next step
 
 <p align='center'>
-  <img src='../assets/getting-started/b-scaffold-2.png' alt='Software template deployment input screen asking for the github username, and name of the new repo to create' />
+  <img src='../assets/getting-started/b-scaffold-2.png' alt='Software template deployment input screen asking for the GitHub username, and name of the new repo to create' />
 </p>
 
 - Review the details of this new service, and press `Create` if you want to
diff --git a/docs/getting-started/index.md b/docs/getting-started/index.md
index 42b334c62b..2edb7004a1 100644
--- a/docs/getting-started/index.md
+++ b/docs/getting-started/index.md
@@ -87,14 +87,11 @@ carry on with the database steps.
   <img src='../assets/getting-started/portal.png' alt='Screenshot of the Backstage portal.'/>
 </p>
 
-The most common next steps are to move to a persistent database, configure
-authentication, and add a plugin:
+In the next part of this tutorial, you'll learn how to change to a persistent
+ database, configure authentication, and add your first integration. Continue
+ with [getting started: Configuring Backstage](configuration.md).
 
-- [Switching from SQLite to PostgresQL](https://backstage.io/docs/tutorials/switching-sqlite-postgres)
-- [Setting up Authentication](https://backstage.io/docs/auth/)
-- [Adding a plugin](https://backstage.io/docs/getting-started/configure-app-with-plugins)
-
-Congratulations! That should be it. Let us know how it went:
+Share your experiences, comments, or suggestions with us: 
 [on discord](https://discord.gg/EBHEGzX), file issues for any
 [feature](https://github.com/backstage/backstage/issues/new?labels=help+wanted&template=feature_template.md)
 or