diff --git a/package-lock.json b/package-lock.json
index ea17efb13..1c0fb5151 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -10,8 +10,8 @@
       "license": "MIT",
       "dependencies": {
         "@cucumber/create-meta": "6.0.1",
-        "@cucumber/cucumber-expressions": "12.1.3",
-        "@cucumber/gherkin": "21.0.0",
+        "@cucumber/cucumber-expressions": "13.1.3",
+        "@cucumber/gherkin": "22.0.0",
         "@cucumber/gherkin-streams": "4.0.0",
         "@cucumber/html-formatter": "17.0.0",
         "@cucumber/messages": "17.1.1",
@@ -546,20 +546,20 @@
       }
     },
     "node_modules/@cucumber/cucumber-expressions": {
-      "version": "12.1.3",
-      "resolved": "https://registry.npmjs.org/@cucumber/cucumber-expressions/-/cucumber-expressions-12.1.3.tgz",
-      "integrity": "sha512-LB8MAzE4F/t2KIgsDEz4gZH0xSI4aG0/LmYUPyISPPjUS1pI/yGWWyeX2WsiUQxpSs765WcNIq5Bggt7gGGO3Q==",
+      "version": "13.1.3",
+      "resolved": "https://registry.npmjs.org/@cucumber/cucumber-expressions/-/cucumber-expressions-13.1.3.tgz",
+      "integrity": "sha512-2TLN3Q7Hatcx5sOVU/JSCNv80yD2pphPLN9BVIY3+cDkyY80Z9+LxhNFayDFRs+SfMuAmu6VfQVuzHJ6ahrc9w==",
       "dependencies": {
         "regexp-match-indices": "1.0.2"
       }
     },
     "node_modules/@cucumber/gherkin": {
-      "version": "21.0.0",
-      "resolved": "https://registry.npmjs.org/@cucumber/gherkin/-/gherkin-21.0.0.tgz",
-      "integrity": "sha512-S6YFmTg56iEn563ReePL6Sygb77vwYrGHEr7NwuLIgg20Hi1pp7P80BAYVYNRgU7nK9vG2II9O6kaZbiOXF/5g==",
+      "version": "22.0.0",
+      "resolved": "https://registry.npmjs.org/@cucumber/gherkin/-/gherkin-22.0.0.tgz",
+      "integrity": "sha512-D5OghXE8kkZm7pcwo8TvQMgrrXGMXEjERdKLU0T7dQIbc6k0BmMX8dTRh2cwAjH8c7vhwdd0qLU8FPQgGGj+bg==",
       "dependencies": {
         "@cucumber/message-streams": "^3.0.0",
-        "@cucumber/messages": "^17.1.0"
+        "@cucumber/messages": "^17.1.1"
       }
     },
     "node_modules/@cucumber/gherkin-streams": {
@@ -577,6 +577,15 @@
         "gherkin-javascript": "bin/gherkin"
       }
     },
