diff --git a/src/extension.ts b/src/extension.ts
index 347587ed..53ee8ad2 100644
--- a/src/extension.ts
+++ b/src/extension.ts
@@ -211,14 +211,15 @@ function startLangServer(context: ExtensionContext, requirements: RequirementsDa
 function prepareClientOptions(Liberty_LS :boolean) {
     if (Liberty_LS) {
         return {
-            // Filter to `bootstrap.properties` and `server.env` files within `src/main/liberty/config` or `usr/servers`
+            // Filter to `*.properties` and `*.env` files, let LCLS handle filtering for default/custom configs
             documentSelector: [{ scheme: "file", 
-                                pattern: "**/{src/main/liberty/config,usr/servers/**}/{bootstrap.properties,server.env}" }],
+                                pattern: "**/{*.properties,*.env}" }],
             synchronize: {
                 configurationSection: SUPPORTED_LANGUAGE_IDS,
                 fileEvents: [
-                    workspace.createFileSystemWatcher("**/bootstrap.properties"),
-                    workspace.createFileSystemWatcher("**/server.env")
+                    workspace.createFileSystemWatcher("**/*.properties"),
+                    workspace.createFileSystemWatcher("**/*.env"),
+                    workspace.createFileSystemWatcher("**/liberty-plugin-config.xml")
                 ],
             }
         };