diff --git a/CHANGELOG.md b/CHANGELOG.md
index 0a1da7bb..d5ad9150 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -6,6 +6,8 @@ The format is based on [Keep a Changelog](http://keepachangelog.com/)
 and this project adheres to [Semantic Versioning](http://semver.org/).
 
 ## [Unreleased]
+
+## [8.0.6] - 2024-02-23
 ### Fixed
 - [JavaScript] Preserve trailing comments at end of file when prettying in JavaScript ([#41](https://github.com/cucumber/gherkin-utils/pull/41)).
 - [JavaScript] Prevent the introduction of trailing whitespace after headings ([#34](https://github.com/cucumber/gherkin-utils/issues/34))
@@ -13,7 +15,7 @@ and this project adheres to [Semantic Versioning](http://semver.org/).
 - [JavaScript] Fix test execution in Windows - Closes (cucumber/gherkin-utils#2)
 - [Java] Fix docstring pretty formatting ([#58](https://github.com/cucumber/gherkin-utils/issues/58))
 - Table formatting for full width characters ([#53](https://github.com/cucumber/gherkin-utils/pull/53))
-- [Java] Fix urls in project metadata 
+- [Java] Fix urls in project metadata
 
 ## [8.0.5] - 2023-06-02
 ### Changed
@@ -123,7 +125,8 @@ Run `npx @cucumber/gherkin-utils --help` for details about usage.
 ### Added
 - First release
 
-[Unreleased]: https://github.com/cucumber/gherkin-utils/compare/v8.0.5...HEAD
+[Unreleased]: https://github.com/cucumber/gherkin-utils/compare/v8.0.6...HEAD
+[8.0.6]: https://github.com/cucumber/gherkin-utils/compare/v8.0.5...v8.0.6
 [8.0.5]: https://github.com/cucumber/gherkin-utils/compare/v8.0.4...v8.0.5
 [8.0.4]: https://github.com/cucumber/gherkin-utils/compare/v8.0.3...v8.0.4
 [8.0.3]: https://github.com/cucumber/gherkin-utils/compare/v8.0.2...v8.0.3
diff --git a/java/pom.xml b/java/pom.xml
index 034fdcad..05a0fc00 100644
--- a/java/pom.xml
+++ b/java/pom.xml
@@ -9,7 +9,7 @@
   </parent>
 
   <artifactId>gherkin-utils</artifactId>
-  <version>8.0.6-SNAPSHOT</version>
+  <version>8.0.6</version>
   <packaging>jar</packaging>
   <name>Gherkin Utils</name>
   <description>Gherkin utils for doing things such as walking a Gherkin tree or pretty printing Gherkin files.
@@ -17,7 +17,7 @@
 
   <properties>
     <project.Automatic-Module-Name>io.cucumber.gherkin.utils</project.Automatic-Module-Name>
-    <project.build.outputTimestamp>1685714387</project.build.outputTimestamp>
+    <project.build.outputTimestamp>1708712970</project.build.outputTimestamp>
     <maven.compiler.source>8</maven.compiler.source>
     <maven.compiler.target>8</maven.compiler.target>
   </properties>
@@ -26,7 +26,7 @@
     <connection>scm:git:git://github.com/cucumber/gherkin-utils.git</connection>
     <developerConnection>scm:git:git@github.com:cucumber/gherkin-utils.git</developerConnection>
     <url>git://github.com/cucumber/gherkin-utils.git</url>
-    <tag>HEAD</tag>
+    <tag>v8.0.6</tag>
   </scm>
 
   <dependencies>
diff --git a/javascript/package-lock.json b/javascript/package-lock.json
index b5d7b7e5..e4159cc1 100644
--- a/javascript/package-lock.json
+++ b/javascript/package-lock.json
@@ -1,12 +1,12 @@
 {
   "name": "@cucumber/gherkin-utils",
-  "version": "8.0.5",
+  "version": "8.0.6",
   "lockfileVersion": 2,
   "requires": true,
   "packages": {
     "": {
       "name": "@cucumber/gherkin-utils",
-      "version": "8.0.5",
+      "version": "8.0.6",
       "license": "MIT",
       "dependencies": {
         "@cucumber/gherkin": "^27.0.0",
diff --git a/javascript/package.json b/javascript/package.json
index 986ea5ba..72a2821f 100644
--- a/javascript/package.json
+++ b/javascript/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@cucumber/gherkin-utils",
-  "version": "8.0.5",
+  "version": "8.0.6",
   "description": "Various Gherkin utilities",
   "main": "dist/src/index.js",
   "types": "dist/src/index.d.ts",