+    "node_modules/@cucumber/gherkin-streams/node_modules/@cucumber/gherkin": {
+      "version": "21.0.0",
+      "resolved": "https://registry.npmjs.org/@cucumber/gherkin/-/gherkin-21.0.0.tgz",
+      "integrity": "sha512-S6YFmTg56iEn563ReePL6Sygb77vwYrGHEr7NwuLIgg20Hi1pp7P80BAYVYNRgU7nK9vG2II9O6kaZbiOXF/5g==",
+      "dependencies": {
+        "@cucumber/message-streams": "^3.0.0",
+        "@cucumber/messages": "^17.1.0"
+      }
+    },
     "node_modules/@cucumber/html-formatter": {
       "version": "17.0.0",
       "resolved": "https://registry.npmjs.org/@cucumber/html-formatter/-/html-formatter-17.0.0.tgz",
@@ -7526,20 +7535,20 @@
       }
     },
     "@cucumber/cucumber-expressions": {
-      "version": "12.1.3",
-      "resolved": "https://registry.npmjs.org/@cucumber/cucumber-expressions/-/cucumber-expressions-12.1.3.tgz",
-      "integrity": "sha512-LB8MAzE4F/t2KIgsDEz4gZH0xSI4aG0/LmYUPyISPPjUS1pI/yGWWyeX2WsiUQxpSs765WcNIq5Bggt7gGGO3Q==",
+      "version": "13.1.3",
+      "resolved": "https://registry.npmjs.org/@cucumber/cucumber-expressions/-/cucumber-expressions-13.1.3.tgz",
+      "integrity": "sha512-2TLN3Q7Hatcx5sOVU/JSCNv80yD2pphPLN9BVIY3+cDkyY80Z9+LxhNFayDFRs+SfMuAmu6VfQVuzHJ6ahrc9w==",
       "requires": {
         "regexp-match-indices": "1.0.2"
       }
     },
     "@cucumber/gherkin": {
-      "version": "21.0.0",
-      "resolved": "https://registry.npmjs.org/@cucumber/gherkin/-/gherkin-21.0.0.tgz",
-      "integrity": "sha512-S6YFmTg56iEn563ReePL6Sygb77vwYrGHEr7NwuLIgg20Hi1pp7P80BAYVYNRgU7nK9vG2II9O6kaZbiOXF/5g==",
+      "version": "22.0.0",
+      "resolved": "https://registry.npmjs.org/@cucumber/gherkin/-/gherkin-22.0.0.tgz",
+      "integrity": "sha512-D5OghXE8kkZm7pcwo8TvQMgrrXGMXEjERdKLU0T7dQIbc6k0BmMX8dTRh2cwAjH8c7vhwdd0qLU8FPQgGGj+bg==",
       "requires": {
         "@cucumber/message-streams": "^3.0.0",
-        "@cucumber/messages": "^17.1.0"
+        "@cucumber/messages": "^17.1.1"
       }
     },
     "@cucumber/gherkin-streams": {
@@ -7552,6 +7561,17 @@
         "@cucumber/messages": "^17.1.0",
         "commander": "8.1.0",
         "source-map-support": "0.5.19"
+      },
+      "dependencies": {
+        "@cucumber/gherkin": {
+          "version": "21.0.0",
+          "resolved": "https://registry.npmjs.org/@cucumber/gherkin/-/gherkin-21.0.0.tgz",
+          "integrity": "sha512-S6YFmTg56iEn563ReePL6Sygb77vwYrGHEr7NwuLIgg20Hi1pp7P80BAYVYNRgU7nK9vG2II9O6kaZbiOXF/5g==",
+          "requires": {
+            "@cucumber/message-streams": "^3.0.0",
+            "@cucumber/messages": "^17.1.0"
+          }
+        }
       }
     },
     "@cucumber/html-formatter": {
diff --git a/package.json b/package.json
index 371b388c0..0d9ed67fa 100644
--- a/package.json
+++ b/package.json
@@ -178,8 +178,8 @@
   },
   "dependencies": {
     "@cucumber/create-meta": "6.0.1",
-    "@cucumber/cucumber-expressions": "12.1.3",
-    "@cucumber/gherkin": "21.0.0",
+    "@cucumber/cucumber-expressions": "13.1.3",
+    "@cucumber/gherkin": "22.0.0",
     "@cucumber/gherkin-streams": "4.0.0",
     "@cucumber/html-formatter": "17.0.0",
     "@cucumber/messages": "17.1.1",
diff --git a/src/formatter/step_definition_snippet_builder/javascript_snippet_syntax_spec.ts b/src/formatter/step_definition_snippet_builder/javascript_snippet_syntax_spec.ts
index 18fcf7781..16747cfe8 100644
--- a/src/formatter/step_definition_snippet_builder/javascript_snippet_syntax_spec.ts
+++ b/src/formatter/step_definition_snippet_builder/javascript_snippet_syntax_spec.ts
@@ -3,9 +3,9 @@ import { expect } from 'chai'
 import JavascriptSnippetSyntax from './javascript_snippet_syntax'
 import { SnippetInterface } from './snippet_syntax'
 import { ISnippetSyntaxBuildOptions } from '../../../lib/formatter/step_definition_snippet_builder/snippet_syntax'
-import GeneratedExpression from '@cucumber/cucumber-expressions/dist/src/GeneratedExpression'
 import {
   CucumberExpressionGenerator,
+  GeneratedExpression,
   ParameterTypeRegistry,
 } from '@cucumber/cucumber-expressions'
 import { reindent } from 'reindent-template-literals'
diff --git a/src/formatter/step_definition_snippet_builder/snippet_syntax.ts b/src/formatter/step_definition_snippet_builder/snippet_syntax.ts
index 264ec3ab2..ca25a8f2c 100644
--- a/src/formatter/step_definition_snippet_builder/snippet_syntax.ts
+++ b/src/formatter/step_definition_snippet_builder/snippet_syntax.ts
@@ -1,4 +1,4 @@
-import GeneratedExpression from '@cucumber/cucumber-expressions/dist/src/GeneratedExpression'
+import { GeneratedExpression } from '@cucumber/cucumber-expressions'
 
 export enum SnippetInterface {
   AsyncAwait = 'async-await',