diff --git a/CHANGELOG.md b/CHANGELOG.md
index fd107d12fe7..9215f67bc7c 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,9 @@
 # Changelog
 
+## 2.36.1 / 2022-06-09
+
+* [BUGFIX] promtool: Add --lint-fatal option #10840
+
 ## 2.36.0 / 2022-05-30
 
 * [FEATURE] Add lowercase and uppercase relabel action. #10641
diff --git a/VERSION b/VERSION
index 3a05135cd86..089d1d4e029 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-2.36.0
+2.36.1