diff --git a/docs/sources/setup-grafana/installation/_index.md b/docs/sources/setup-grafana/installation/_index.md
index 01cafd89cf3..f44b447e7cd 100644
--- a/docs/sources/setup-grafana/installation/_index.md
+++ b/docs/sources/setup-grafana/installation/_index.md
@@ -5,6 +5,7 @@ aliases:
   - ../installation/installation/
   - ../installation/requirements/
   - /docs/grafana/v2.1/installation/install/
+  - ./installation/rpm/
 description: Installation guide for Grafana
 title: Install Grafana
 weight: 100
@@ -22,8 +23,9 @@ Grafana relies on other open source software to operate. For a list of open sour
 
 Grafana supports the following operating systems:
 
-- [Debian / Ubuntu]({{< relref "debian/" >}})
-- [RPM-based Linux (Fedora, SUSE/OpenSUSE, RedHat)]({{< relref "rpm/" >}})
+- [Debian/Ubuntu]({{< relref "debian/" >}})
+- [Red Hat/RHEL/Fedora]({{< relref "redhat-rhel-fedora/" >}})
+- [SUSE/openSUSE]({{< relref "suse-opensuse/" >}})
 - [macOS]({{< relref "mac/" >}})
 - [Windows]({{< relref "windows/" >}})
 
diff --git a/docs/sources/setup-grafana/installation/suse-opensuse/index.md b/docs/sources/setup-grafana/installation/suse-opensuse/index.md
index d6aee092d07..6b0905f75d5 100644
--- a/docs/sources/setup-grafana/installation/suse-opensuse/index.md
+++ b/docs/sources/setup-grafana/installation/suse-opensuse/index.md
@@ -1,13 +1,13 @@
 ---
-description: Install guide for Grafana on SUSE or OpenSUSE.
-title: Install Grafana on SUSE or OpenSUSE
-menuTitle: Redhat, RHEL, or Fedora
+description: Install guide for Grafana on SUSE or openSUSE.
+title: Install Grafana on SUSE or openSUSE
+menuTitle: SUSE or openSUSE
 weight: 450
 ---
 
-# Install Grafana on SUSE or OpenSUSE
+# Install Grafana on SUSE or openSUSE
 
-This topic explains how to install Grafana dependencies, install Grafana on SUSE or OpenSUSE and start the Grafana server on your system.
+This topic explains how to install Grafana dependencies, install Grafana on SUSE or openSUSE and start the Grafana server on your system.
 
 You can install Grafana using a YUM repository, using RPM, or by downloading a binary `.tar.gz` file.
 
@@ -81,4 +81,4 @@ Complete the following steps to install Grafana using the standalone binaries:
 
 ## Next steps
 
-Refer to [Start the Grafana server]({{< relref "../start-restart-grafana/" >}}).
+Refer to [Start the Grafana server]({{< relref "../../start-restart-grafana/" >}}).
diff --git a/docs/sources/setup-grafana/start-restart-grafana.md b/docs/sources/setup-grafana/start-restart-grafana.md
index 578752c109b..28e03200f5b 100644
--- a/docs/sources/setup-grafana/start-restart-grafana.md
+++ b/docs/sources/setup-grafana/start-restart-grafana.md
@@ -58,7 +58,7 @@ To restart the Grafana server, run the following commands:
 sudo systemctl restart grafana-server
 ```
 
-> **Note:** SUSE or OpenSUSE users might need to start the server with the systemd method, then use the init.d method to configure Grafana to start at boot.
+> **Note:** SUSE or openSUSE users might need to start the server with the systemd method, then use the init.d method to configure Grafana to start at boot.
 
 ### Start the Grafana server using init.d
 
diff --git a/docs/sources/shared/upgrade/upgrade-common-tasks.md b/docs/sources/shared/upgrade/upgrade-common-tasks.md
index bd964412efe..223dbbde94a 100644
--- a/docs/sources/shared/upgrade/upgrade-common-tasks.md
+++ b/docs/sources/shared/upgrade/upgrade-common-tasks.md
@@ -115,14 +115,14 @@ To upgrade Grafana installed using RPM or YUM complete the following steps:
 
 1. Perform one of the following steps based on your installation.
 
-   - If you [downloaded an RPM package](https://grafana.com/grafana/download) to install Grafana, then complete the steps documented in [Install Grafana on Red Hat, RHEL, or Fedora]({{< relref "../../setup-grafana/installation/redhat-rhel-fedora/" >}}) or [Install Grafana on SUSE or OpenSUSE]({{< relref "../../setup-grafana/installation/suse-opensuse/" >}}) to upgrade Grafana.
+   - If you [downloaded an RPM package](https://grafana.com/grafana/download) to install Grafana, then complete the steps documented in [Install Grafana on Red Hat, RHEL, or Fedora]({{< relref "../../setup-grafana/installation/redhat-rhel-fedora/" >}}) or [Install Grafana on SUSE or openSUSE]({{< relref "../../setup-grafana/installation/suse-opensuse/" >}}) to upgrade Grafana.
    - If you used the Grafana YUM repository, run the following command:
 
      ```bash
      sudo yum update grafana
      ```
 
-   - If you installed Grafana on OpenSUSE or SUSE, run the following command:
+   - If you installed Grafana on openSUSE or SUSE, run the following command:
 
      ```bash
      sudo zypper update