diff --git a/CHANGELOG.md b/CHANGELOG.md
index e5bd4257..c2331c39 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]
+### Fixed
+- Optimised default glue paths for improved indexing performance ([#232](https://github.com/cucumber/vscode/pull/232))
 
 ## [1.10.0] - 2024-04-21
 ### Added
diff --git a/README.md b/README.md
index bd76bd77..61789c00 100644
--- a/README.md
+++ b/README.md
@@ -150,8 +150,8 @@ Default value:
 ```json
 {
   "cucumber.features": [
-    "src/test/**/*.feature",
     "features/**/*.feature",
+    "src/test/**/*.feature",
     "tests/**/*.feature",
     "*specs*/**/*.feature"
   ]
@@ -177,19 +177,9 @@ Default value:
 ```json
 {
   "cucumber.glue": [
-    "*specs*/**/*.cs",
-    "features/**/*.js",
-    "features/**/*.jsx",
-    "features/**/*.php",
-    "features/**/*.py",
-    "features/**/*.rs",
-    "features/**/*.rb",
-    "features/**/*.ts",
-    "features/**/*.tsx",
-    "features/**/*_test.go",
-    "src/test/**/*.java",
-    "tests/**/*.py",
-    "tests/**/*.rs"
+    "features/**/*{.js,.jsx,.php,.py,.rb,.rs,.ts,.tsx,_test.go,.java}",
+    "tests/**/*{.py,.rs}",
+    "*specs*/**/*.cs"
   ]
 }
 ```
diff --git a/package.json b/package.json
index 94164be9..98e5e90d 100644
--- a/package.json
+++ b/package.json
@@ -50,34 +50,24 @@
       "title": "Cucumber",
       "properties": {
         "cucumber.features": {
-          "markdownDescription": "The `cucumber.features` setting overrides where the extension\nshould look for `.feature` files.\n\nIf no feature files are found, [autocomplete](#autocomplete)\nwill not work.\n\nDefault value:\n\n```json\n{\n  \"cucumber.features\": [\n    \"src/test/**/*.feature\",\n    \"features/**/*.feature\",\n    \"tests/**/*.feature\",\n    \"*specs*/**/*.feature\"\n  ]\n}\n```",
+          "markdownDescription": "The `cucumber.features` setting overrides where the extension\nshould look for `.feature` files.\n\nIf no feature files are found, [autocomplete](#autocomplete)\nwill not work.\n\nDefault value:\n\n```json\n{\n  \"cucumber.features\": [\n    \"features/**/*.feature\",\n    \"src/test/**/*.feature\",\n    \"tests/**/*.feature\",\n    \"*specs*/**/*.feature\"\n  ]\n}\n```",
           "type": "array",
           "required": false,
           "default": [
-            "src/test/**/*.feature",
             "features/**/*.feature",
+            "src/test/**/*.feature",
             "tests/**/*.feature",
             "*specs*/**/*.feature"
           ]
         },
         "cucumber.glue": {
-          "markdownDescription": "The `cucumber.glue` setting overrides where the extension\nshould look for source code where step definitions and\nparameter types are defined.\n\nIf no glue files are found, [autocomplete](#autocomplete)\nwill not work, and all Gherkin steps will be underlined as\nundefined. [Generate step definition](#generate-step-definition)\nwill not work either.\n\nDefault value:\n\n```json\n{\n  \"cucumber.glue\": [\n    \"*specs*/**/*.cs\",\n    \"features/**/*.js\",\n    \"features/**/*.jsx\",\n    \"features/**/*.php\",\n    \"features/**/*.py\",\n    \"features/**/*.rs\",\n    \"features/**/*.rb\",\n    \"features/**/*.ts\",\n    \"features/**/*.tsx\",\n    \"features/**/*_test.go\",\n    \"src/test/**/*.java\",\n    \"tests/**/*.py\",\n    \"tests/**/*.rs\"\n  ]\n}\n```",
+          "markdownDescription": "The `cucumber.glue` setting overrides where the extension\nshould look for source code where step definitions and\nparameter types are defined.\n\nIf no glue files are found, [autocomplete](#autocomplete)\nwill not work, and all Gherkin steps will be underlined as\nundefined. [Generate step definition](#generate-step-definition)\nwill not work either.\n\nDefault value:\n\n```json\n{\n  \"cucumber.glue\": [\n    \"features/**/*{.js,.jsx,.php,.py,.rb,.rs,.ts,.tsx,_test.go,.java}\",\n    \"tests/**/*{.py,.rs}\",\n    \"*specs*/**/*.cs\"\n  ]\n}\n```",
           "type": "array",
           "required": false,
           "default": [
-            "*specs*/**/*.cs",
-            "features/**/*.js",
-            "features/**/*.jsx",
-            "features/**/*.php",
-            "features/**/*.py",
-            "features/**/*.rs",
-            "features/**/*.rb",
-            "features/**/*.ts",
-            "features/**/*.tsx",
-            "features/**/*_test.go",
-            "src/test/**/*.java",
-            "tests/**/*.py",
-            "tests/**/*.rs"
+            "features/**/*{.js,.jsx,.php,.py,.rb,.rs,.ts,.tsx,_test.go,.java}",
+            "tests/**/*{.py,.rs}",
+            "*specs*/**/*.cs"
           ]
         },
         "cucumber.parameterTypes": {