diff --git a/build.gradle b/build.gradle
index 531dbff93..614490ed3 100644
--- a/build.gradle
+++ b/build.gradle
@@ -64,6 +64,7 @@ configurations {
 
 dependencies {
     // LSP4IJ dependencies
+    implementation 'org.microshed:lsp4ij:0.0.5'
     implementation ('org.eclipse.lsp4mp:org.eclipse.lsp4mp.ls:0.6.0') {
         exclude group: 'org.eclipse.lsp4j'
     }
@@ -138,8 +139,7 @@ intellij {
     // For a full list of IntelliJ IDEA releases please see https://www.jetbrains.com/intellij-repository/releases
     version = '2023.1.2'
 
-    plugins = ['java', 'maven', 'gradle-java', 'properties', 'terminal', 'org.jetbrains.idea.maven', 'com.intellij.gradle',
-               file("../intellij-lsp-common-provider/lsp4ij/build/libs/lsp4ij-0.0.4.uber.jar")]
+    plugins = ['java', 'maven', 'gradle-java', 'properties', 'terminal', 'org.jetbrains.idea.maven', 'com.intellij.gradle']
     updateSinceUntilBuild = false
 }
 
diff --git a/src/main/resources/META-INF/lsp.xml b/src/main/resources/META-INF/lsp.xml
index 85ebd1d57..e7d6f6a50 100644
--- a/src/main/resources/META-INF/lsp.xml
+++ b/src/main/resources/META-INF/lsp.xml
@@ -9,7 +9,7 @@
   -->
 
 <idea-plugin>
-    <extensions defaultExtensionNs="org.microshed.lsp4ij">
+    <extensions defaultExtensionNs="open-liberty.intellij">
         <!-- MicroProfile LS -->
         <server id="lsp4mp" class="io.openliberty.tools.intellij.lsp4mp.lsp.MicroProfileServer"
                 clientImpl="io.openliberty.tools.intellij.lsp4mp.lsp.MicroProfileLanguageClient"
diff --git a/src/main/resources/META-INF/lsp4ij.xml b/src/main/resources/META-INF/lsp4ij.xml
new file mode 100644
index 000000000..45d8c5ba2
--- /dev/null
+++ b/src/main/resources/META-INF/lsp4ij.xml
@@ -0,0 +1,49 @@
+<idea-plugin>
+
+    <!-- Adapted from https://github.com/redhat-developer/intellij-quarkus/blob/2585eb422beeb69631076d2c39196d6eca2f5f2e/src/main/resources/META-INF/lsp.xml -->
+    <extensionPoints>
+        <extensionPoint name="server"
+                        beanClass="org.microshed.lsp4ij.ServerExtensionPointBean"/>
+        <extensionPoint name="languageMapping"
+                        beanClass="org.microshed.lsp4ij.LanguageMappingExtensionPointBean"/>
+    </extensionPoints>
+    <extensions defaultExtensionNs="com.intellij">
+        <!-- Completion support for all language servers -->
+        <completion.contributor id="LSPCompletionContributor" language="any"
+                                implementationClass="org.microshed.lsp4ij.operations.completion.LSContentAssistProcessor"
+                                order="first"/>
+
+        <!-- Diagnostic support for all language servers -->
+        <inspectionToolProvider
+                implementation="org.microshed.lsp4ij.operations.diagnostics.LSPInspectionToolProvider"/>
+        <projectService serviceImplementation="org.microshed.lsp4ij.LanguageServiceAccessor"/>
+        <!-- TODO re-enable goto handler -->
+        <!-- <gotoDeclarationHandler
+                implementation="org.microshed.lsp4ij.operations.navigation.LSPGotoDeclarationHandler"/> -->
+
+        <!-- Hover for LemMinX + Liberty LemMinX ext -->
+        <lang.documentationProvider id="LSPTextHoverXML" language="XML"
+                                    implementationClass="org.microshed.lsp4ij.operations.hover.LSPTextHover"
+                                    order="first"/>
+        <!-- Hover for Liberty Config LS bootstrap.properties and LSP4MP microprofile-config.properties -->
+        <lang.documentationProvider id="LSPTextHoverProperties" language="Properties"
+                                    implementationClass="org.microshed.lsp4ij.operations.hover.LSPTextHover"
+                                    order="first"/>
+        <!-- Hover for Java files, LSP4MP and LSP4Jakarta -->
+        <lang.documentationProvider id="LSPTextHoverJAVA" language="JAVA"
+                                    implementationClass="org.microshed.lsp4ij.operations.hover.LSPTextHover"
+                                    order="first"/>
+        <codeInsight.inlayProvider language="JAVA"
+                                   implementationClass="org.microshed.lsp4ij.operations.codelens.LSPInlayProvider"/>
+        <externalAnnotator language="XML" implementationClass="org.microshed.lsp4ij.operations.diagnostics.LSPDiagnosticAnnotator"/>
+        <externalAnnotator language="TEXT" implementationClass="org.microshed.lsp4ij.operations.diagnostics.LSPDiagnosticAnnotator"/>
+        <externalAnnotator language="Properties" implementationClass="org.microshed.lsp4ij.operations.diagnostics.LSPDiagnosticAnnotator"/>
+        <externalAnnotator language="JAVA" implementationClass="org.microshed.lsp4ij.operations.diagnostics.LSPDiagnosticAnnotator"/>
+    </extensions>
+
+    <project-components>
+        <component>
+            <implementation-class>org.microshed.lsp4ij.ConnectDocumentToLanguageServerSetupParticipant</implementation-class>
+        </component>
+    </project-components>
+</idea-plugin>
diff --git a/src/main/resources/META-INF/plugin.xml b/src/main/resources/META-INF/plugin.xml
index 7f73db26f..1cc47b632 100644
--- a/src/main/resources/META-INF/plugin.xml
+++ b/src/main/resources/META-INF/plugin.xml
@@ -18,8 +18,6 @@
     <depends>com.intellij.properties</depends>
     <depends>org.jetbrains.idea.maven</depends>
     <depends>com.intellij.gradle</depends>
-    <!-- Not really optional, this attribute prevents a warning message during installation. -->
-    <depends optional="true">org.microshed.lsp4ij</depends>
     <idea-version since-build="231" until-build="231.*"/>
 
     <extensions defaultExtensionNs="com.intellij">
@@ -254,6 +252,12 @@
 
     </actions>
     <!-- Point to LSP4IJ xml -->
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="/META-INF/lsp4ij.xml"
+                xpointer="xpointer(/idea-plugin/*)"/>
+    <!-- Point to LSP xml -->
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="/META-INF/lsp.xml"
                 xpointer="xpointer(/idea-plugin/*)"/>
+<!--    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"-->
+<!--                href="file://libs/lsp4ij-0.0.5.uber.jar!/META-INF/lsp4ij.xml"-->
+<!--                xpointer="xpointer(/idea-plugin/*)"/>-->
 </idea-plugin>
diff --git a/src/main/resources/pluginNamespace.properties b/src/main/resources/pluginNamespace.properties
new file mode 100644
index 000000000..f7e4e125b
--- /dev/null
+++ b/src/main/resources/pluginNamespace.properties
@@ -0,0 +1 @@
+pluginNamespace=open-liberty.intellij
\ No newline at end of file