diff --git a/.devcontainer/devcontainer.json b/.devcontainer/devcontainer.json
new file mode 100644
index 000000000000..62c9fc928c4b
--- /dev/null
+++ b/.devcontainer/devcontainer.json
@@ -0,0 +1,28 @@
+{
+  "$schema": "https://raw.githubusercontent.com/devcontainers/spec/main/schemas/devContainer.schema.json",
+  "name": "Apache Lucene",
+  "service": "lucene",
+  "features": {
+    "ghcr.io/devcontainers/features/java:1": {
+      "version": "25",
+      "installMaven": "false",
+      "installGradle": "false"
+    }
+  },
+  "customizations": {
+    "vscode": {
+      "extensions": [
+        "redhat.java",
+        "editorconfig.editorconfig"
+      ],
+      "settings": {
+        "extensions.allowed": {
+          "vscjava.vscode-java-pack": false,
+          "vscjava.vscode-gradle": false,
+          "*": true
+        }
+      }
+    }
+  },
+  "updateContentCommand": "cd ${containerWorkspaceFolder} && rm -f .classpath && ./gradlew eclipse"
+}
diff --git a/.vscode/extensions.json b/.vscode/extensions.json
index 1df02d74800a..5371eaa8630d 100644
--- a/.vscode/extensions.json
+++ b/.vscode/extensions.json
@@ -1,8 +1,7 @@
 {
   "recommendations": [
     "redhat.java",
-    "editorconfig.editorconfig",
-    "ast-grep.ast-grep-vscode"
+    "editorconfig.editorconfig"
   ],
   "unwantedRecommendations": [
     "vscjava.vscode-java-pack",
diff --git a/.vscode/settings.json b/.vscode/settings.json
index b4cd4217587e..1aab8989122c 100644
--- a/.vscode/settings.json
+++ b/.vscode/settings.json
@@ -1,9 +1,13 @@
 {
+  "java.server.launchMode": "Standard",
   "java.import.gradle.enabled": false,
   "java.import.maven.enabled": false,
   "java.jdt.ls.lombokSupport.enabled": false,
   "java.compile.nullAnalysis.mode": "disabled",
   "java.completion.maxResults": 500,
+  "java.completion.favoriteStaticMembers": [ "none.*" ],
   "java.inlayHints.parameterNames.enabled": "all",
-  "astGrep.configPath": "gradle/validation/ast-grep/sgconfig.yml"
+  "java.inlayHints.parameterTypes.enabled": true,
+  "java.inlayHints.variableTypes.enabled": true,
+  "redhat.telemetry.enabled": false
 }
diff --git a/build-tools/build-infra/src/main/java/org/apache/lucene/gradle/plugins/licenses/CheckLicensesPlugin.java b/build-tools/build-infra/src/main/java/org/apache/lucene/gradle/plugins/licenses/CheckLicensesPlugin.java
index 76286c6564ea..ed2bb1026770 100644
--- a/build-tools/build-infra/src/main/java/org/apache/lucene/gradle/plugins/licenses/CheckLicensesPlugin.java
+++ b/build-tools/build-infra/src/main/java/org/apache/lucene/gradle/plugins/licenses/CheckLicensesPlugin.java
@@ -83,6 +83,9 @@ private void configureCheckLicenses(CheckLicensesTask task) {
                 "**/*.xls",
                 "**/*.zip",
 
+                // JSON doesn't support comments
+                "**/*.json",
+
                 // Ignore build infrastructure and misc utility files.
                 ".asf.yaml",
                 ".dir-locals.el",
diff --git a/gradlew b/gradlew
index 890b0b17de43..ededaedafa25 100755
--- a/gradlew
+++ b/gradlew
@@ -228,7 +228,7 @@ if [ ! -e "$GRADLE_WRAPPER_JAR" ] || ! ( cd "$APP_HOME/gradle/wrapper" && "$shas
     "$JAVACMD" $JAVA_OPTS "$APP_HOME/build-tools/build-infra/src/main/java/org/apache/lucene/gradle/WrapperDownloader.java" "$GRADLE_WRAPPER_JAR"
     WRAPPER_STATUS=$?
     if [ "$WRAPPER_STATUS" -eq 1 ]; then
-        echo "ERROR: Something went wrong. Make sure you're using Java version of exactly 23."
+        echo "ERROR: Something went wrong. Make sure you're using Java version of exactly 25."
         exit $WRAPPER_STATUS
     elif [ "$WRAPPER_STATUS" -ne 0 ]; then
         exit $WRAPPER_STATUS
diff --git a/help/IDEs.txt b/help/IDEs.txt
index 5229b64a96c5..86667bad621f 100644
--- a/help/IDEs.txt
+++ b/help/IDEs.txt
@@ -29,6 +29,16 @@ Run the following to set up Eclipse project files:
 
 Open the lucene checkout in VSCode.
 
+GitHub Codespaces
+=====
+
+Fork the apache/lucene repository
+
+Browse to https://github.com/codespaces/new
+
+Repository: yourfork/lucene
+Click "Create codespace"
+
 Neovim
 ======