diff --git a/.drone.yml b/.drone.yml
index 7f89d438528..ee4883c7ea9 100644
--- a/.drone.yml
+++ b/.drone.yml
@@ -39,7 +39,7 @@ steps:
 - name: codespell
   image: grafana/build-container:1.4.1
   commands:
-  - "echo -e \"unknwon\nreferer\nerrorstring\neror\niam\" > words_to_ignore.txt"
+  - "echo -e \"unknwon\nreferer\nerrorstring\neror\niam\nwan\" > words_to_ignore.txt"
   - codespell -I words_to_ignore.txt docs/
   depends_on:
   - initialize
@@ -285,7 +285,7 @@ steps:
 - name: codespell
   image: grafana/build-container:1.4.1
   commands:
-  - "echo -e \"unknwon\nreferer\nerrorstring\neror\niam\" > words_to_ignore.txt"
+  - "echo -e \"unknwon\nreferer\nerrorstring\neror\niam\nwan\" > words_to_ignore.txt"
   - codespell -I words_to_ignore.txt docs/
   depends_on:
   - initialize
@@ -733,7 +733,7 @@ steps:
 - name: codespell
   image: grafana/build-container:1.4.1
   commands:
-  - "echo -e \"unknwon\nreferer\nerrorstring\neror\niam\" > words_to_ignore.txt"
+  - "echo -e \"unknwon\nreferer\nerrorstring\neror\niam\nwan\" > words_to_ignore.txt"
   - codespell -I words_to_ignore.txt docs/
   depends_on:
   - initialize
@@ -1101,7 +1101,7 @@ steps:
 - name: codespell
   image: grafana/build-container:1.4.1
   commands:
-  - "echo -e \"unknwon\nreferer\nerrorstring\neror\niam\" > words_to_ignore.txt"
+  - "echo -e \"unknwon\nreferer\nerrorstring\neror\niam\nwan\" > words_to_ignore.txt"
   - codespell -I words_to_ignore.txt docs/
   depends_on:
   - initialize
@@ -1668,7 +1668,7 @@ steps:
 - name: codespell
   image: grafana/build-container:1.4.1
   commands:
-  - "echo -e \"unknwon\nreferer\nerrorstring\neror\niam\" > words_to_ignore.txt"
+  - "echo -e \"unknwon\nreferer\nerrorstring\neror\niam\nwan\" > words_to_ignore.txt"
   - codespell -I words_to_ignore.txt docs/
   depends_on:
   - initialize
@@ -2025,7 +2025,7 @@ steps:
 - name: codespell
   image: grafana/build-container:1.4.1
   commands:
-  - "echo -e \"unknwon\nreferer\nerrorstring\neror\niam\" > words_to_ignore.txt"
+  - "echo -e \"unknwon\nreferer\nerrorstring\neror\niam\nwan\" > words_to_ignore.txt"
   - codespell -I words_to_ignore.txt docs/
   depends_on:
   - initialize
@@ -2585,7 +2585,7 @@ steps:
 - name: codespell
   image: grafana/build-container:1.4.1
   commands:
-  - "echo -e \"unknwon\nreferer\nerrorstring\neror\niam\" > words_to_ignore.txt"
+  - "echo -e \"unknwon\nreferer\nerrorstring\neror\niam\nwan\" > words_to_ignore.txt"
   - codespell -I words_to_ignore.txt docs/
   depends_on:
   - initialize
@@ -2913,7 +2913,7 @@ steps:
 - name: codespell
   image: grafana/build-container:1.4.1
   commands:
-  - "echo -e \"unknwon\nreferer\nerrorstring\neror\niam\" > words_to_ignore.txt"
+  - "echo -e \"unknwon\nreferer\nerrorstring\neror\niam\nwan\" > words_to_ignore.txt"
   - codespell -I words_to_ignore.txt docs/
   depends_on:
   - initialize
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 1313710e041..a4fda56bbb2 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,4 +1,23 @@
 
