diff --git a/fake-cucumber/javascript/package.json b/fake-cucumber/javascript/package.json
index b52fe70f2a..eaf7772066 100644
--- a/fake-cucumber/javascript/package.json
+++ b/fake-cucumber/javascript/package.json
@@ -44,7 +44,7 @@
     "@cucumber/cucumber-expressions": "^15.0.0",
     "@cucumber/gherkin": "^24.0.0",
     "@cucumber/gherkin-streams": "^5.0.1",
-    "@cucumber/gherkin-utils": "^7.0.0",
+    "@cucumber/gherkin-utils": "^8.0.0",
     "@cucumber/message-streams": "^4.0.1",
     "@cucumber/messages": "^19.0.0",
     "@cucumber/tag-expressions": "^4.1.0",
diff --git a/gherkin-utils/CHANGELOG.md b/gherkin-utils/CHANGELOG.md
index deec7aa612..0ce4beeb93 100644
--- a/gherkin-utils/CHANGELOG.md
+++ b/gherkin-utils/CHANGELOG.md
@@ -17,6 +17,13 @@ and this project adheres to [Semantic Versioning](http://semver.org/).
 
 ### Fixed
 
+## [8.0.0] - 2022-05-31
+
+### Changed
+
+* Upgrade to `@cucumber/messages` `19.0.0`
+* Upgrade to `@cucumber/gherkin` `24.0.0`
+
 ## [7.0.0] - 2021-09-01
 
 ### Added
@@ -118,7 +125,8 @@ and this project adheres to [Semantic Versioning](http://semver.org/).
 * First release
 
 <!-- Releases -->
-[Unreleased]: https://github.com/cucumber/cucumber/compare/gherkin-utils/v7.0.0...main
+[Unreleased]: https://github.com/cucumber/cucumber/compare/gherkin-utils/v8.0.0...main
+[8.0.0]:      https://github.com/cucumber/cucumber/compare/gherkin-utils/v7.0.0...gherkin-utils/v8.0.0
 [7.0.0]:      https://github.com/cucumber/cucumber/compare/gherkin-utils/v6.0.0...gherkin-utils/v7.0.0
 [6.0.0]:      https://github.com/cucumber/cucumber/compare/gherkin-utils/v5.1.0...gherkin-utils/v6.0.0
 [5.1.0]:      https://github.com/cucumber/cucumber/compare/gherkin-utils/v5.0.2...gherkin-utils/v5.1.0
diff --git a/gherkin-utils/java/pom.xml b/gherkin-utils/java/pom.xml
index f3247c1a2a..24d8a86a99 100644
--- a/gherkin-utils/java/pom.xml
+++ b/gherkin-utils/java/pom.xml
@@ -1,10 +1,15 @@
 <?xml version="1.0"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
   <modelVersion>4.0.0</modelVersion>
-  <groupId>io.cucumber</groupId>
+
+  <parent>
+      <groupId>io.cucumber</groupId>
+      <artifactId>cucumber-parent</artifactId>
+      <version>3.0.0</version>
+  </parent>
+
   <artifactId>gherkin-utils</artifactId>
-  <version>22.0.0</version>
+  <version>8.0.0</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.
@@ -12,7 +17,7 @@
   <url>https://github.com/cucumber/common</url>
 
   <properties>
-    <project.Automatic-Module-Name>io.cucumber.gherkin-utils</project.Automatic-Module-Name>
+    <project.Automatic-Module-Name>io.cucumber.gherkin.utils</project.Automatic-Module-Name>
     <maven.compiler.source>8</maven.compiler.source>
     <maven.compiler.target>8</maven.compiler.target>
   </properties>
@@ -28,7 +33,7 @@
     <dependency>
       <groupId>io.cucumber</groupId>
       <artifactId>gherkin</artifactId>
-      <version>24.0.1-SNAPSHOT</version>
+      <version>[24.0.0,25.0.0)</version>
     </dependency>
 
     <dependency>
@@ -38,19 +43,4 @@
       <scope>test</scope>
     </dependency>
   </dependencies>
-
-  <build>
-    <plugins>
-      <plugin>
-        <artifactId>maven-jar-plugin</artifactId>
-        <version>3.2.2</version>
-      </plugin>
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-surefire-plugin</artifactId>
-        <version>2.22.2</version>
-      </plugin>
-    </plugins>
-  </build>
-
 </project>
diff --git a/gherkin-utils/javascript/package.json b/gherkin-utils/javascript/package.json
index fd40e2ea52..52d15719fe 100644
--- a/gherkin-utils/javascript/package.json
+++ b/gherkin-utils/javascript/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@cucumber/gherkin-utils",
-  "version": "7.0.0",
+  "version": "8.0.0",
   "description": "Various Gherkin utilities",
   "main": "dist/src/index.js",
   "types": "dist/src/index.d.ts",
@@ -27,7 +27,7 @@
   "devDependencies": {
     "@cucumber/gherkin": "^24.0.0",
     "@cucumber/gherkin-streams": "^5.0.1",
-    "@cucumber/message-streams": "^4.0.0",
+    "@cucumber/message-streams": "^4.0.1",
     "@types/mocha": "9.1.1",
     "@types/node": "16.11.36",
     "fast-glob": "3.2.11",
diff --git a/json-to-messages/javascript/package.json b/json-to-messages/javascript/package.json
index 15087ff708..19b42d40bd 100644
--- a/json-to-messages/javascript/package.json
+++ b/json-to-messages/javascript/package.json
@@ -38,7 +38,7 @@
     "@cucumber/fake-cucumber": "^15.0.0",
     "@cucumber/gherkin": "^24.0.0",
     "@cucumber/gherkin-streams": "^5.0.1",
-    "@cucumber/gherkin-utils": "^7.0.0",
+    "@cucumber/gherkin-utils": "^8.0.0",
     "@cucumber/message-streams": "^4.0.1",
     "@cucumber/messages": "^19.0.0",
     "commander": "9.3.0",
diff --git a/package-lock.json b/package-lock.json
index 258e75c6e6..c669dfae1b 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -63,7 +63,7 @@
         "@cucumber/cucumber-expressions": "^15.0.0",
         "@cucumber/gherkin": "^24.0.0",
         "@cucumber/gherkin-streams": "^5.0.1",
-        "@cucumber/gherkin-utils": "^7.0.0",
+        "@cucumber/gherkin-utils": "^8.0.0",
         "@cucumber/message-streams": "^4.0.1",
         "@cucumber/messages": "^19.0.0",
         "@cucumber/tag-expressions": "^4.1.0",
@@ -108,7 +108,7 @@
     },
     "gherkin-utils/javascript": {
       "name": "@cucumber/gherkin-utils",
-      "version": "7.0.0",
+      "version": "8.0.0",
       "license": "MIT",
       "dependencies": {
         "@cucumber/messages": "^19.0.0",
@@ -121,7 +121,7 @@
       "devDependencies": {
         "@cucumber/gherkin": "^24.0.0",
         "@cucumber/gherkin-streams": "^5.0.1",
-        "@cucumber/message-streams": "^4.0.0",
+        "@cucumber/message-streams": "^4.0.1",
         "@types/mocha": "9.1.1",
         "@types/node": "16.11.36",
         "fast-glob": "3.2.11",
@@ -156,7 +156,7 @@
         "@cucumber/fake-cucumber": "^15.0.0",
         "@cucumber/gherkin": "^24.0.0",
         "@cucumber/gherkin-streams": "^5.0.1",
-        "@cucumber/gherkin-utils": "^7.0.0",
+        "@cucumber/gherkin-utils": "^8.0.0",
         "@cucumber/message-streams": "^4.0.1",
         "@cucumber/messages": "^19.0.0",
         "commander": "9.3.0",
@@ -436,6 +436,48 @@
         "@cucumber/messages": "^18.0.0"
       }
     },
+    "node_modules/@cucumber/cucumber/node_modules/@cucumber/gherkin-utils": {
+      "version": "7.0.0",
+      "resolved": "https://registry.npmjs.org/@cucumber/gherkin-utils/-/gherkin-utils-7.0.0.tgz",
+      "integrity": "sha512-tDkSRITTPA6Df501doqeRH3+1jAM4ls6+tlFEVvkvuzTH3C8DXwQ5xBPWmUNmDhR/gJeZ+yj7gDRbDWr7Qc6Zw==",
+      "dependencies": {
+        "@cucumber/messages": "^17.1.0",
+        "@teppeis/multimaps": "2.0.0",
+        "commander": "8.1.0"
+      },
+      "bin": {
+        "gherkin-utils": "bin/gherkin-utils"
+      }
+    },
+    "node_modules/@cucumber/cucumber/node_modules/@cucumber/gherkin-utils/node_modules/@cucumber/messages": {
+      "version": "17.1.1",
+      "resolved": "https://registry.npmjs.org/@cucumber/messages/-/messages-17.1.1.tgz",
+      "integrity": "sha512-KQMn2Ag+1g1CXp/zKQ7LLqmuHjuQwuXw0N2u5SrDk8r72zPt36SxmDSJK7w6HiFTI+3p5ZuzwLi4S5jop3Tx4g==",
+      "dependencies": {
+        "@types/uuid": "8.3.1",
+        "class-transformer": "0.4.0",
+        "reflect-metadata": "0.1.13",
+        "uuid": "8.3.2"
+      }
+    },
+    "node_modules/@cucumber/cucumber/node_modules/@cucumber/gherkin-utils/node_modules/@types/uuid": {
+      "version": "8.3.1",
+      "resolved": "https://registry.npmjs.org/@types/uuid/-/uuid-8.3.1.tgz",
+      "integrity": "sha512-Y2mHTRAbqfFkpjldbkHGY8JIzRN6XqYRliG8/24FcHm2D2PwW24fl5xMRTVGdrb7iMrwCaIEbLWerGIkXuFWVg=="
+    },
+    "node_modules/@cucumber/cucumber/node_modules/@cucumber/gherkin-utils/node_modules/class-transformer": {
+      "version": "0.4.0",
+      "resolved": "https://registry.npmjs.org/class-transformer/-/class-transformer-0.4.0.tgz",
+      "integrity": "sha512-ETWD/H2TbWbKEi7m9N4Km5+cw1hNcqJSxlSYhsLsNjQzWWiZIYA1zafxpK9PwVfaZ6AqR5rrjPVUBGESm5tQUA=="
+    },
+    "node_modules/@cucumber/cucumber/node_modules/@cucumber/gherkin-utils/node_modules/commander": {
+      "version": "8.1.0",
+      "resolved": "https://registry.npmjs.org/commander/-/commander-8.1.0.tgz",
+      "integrity": "sha512-mf45ldcuHSYShkplHHGKWb4TrmwQadxOn7v4WuhDJy0ZVoY5JFajaRDKD0PNe5qXzBX0rhovjTnP6Kz9LETcuA==",
+      "engines": {
+        "node": ">= 12"
+      }
+    },
     "node_modules/@cucumber/cucumber/node_modules/@cucumber/messages": {
       "version": "18.0.0",
       "resolved": "https://registry.npmjs.org/@cucumber/messages/-/messages-18.0.0.tgz",
@@ -7704,7 +7746,7 @@
         "@cucumber/fake-cucumber": "^15.0.0",
         "@cucumber/gherkin": "^24.0.0",
         "@cucumber/gherkin-streams": "^5.0.1",
-        "@cucumber/gherkin-utils": "^7.0.0",
+        "@cucumber/gherkin-utils": "^8.0.0",
         "@types/mocha": "9.1.1",
         "@types/node": "16.11.36",
         "mocha": "10.0.0",
@@ -7895,6 +7937,44 @@
             "@cucumber/messages": "^18.0.0"
           }
         },
+        "@cucumber/gherkin-utils": {
+          "version": "7.0.0",
+          "resolved": "https://registry.npmjs.org/@cucumber/gherkin-utils/-/gherkin-utils-7.0.0.tgz",
+          "integrity": "sha512-tDkSRITTPA6Df501doqeRH3+1jAM4ls6+tlFEVvkvuzTH3C8DXwQ5xBPWmUNmDhR/gJeZ+yj7gDRbDWr7Qc6Zw==",
+          "requires": {
+            "@cucumber/messages": "^17.1.0",
+            "@teppeis/multimaps": "2.0.0",
+            "commander": "8.1.0"
+          },
+          "dependencies": {
+            "@cucumber/messages": {
+              "version": "17.1.1",
+              "resolved": "https://registry.npmjs.org/@cucumber/messages/-/messages-17.1.1.tgz",
+              "integrity": "sha512-KQMn2Ag+1g1CXp/zKQ7LLqmuHjuQwuXw0N2u5SrDk8r72zPt36SxmDSJK7w6HiFTI+3p5ZuzwLi4S5jop3Tx4g==",
+              "requires": {
+                "@types/uuid": "8.3.1",
+                "class-transformer": "0.4.0",
+                "reflect-metadata": "0.1.13",
+                "uuid": "8.3.2"
+              }
+            },
+            "@types/uuid": {
+              "version": "8.3.1",
+              "resolved": "https://registry.npmjs.org/@types/uuid/-/uuid-8.3.1.tgz",
+              "integrity": "sha512-Y2mHTRAbqfFkpjldbkHGY8JIzRN6XqYRliG8/24FcHm2D2PwW24fl5xMRTVGdrb7iMrwCaIEbLWerGIkXuFWVg=="
+            },
+            "class-transformer": {
+              "version": "0.4.0",
+              "resolved": "https://registry.npmjs.org/class-transformer/-/class-transformer-0.4.0.tgz",
+              "integrity": "sha512-ETWD/H2TbWbKEi7m9N4Km5+cw1hNcqJSxlSYhsLsNjQzWWiZIYA1zafxpK9PwVfaZ6AqR5rrjPVUBGESm5tQUA=="
+            },
+            "commander": {
+              "version": "8.1.0",
+              "resolved": "https://registry.npmjs.org/commander/-/commander-8.1.0.tgz",
+              "integrity": "sha512-mf45ldcuHSYShkplHHGKWb4TrmwQadxOn7v4WuhDJy0ZVoY5JFajaRDKD0PNe5qXzBX0rhovjTnP6Kz9LETcuA=="
+            }
+          }
+        },
         "@cucumber/messages": {
           "version": "18.0.0",
           "resolved": "https://registry.npmjs.org/@cucumber/messages/-/messages-18.0.0.tgz",
@@ -7931,7 +8011,7 @@
         "@cucumber/cucumber-expressions": "^15.0.0",
         "@cucumber/gherkin": "^24.0.0",
         "@cucumber/gherkin-streams": "^5.0.1",
-        "@cucumber/gherkin-utils": "^7.0.0",
+        "@cucumber/gherkin-utils": "^8.0.0",
         "@cucumber/message-streams": "^4.0.1",
         "@cucumber/messages": "^19.0.0",
         "@cucumber/tag-expressions": "^4.1.0",
@@ -7999,7 +8079,7 @@
       "requires": {
         "@cucumber/gherkin": "^24.0.0",
         "@cucumber/gherkin-streams": "^5.0.1",
-        "@cucumber/message-streams": "^4.0.0",
+        "@cucumber/message-streams": "^4.0.1",
         "@cucumber/messages": "^19.0.0",
         "@teppeis/multimaps": "2.0.0",
         "@types/mocha": "9.1.1",
@@ -8023,7 +8103,7 @@
         "@cucumber/fake-cucumber": "^15.0.0",
         "@cucumber/gherkin": "^24.0.0",
         "@cucumber/gherkin-streams": "^5.0.1",
-        "@cucumber/gherkin-utils": "^7.0.0",
+        "@cucumber/gherkin-utils": "^8.0.0",
         "@cucumber/message-streams": "^4.0.1",
         "@cucumber/messages": "^19.0.0",
         "@types/glob": "7.2.0",
@@ -8079,7 +8159,7 @@
         "@cucumber/fake-cucumber": "^15.0.0",
         "@cucumber/gherkin": "^24.0.0",
         "@cucumber/gherkin-streams": "^5.0.1",
-        "@cucumber/gherkin-utils": "^7.0.0",
+        "@cucumber/gherkin-utils": "^8.0.0",
         "@cucumber/messages": "^19.0.0",
         "@teppeis/multimaps": "2.0.0",
         "@types/mocha": "9.1.1",
diff --git a/query/javascript/package.json b/query/javascript/package.json
index 5a55c0125f..0c32b28bac 100644
--- a/query/javascript/package.json
+++ b/query/javascript/package.json
@@ -25,7 +25,7 @@
     "@cucumber/fake-cucumber": "^15.0.0",
     "@cucumber/gherkin": "^24.0.0",
     "@cucumber/gherkin-streams": "^5.0.1",
-    "@cucumber/gherkin-utils": "^7.0.0",
+    "@cucumber/gherkin-utils": "^8.0.0",
     "@types/mocha": "9.1.1",
     "@types/node": "16.11.36",
     "mocha": "10.0.0",