diff --git a/docs/sources/_index.md b/docs/sources/_index.md
index 193dbea6b48..d75758579b5 100644
--- a/docs/sources/_index.md
+++ b/docs/sources/_index.md
@@ -44,7 +44,7 @@ title = "Grafana documentation"
 ## Guides
 
 <div class="nav-cards">
-    <a href="{{< relref "getting-started/getting-started.md" >}}" class="nav-cards__item nav-cards__item--guide">
+    <a href="{{< relref "getting-started/build-first-dashboard.md" >}}" class="nav-cards__item nav-cards__item--guide">
         <h4>Getting started</h4>
         <p>Learn the basics of using Grafana.</p>
     </a>
diff --git a/docs/sources/getting-started/_index.md b/docs/sources/getting-started/_index.md
index 96fd0c3e151..16dfe37e826 100644
--- a/docs/sources/getting-started/_index.md
+++ b/docs/sources/getting-started/_index.md
@@ -1,13 +1,11 @@
 +++
 aliases = ["/docs/grafana/latest/getting-started/", "/docs/grafana/latest/guides/what-is-grafana/"]
-title = "Getting started"
-weight = 10
+title = "Get started"
+weight = 25
 +++
 
-# Getting started
+# Get started
 
-This section provides guidance on how to install Grafana and build your first dashboard. It also provides step by step instructions on how to add a Prometheus or an InfluxDB data source. Refer to [Data sources]({{< relref "../datasources/_index.md" >}}) for a list of all supported data sources.
+This section provides guidance on how build your first dashboard after you have installed Grafana. It also provides step-by-step instructions on how to add a Prometheus, InfluxDB, or an MS SQL Server data source. Refer to [Data sources]({{< relref "../datasources/_index.md" >}}) for a list of all supported data sources.
 
-- [Getting started with Grafana]({{< relref "getting-started.md" >}})
-- [Getting started with Grafana and InfluxDB]({{< relref "getting-started-influxdb.md" >}})
-- [Getting started with Grafana and Prometheus]({{< relref "getting-started-prometheus.md" >}})
+{{< section >}}
diff --git a/docs/sources/getting-started/getting-started.md b/docs/sources/getting-started/build-first-dashboard.md
similarity index 80%
rename from docs/sources/getting-started/getting-started.md
rename to docs/sources/getting-started/build-first-dashboard.md
index 71790400e99..a5840e6305a 100644
--- a/docs/sources/getting-started/getting-started.md
+++ b/docs/sources/getting-started/build-first-dashboard.md
@@ -1,33 +1,32 @@
 +++
 aliases = ["/docs/grafana/latest/getting-started/getting-started/", "/docs/grafana/latest/guides/getting_started/", "/docs/grafana/latest/guides/gettingstarted/"]
-description = "Guide for getting started with Grafana"
-keywords = ["grafana", "intro", "guide", "started"]
-title = "With Grafana"
+description = "Learn how to get started with Grafana by adding a preconfigured dashboard."
+title = "Build your first dashboard"
 weight = 200
 +++
 