+<!-- 7.5.4 START -->
+
+# 7.5.4 (2021-04-14)
+
+### Features and enhancements
+
+* **AzureMonitor**: Add support for Microsoft.AppConfiguration/configurationStores namespace. [#32123](https://github.com/grafana/grafana/pull/32123), [@deesejohn](https://github.com/deesejohn)
+* **TablePanel**: Make sorting case-insensitive. [#32435](https://github.com/grafana/grafana/pull/32435), [@kaydelaney](https://github.com/kaydelaney)
+
+### Bug fixes
+
+* **AzureMonitor**: Add support for Virtual WAN namespaces. [#32935](https://github.com/grafana/grafana/pull/32935), [@joshhunt](https://github.com/joshhunt)
+* **Bugfix**: Add proper padding when scrolling is added to bar gauge. [#32411](https://github.com/grafana/grafana/pull/32411), [@mckn](https://github.com/mckn)
+* **Datasource**: Prevent default data source named "default" from causing infinite loop. [#32949](https://github.com/grafana/grafana/pull/32949), [@jackw](https://github.com/jackw)
+* **Prometheus**: Allow query_exemplars endpoint in data source proxy. [#32802](https://github.com/grafana/grafana/pull/32802), [@zoltanbedi](https://github.com/zoltanbedi)
+* **Table**: Fix table data links so they refer to correct row after sorting. [#32571](https://github.com/grafana/grafana/pull/32571), [@torkelo](https://github.com/torkelo)
+
+<!-- 7.5.4 END -->
+
 <!-- 7.5.3 START -->
 
 # 7.5.3 (2021-04-07)
diff --git a/docs/sources/release-notes/_index.md b/docs/sources/release-notes/_index.md
index ff79d2f7cf7..86a85a37389 100644
--- a/docs/sources/release-notes/_index.md
+++ b/docs/sources/release-notes/_index.md
@@ -8,6 +8,7 @@ weight = 10000
 Here you can find detailed release notes that list everything that is included in every release as well as notices
 about deprecations, breaking changes as well as changes that relate to plugin development.
 
+- [Release notes for 7.5.4]({{< relref "release-notes-7-5-4" >}})
 - [Release notes for 7.5.3]({{< relref "release-notes-7-5-3" >}})
 - [Release notes for 7.5.2]({{< relref "release-notes-7-5-2" >}})
 - [Release notes for 7.5.1]({{< relref "release-notes-7-5-1" >}})
diff --git a/docs/sources/release-notes/release-notes-7-5-4.md b/docs/sources/release-notes/release-notes-7-5-4.md
new file mode 100644
index 00000000000..125b0767209
--- /dev/null
+++ b/docs/sources/release-notes/release-notes-7-5-4.md
@@ -0,0 +1,22 @@
++++
+title = "Release notes for Grafana 7.5.4"
+[_build]
+list = false
++++
+
+<!-- Auto generated by update changelog github action -->
+
+# Release notes for Grafana 7.5.4
+
+### Features and enhancements
+
+* **AzureMonitor:** Add support for Microsoft.AppConfiguration/configurationStores namespace. [#32123](https://github.com/grafana/grafana/pull/32123), [@deesejohn](https://github.com/deesejohn)
+* **TablePanel:** Make sorting case-insensitive. [#32435](https://github.com/grafana/grafana/pull/32435), [@kaydelaney](https://github.com/kaydelaney)
+
+### Bug fixes
+
+* **AzureMonitor:** Add support for Virtual WAN namespaces. [#32935](https://github.com/grafana/grafana/pull/32935), [@joshhunt](https://github.com/joshhunt)
+* **Bugfix:** Add proper padding when scrolling is added to bar gauge. [#32411](https://github.com/grafana/grafana/pull/32411), [@mckn](https://github.com/mckn)
+* **Datasource:** Prevent default data source named "default" from causing infinite loop. [#32949](https://github.com/grafana/grafana/pull/32949), [@jackw](https://github.com/jackw)
+* **Prometheus:** Allow query_exemplars endpoint in data source proxy. [#32802](https://github.com/grafana/grafana/pull/32802), [@zoltanbedi](https://github.com/zoltanbedi)
+* **Table:** Fix table data links so they refer to correct row after sorting. [#32571](https://github.com/grafana/grafana/pull/32571), [@torkelo](https://github.com/torkelo)
diff --git a/scripts/lib.star b/scripts/lib.star
index 3ace8349a2d..70264f9ae89 100644
--- a/scripts/lib.star
+++ b/scripts/lib.star
@@ -509,7 +509,7 @@ def codespell_step():
         ],
         'commands': [
             # Important: all words have to be in lowercase, and separated by "\n".
-            'echo -e "unknwon\nreferer\nerrorstring\neror\niam" > words_to_ignore.txt',
+            'echo -e "unknwon\nreferer\nerrorstring\neror\niam\nwan" > words_to_ignore.txt',
             'codespell -I words_to_ignore.txt docs/',
         ],
     }