diff --git a/CHANGELOG.md b/CHANGELOG.md
index f68f61c..1aab517 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -4,7 +4,7 @@ All notable changes to this project will be documented in this file.
 
 The format is roughly based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/).
 
-<!-- start changelog -->
+<!-- start-of-changelog -->
 
 ## 0.39.0
 
@@ -366,4 +366,4 @@ The format is roughly based on [Keep a Changelog](https://keepachangelog.com/en/
 - Skip failing back-ends when merging `/jobs` listings (EP-4014)
 
 
-<!-- end changelog -->
+<!-- end-of-changelog -->
diff --git a/docs/pages/changelog.md b/docs/pages/changelog.md
index 2d54f25..0ab448c 100644
--- a/docs/pages/changelog.md
+++ b/docs/pages/changelog.md
@@ -2,6 +2,6 @@
 
 
 ```{include} ../../CHANGELOG.md
-:start-after: <!-- start changelog -->
-:end-before: <!-- end changelog -->
+:start-after: <!-- start-of-changelog -->
+:end-before: <!-- end-of-changelog -->
 ```