-# Getting started with Grafana
+# Build your first dashboard
 
 This topic helps you get started with Grafana and build your first dashboard. To learn more about Grafana, refer to [What is Grafana?]({{< relref "_index.md" >}}).
 
 > **Note:** Grafana also offers a [free account with Grafana Cloud](https://grafana.com/signup/cloud/connect-account?pg=gsdocs) to help getting started even easier and faster. You can install Grafana to self-host or get a free Grafana Cloud account.
 
-## Step 1: Install Grafana
+#### Install Grafana
 
 Grafana can be installed on many different operating systems. For a list of the minimum hardware and software requirements, as well as instructions on installing Grafana, refer to [Install Grafana]({{< relref "../installation/_index.md" >}}).
 
-## Step 2: Log in
+#### Sign in to Grafana
 
-To log in to Grafana for the first time:
+To sign in to Grafana for the first time:
 
 1. Open your web browser and go to http://localhost:3000/. The default HTTP port that Grafana listens to is `3000` unless you have configured a different port.
-1. On the login page, enter `admin` for username and password.
-1. Click **Log in**. If login is successful, then you will see a prompt to change the password.
-1. Click **OK** on the prompt, then change your password.
+1. On the signin page, enter `admin` for username and password.
+1. Click **Sign in**. If successful, you will see a prompt to change the password.
+1. Click **OK** on the prompt and change your password.
 
-> **Note:** We strongly recommend that you follow Grafana's best practices and change the default administrator password. Don't forget to record your credentials!
+> **Note:** We strongly recommend that you change the default administrator password.
 
-## Step 3: Create a dashboard
+#### Create a dashboard
 
 To create your first dashboard:
 
@@ -40,7 +39,7 @@ To create your first dashboard:
 
 Congratulations, you have created your first dashboard and it is displaying results.
 
-## Next steps
+#### Next steps
 
 Continue to experiment with what you have built, try the [explore workflow]({{< relref "../explore/_index.md" >}}) or another visualization feature. Refer to [Data sources]({{< relref "../datasources" >}}) for a list of supported data sources and instructions on how to [add a data source]({{< relref "../datasources/add-a-data-source.md" >}}). The following topics will be of interest to you:
 
@@ -49,7 +48,7 @@ Continue to experiment with what you have built, try the [explore workflow]({{<
 - [Keyboard shortcuts]({{< relref "../dashboards/shortcuts.md" >}})
 - [Plugins](https://grafana.com/grafana/plugins?orderBy=weight&direction=asc)
 
-### Admins
+##### Admins
 
 The following topics are of interest to Grafana server admin users:
 
diff --git a/docs/sources/getting-started/getting-started-influxdb.md b/docs/sources/getting-started/get-started-grafana-influxdb.md
similarity index 91%
rename from docs/sources/getting-started/getting-started-influxdb.md
rename to docs/sources/getting-started/get-started-grafana-influxdb.md
index d4e12b29981..ab69491c2c6 100644
--- a/docs/sources/getting-started/getting-started-influxdb.md
+++ b/docs/sources/getting-started/get-started-grafana-influxdb.md
@@ -1,12 +1,11 @@
 +++
 aliases = ["/docs/grafana/latest/getting-started/getting-started-influxdb/"]
-description = "Guide for getting started with Grafana and InfluxDB"
-keywords = ["grafana", "intro", "guide", "started"]
-title = "With Grafana and InfluxDB"
-weight = 250
+description = "Learn how to build your first InfluxDB dashboard in Grafana."
+title = "Get started with Grafana and InfluxDB"
+weight = 400
 +++
 
-# Getting started with Grafana and InfluxDB
+# Get started with Grafana and InfluxDB
 
 {{< docs/shared "influxdb/intro.md" >}}
 
@@ -14,27 +13,27 @@ weight = 250
 
 {{< docs/shared "getting-started/first-step.md" >}}
 
-## Step 2. Get InfluxDB
+#### Get InfluxDB
 
 You can [download InfluxDB](https://portal.influxdata.com/downloads/) and install it locally or you can sign up for [InfluxDB Cloud](https://www.influxdata.com/products/influxdb-cloud/). Windows installers are not available for some versions of InfluxDB.
 
-## Step 3. Install other InfluxDB software
+#### Install other InfluxDB software
 
 [Install Telegraf](https://docs.influxdata.com/telegraf/v1.18/introduction/installation/). This tool is an agent that helps you get metrics into InfluxDB. For more information, refer to [Telegraf documentation](https://docs.influxdata.com/telegraf/v1.18/).
 
 If you chose to use InfluxDB Cloud, then you should [download and install the InfluxDB Cloud CLI](https://portal.influxdata.com/downloads/). This tool allows you to send command line instructions to your cloud account. For more information, refer to [Influx CLI documentation](https://docs.influxdata.com/influxdb/cloud/write-data/developer-tools/influx-cli/).
 
-## Step 4. Get data into InfluxDB
+#### Get data into InfluxDB
 
 If you downloaded and installed InfluxDB on your local machine, then use the [Quick Start](https://docs.influxdata.com/influxdb/v2.0/write-data/#quick-start-for-influxdb-oss) feature to visualize InfluxDB metrics.
 
 If you are using the cloud account, then the wizards will guide you through the initial process. For more information, refer to [Configure Telegraf](https://docs.influxdata.com/influxdb/cloud/write-data/no-code/use-telegraf/#configure-telegraf).
 
-### Note for Windows users:
+##### Note for Windows users:
 
 Windows users might need to make additional adjustments. Look for special instructions in the InfluxData documentation and [Using Telegraf on Windows](https://www.influxdata.com/blog/using-telegraf-on-windows/) blog post. The regular system monitoring template in InfluxDB Cloud is not compatible with Windows. Windows users who use InfluxDB Cloud to monitor their system will need to use the [Windows System Monitoring Template](https://github.com/influxdata/community-templates/tree/master/windows_system).
 
-## Step 5. Add your InfluxDB data source to Grafana
+#### Add your InfluxDB data source to Grafana
 
 You can have more than one InfluxDB data source defined in Grafana.
 
@@ -43,7 +42,7 @@ You can have more than one InfluxDB data source defined in Grafana.
    - For InfluxQL, refer to [InfluxDB data source]({{< relref "../datasources/influxdb/_index.md" >}}) for information about specific data source fields.
    - For Flux, refer to [Flux query language in Grafana]({{< relref "../datasources/influxdb/influxdb-flux.md" >}}) for information about specific data source fields.
 
-### InfluxDB guides
+##### InfluxDB guides
 
 InfluxDB publishes guidance for connecting different versions of their product to Grafana.
 
@@ -51,18 +50,18 @@ InfluxDB publishes guidance for connecting different versions of their product t
 - **InfluxDB OSS or Enterprise 2.x.** Refer to [Use Grafana with InfluxDB](https://docs.influxdata.com/influxdb/v2.0/tools/grafana/). Select your InfluxDB version in the upper right corner.
 - **InfluxDB Cloud.** Refer to [Use Grafana with InfluxDB Cloud](https://docs.influxdata.com/influxdb/cloud/tools/grafana/).
 
-### Important tips
+##### Important tips
 
 - Make sure your Grafana token has read access. If it doesn't, then you'll get an authentication error and be unable to connect Grafana to InfluxDB.
 - Avoid apostrophes and other non-standard characters in bucket and token names.
 - If the text name of the organization or bucket doesn't work, then try the ID number.
 - If you change your bucket name in InfluxDB, then you must also change it in Grafana and your Telegraf .conf file as well.
 
-## Step 6. Add a query
+#### Add a query
 
 This step varies depending on the query language that you selected when you set up your data source in Grafana.
 
-### InfluxQL query language
+##### InfluxQL query language
 
 In the query editor, click **select measurement**.
 
@@ -70,7 +69,7 @@ In the query editor, click **select measurement**.
 
 Grafana displays a list of possible series. Click one to select it, and Grafana graphs any available data. If there is no data to display, then try another selection or check your data source.
 
-### Flux query language
+##### Flux query language
 
 Create a simple Flux query.
 
@@ -98,11 +97,11 @@ You can also create Flux queries in the InfluxDB Explore view.
 1. In Grafana, [add a panel](../panels/add-a-panel.md) and then paste your Flux code into the query editor.
 1. Click **Apply**. Your new panel should be visible with data from your Flux query.
 
-## Step 7. Check InfluxDB metrics in Grafana Explore
+#### Check InfluxDB metrics in Grafana Explore
 
 In your Grafana instance, go to the [Explore]({{< relref "../explore/_index.md" >}}) view and build queries to experiment with the metrics you want to monitor. Here you can also debug issues related to collecting metrics.
 
-## Step 8. Start building dashboards
+#### Start building dashboards
 
 There you go! Use Explore and Data Explorer to experiment with your data, and add the queries that you like to your dashboard as panels. Have fun!
 
diff --git a/docs/sources/getting-started/getting-started-sql.md b/docs/sources/getting-started/get-started-grafana-ms-sql-server.md
similarity index 90%
rename from docs/sources/getting-started/getting-started-sql.md
rename to docs/sources/getting-started/get-started-grafana-ms-sql-server.md
index a3892ab4d68..147ad5f0fa3 100644
--- a/docs/sources/getting-started/getting-started-sql.md
+++ b/docs/sources/getting-started/get-started-grafana-ms-sql-server.md
@@ -1,12 +1,11 @@
 +++
 aliases = ["/docs/grafana/latest/getting-started/getting-started-sql/", "/docs/grafana/latest/guides/getting_started/", "/docs/grafana/latest/guides/gettingstarted/"]
-description = "Guide for getting started with Grafana and MS SQL Server"
-draft = true
-keywords = ["grafana", "intro", "guide", "started", "SQL", "MSSQL"]
-weight = 400
+description = "Learn how to build your first MS SQL Server dashboard in Grafana."
+title = "Get started with Grafana and MS SQL Server"
+weight = 500
 +++
 
-# Getting started with Grafana and MS SQL Server
+# Get started with Grafana and MS SQL Server
 
 Microsoft SQL Server is a popular relational database management system that is widely used in development and production environments. This topic walks you through the steps to create a series of dashboards in Grafana to display metrics from a MS SQL Server database. You can also configure the MS SQL Server data source on a [Grafana Cloud](https://grafana.com/docs/grafana-cloud/) instance without having to host Grafana yourself.
 
@@ -14,19 +13,17 @@ Microsoft SQL Server is a popular relational database management system that is
 
 > **Note:** You must install Grafana 5.1+ in order to use the integrated MS SQL data source.
 
-## Step 2. Download MS SQL Server
+#### Download MS SQL Server
 
 MS SQL Server can be installed on Windows or Linux operating systems and also on Docker containers. Refer to the [MS SQL Server downloads page](https://www.microsoft.com/en-us/sql-server/sql-server-downloads), for a complete list of all available options.
 
-## Step 3. Install MS SQL Server
+#### Install MS SQL Server
 
 You can install MS SQL Server on the host running Grafana or on a remote server. To install the software from the [downloads page](https://www.microsoft.com/en-us/sql-server/sql-server-downloads), follow their setup prompts.
 
 If you are on a Windows host but want to use Grafana and MS SQL data source on a Linux environment, refer to the [WSL to set up your Grafana development environment](https://grafana.com/blog/2021/03/03/.how-to-set-up-a-grafana-development-environment-on-a-windows-pc-using-wsl). This will allow you to leverage the resources available in [grafana/grafana](https://github.com/grafana/grafana) GitHub repository. Here you will find a collection of supported data sources, including MS SQL Server, along with test data and pre-configured dashboards for use.
 
-## Step 4. Adding the MS SQL data source
-
-To add MS SQL Server data source:
+#### Add the MS SQL data source
 
 1. In the Grafana side menu, hover your cursor over the **Configuration** (gear) icon and then click **Data Sources**.
 1. Filter by `mssql` and select the **Microsoft SQL Server** option.
@@ -43,7 +40,7 @@ To add MS SQL Server data source:
 
 For installations from the [grafana/grafana](https://github.com/grafana/grafana/tree/main) repository, `gdev-mssql` data source is available. Once you add this data source, you can use the `Datasource tests - MSSQL` dashboard with three panels showing metrics generated from a test database.
 
-<img src="/static/img/docs/getting-started/gdev-sql-dashboard.png" class="no-shadow" width="700px">
+![MS SQL Server dashboard](/static/img/docs/getting-started/gdev-sql-dashboard.png)
 
 Optionally, play around this dashboard and customize it to:
 
@@ -53,7 +50,7 @@ Optionally, play around this dashboard and customize it to:
 - Change the period for which the data is displayed.
 - Rearrange and resize panels.
 
-## Step 5. Start building dashboards
+#### Start building dashboards
 
 Now that you have gained some idea of using the pre-packaged MS SQL data source and some test data, the next step is to setup your own instance of MS SQL Server database and data your development or sandbox area. In the previous steps, if you followed along the path of deploying your own instance of MS SQL Server, you are already on your way.
 
diff --git a/docs/sources/getting-started/getting-started-prometheus.md b/docs/sources/getting-started/get-started-grafana-prometheus.md
similarity index 87%
rename from docs/sources/getting-started/getting-started-prometheus.md
rename to docs/sources/getting-started/get-started-grafana-prometheus.md
index fa8b93374bf..928c31606d0 100644
--- a/docs/sources/getting-started/getting-started-prometheus.md
+++ b/docs/sources/getting-started/get-started-grafana-prometheus.md
@@ -1,12 +1,11 @@
 +++
 aliases = ["/docs/grafana/latest/getting-started/getting-started-prometheus/", "/docs/grafana/latest/guides/getting_started/", "/docs/grafana/latest/guides/gettingstarted/"]
-description = "Guide for getting started with Grafana and Prometheus"
-keywords = ["grafana", "intro", "guide", "started"]
-title = "With Grafana and Prometheus"
+description = "Learn how to build your first Prometheus dashboard in Grafana."
+title = "Get started with Grafana and Prometheus"
 weight = 300
 +++
 
-# Getting started with Grafana and Prometheus
+# Get started with Grafana and Prometheus
 
 Prometheus is an open source monitoring system for which Grafana provides out-of-the-box support. This topic walks you through the steps to create a series of dashboards in Grafana to display system metrics for a server monitored by Prometheus.
 
@@ -14,20 +13,20 @@ Prometheus is an open source monitoring system for which Grafana provides out-of
 
 {{< docs/shared "getting-started/first-step.md" >}}
 
-## Step 2. Download Prometheus and node_exporter
+#### Download Prometheus and node_exporter
 
 Prometheus, like Grafana, can be installed on many different operating systems. Refer to the [Prometheus download page](https://prometheus.io/download/), which lists all stable versions of Prometheus components. Download the following components:
 
 - [Prometheus](https://prometheus.io/download/#prometheus)
 - [node_exporter](https://prometheus.io/download/#node_exporter)
 
-## Step 3. Install Prometheus node_exporter
+#### Install Prometheus node_exporter
 
 Prometheus node_exporter is a widely used tool that exposes system metrics. Install node_exporter on all hosts you want to monitor. For instructions on how to install node_exporter, refer to the [Installing and running the node_exporter](https://prometheus.io/docs/guides/node-exporter/#installing-and-running-the-node-exporter) section in Prometheus documentation.
 
 > **Note**: The instructions in the referenced topic are intended for Linux users. You may have to alter the instructions slightly depending on your operating system. For example, if you are on Windows, use the [windows_exporter](https://github.com/prometheus-community/windows_exporter) instead.
 
-## Step 4. Install and configure Prometheus
+#### Install and configure Prometheus
 
 1. Install Prometheus following instructions in the [Installation](https://prometheus.io/docs/prometheus/latest/installation/) topic in the Prometheus documentation.
 
@@ -51,17 +50,17 @@ Prometheus node_exporter is a widely used tool that exposes system metrics. Inst
     ./prometheus --config.file=./prometheus.yml
    ```
 
-## Step 5. Check Prometheus metrics in Grafana Explore view
+#### Check Prometheus metrics in Grafana Explore view
 
 In your Grafana instance, go to the [Explore]({{< relref "../explore/_index.md" >}}) view and build queries to experiment with the metrics you want to monitor. Here you can also debug issues related to collecting metrics from Prometheus. Pay special attention to the [Prometheus-specific features]({{< relref "../explore/_index.md#prometheus-specific-features" >}}) to avail custom querying experience for Prometheus.
 
-## Step 6. Start building dashboards
+#### Start building dashboards
 
 Now that you have a curated list of queries, create [dashboards]({{< relref "../dashboards/_index.md" >}}) to render system metrics monitored by Prometheus. When you install Prometheus and node_exporter or windows_exporter, you will find recommended dashboards for use.
 
 The following image shows a dashboard with three panels showing some system metrics.
 
-<img width="850px" src="/static/img/docs/getting-started/simple_grafana_prom_dashboard.png" caption="Prometheus dashboards" >
+![Prometheus dashboards](/static/img/docs/getting-started/simple_grafana_prom_dashboard.png)
 
 To learn more:
 
diff --git a/docs/sources/installation/debian.md b/docs/sources/installation/debian.md
index 4a326be3a73..35c9303a26b 100644
--- a/docs/sources/installation/debian.md
+++ b/docs/sources/installation/debian.md
@@ -179,7 +179,7 @@ Start Grafana by running:
 
 ## Next steps
 
-Refer to the [Getting Started]({{< relref "../getting-started/getting-started/" >}}) guide for information about logging in, setting up data sources, and so on.
+Refer to the [Getting Started]({{< relref "../getting-started/build-first-dashboard/" >}}) guide for information about logging in, setting up data sources, and so on.
 
 ## Configure Grafana
 
diff --git a/docs/sources/installation/docker.md b/docs/sources/installation/docker.md
index bedf5671416..c0efadb5e23 100644
--- a/docs/sources/installation/docker.md
+++ b/docs/sources/installation/docker.md
@@ -250,7 +250,7 @@ chown -R grafana:grafana /usr/share/grafana
 
 ## Next steps
 
-Refer to the [Getting Started]({{< relref "../getting-started/getting-started/" >}}) guide for information about logging in, setting up data sources, and so on.
+Refer to the [Getting Started]({{< relref "../getting-started/build-first-dashboard/" >}}) guide for information about logging in, setting up data sources, and so on.
 
 ## Configure Docker image
 
diff --git a/docs/sources/installation/mac.md b/docs/sources/installation/mac.md
index 12c0536d136..305038e27a0 100644
--- a/docs/sources/installation/mac.md
+++ b/docs/sources/installation/mac.md
@@ -58,7 +58,7 @@ To install a nightly build, or to install the latest version of Grafana without
 
 ## Next steps
 
-Refer to the [Getting Started]({{< relref "../getting-started/getting-started/" >}}) guide for information about logging in, setting up data sources, and so on. Also, refer to the [Configuration]({{< relref "../administration/configuration.md" >}}) page for details on options for customizing your environment, logging, database, and so on.
+Refer to the [Getting Started]({{< relref "../getting-started/build-first-dashboard/" >}}) guide for information about logging in, setting up data sources, and so on. Also, refer to the [Configuration]({{< relref "../administration/configuration.md" >}}) page for details on options for customizing your environment, logging, database, and so on.
 
 ## Upgrade
 
diff --git a/docs/sources/installation/rpm.md b/docs/sources/installation/rpm.md
index 5a159abb3ef..af7ea75e389 100644
--- a/docs/sources/installation/rpm.md
+++ b/docs/sources/installation/rpm.md
@@ -233,7 +233,7 @@ Start Grafana by running:
 
 ## Next steps
 
-Refer to the [Getting Started]({{< relref "../getting-started/getting-started/" >}}) guide for information about logging in, setting up data sources, and so on.
+Refer to the [Getting Started]({{< relref "../getting-started/build-first-dashboard/" >}}) guide for information about logging in, setting up data sources, and so on.
 
 ## Configure Grafana
 
diff --git a/docs/sources/installation/windows.md b/docs/sources/installation/windows.md
index b3cea37beae..27462251cd0 100644
--- a/docs/sources/installation/windows.md
+++ b/docs/sources/installation/windows.md
@@ -29,7 +29,7 @@ You can either use the Windows installer or you can install a standalone Windows
 1. Click **Download the installer**.
 1. Open and run the installer.
 
-To run Grafana, open your browser and go to the Grafana port (http://localhost:3000/ is default) and then follow the instructions in [Getting Started]({{< relref "../getting-started/getting-started/" >}}).
+To run Grafana, open your browser and go to the Grafana port (http://localhost:3000/ is default) and then follow the instructions in [Getting Started]({{< relref "../getting-started/build-first-dashboard/" >}}).
 
 ## Install standalone Windows binary
 
@@ -41,7 +41,7 @@ To run Grafana, open your browser and go to the Grafana port (http://localhost:3
 1. Start Grafana by executing `grafana-server.exe`, located in the `bin` directory, preferably from the command line. If you want to run Grafana as a Windows service, then download
    [NSSM](https://nssm.cc/). It is very easy to add Grafana as a Windows service using that tool.
 
-To run Grafana, open your browser and go to the Grafana port (http://localhost:3000/ is default) and then follow the instructions in [Getting Started]({{< relref "../getting-started/getting-started/" >}}).
+To run Grafana, open your browser and go to the Grafana port (http://localhost:3000/ is default) and then follow the instructions in [Getting Started]({{< relref "../getting-started/build-first-dashboard/" >}}).
 
 > **Note:** The default Grafana port is `3000`. This port might require extra permissions on Windows. If it does not appear in the default port, you can try changing to a different port.
 >
diff --git a/docs/sources/introduction/oss-details.md b/docs/sources/introduction/oss-details.md
index d00befee8d7..67f03492e5d 100644
--- a/docs/sources/introduction/oss-details.md
+++ b/docs/sources/introduction/oss-details.md
@@ -8,7 +8,7 @@ weight = 5
 
 [Grafana open source software](https://grafana.com/oss/) allows you to query, visualize, alert on, and understand your data no matter where it’s stored. With Grafana you can create, explore and share all of your data through elegant, flexible dashboards.
 
-After you have [installed Grafana]({{< relref "../installation/_index.md" >}}) and set up your first dashboard using instructions in [Getting started with Grafana]({{< relref "../getting-started/getting-started.md" >}}), you will have many options to choose from depending on your requirements. For example, if you want to view weather data and statistics about your smart home, then you can create a [playlist]({{< relref "../dashboards/playlist.md" >}}). If you are the administrator for an enterprise and are managing Grafana for multiple teams, then you can set up [provisioning]({{< relref "../administration/provisioning.md" >}}) and [authentication]({{< relref "../auth/_index.md" >}}).
+After you have [installed Grafana]({{< relref "../installation/_index.md" >}}) and set up your first dashboard using instructions in [Build your first dashboard]({{< relref "../getting-started/build-first-dashboard" >}}), you will have many options to choose from depending on your requirements. For example, if you want to view weather data and statistics about your smart home, then you can create a [playlist]({{< relref "../dashboards/playlist.md" >}}). If you are the administrator for an enterprise and are managing Grafana for multiple teams, then you can set up [provisioning]({{< relref "../administration/provisioning.md" >}}) and [authentication]({{< relref "../auth/_index.md" >}}).
 
 In the following sections, you can get an overview of the capabilities of Grafana features as well as links to the product documentation to help you learn more. For more guidance and ideas, check out our [Grafana Community forums](https://community.grafana.com/).
 
diff --git a/docs/sources/panels/query-a-data-source/share-query.md b/docs/sources/panels/query-a-data-source/share-query.md
index a28fbbda4b0..378635ec516 100644
--- a/docs/sources/panels/query-a-data-source/share-query.md
+++ b/docs/sources/panels/query-a-data-source/share-query.md
@@ -14,7 +14,6 @@ This strategy can drastically reduce the number of queries being made when you f
 
 **To share data source queries with another panel**:
 
-1. [Create a dashboard]({{< relref "../../getting-started/getting-started.md/#step-3-create-a-dashboard" >}}).
 1. [Add a panel to a dashboard]({{< relref "../working-with-panels/add-panel.md" >}}).
 1. Change the title to "Source panel". You'll use this panel as a source for the other panels.
 1. Define the [query]({{< relref "../query-a-data-source/add-a-query.md" >}}) or queries that you want share.
diff --git a/docs/sources/shared/getting-started/first-step.md b/docs/sources/shared/getting-started/first-step.md
index aa141fb6ddf..210a80ec1c8 100644
--- a/docs/sources/shared/getting-started/first-step.md
+++ b/docs/sources/shared/getting-started/first-step.md
@@ -4,10 +4,10 @@ aliases:
 title: First step of Getting started with...
 ---
 
-## Step 1. Install Grafana and build your first dashboard
+#### Install Grafana and add your first dashboard
 
-Use the instructions in [Getting started with Grafana]({{< relref "../../getting-started/getting-started.md" >}}) to:
+Use the instructions in [Build your first dashboard]({{< relref "../../getting-started/build-first-dashboard" >}}) to:
 
 - Install Grafana.
-- Log in to Grafana.
-- Create your first dashboard.
+- Sign in to Grafana.
+- Build your first dashboard.