diff --git a/src/main/resources/META-INF/lsp4ij-quarkus.xml b/src/main/resources/META-INF/lsp4ij-quarkus.xml
index 7a82a8bfc..074ca5d7a 100644
--- a/src/main/resources/META-INF/lsp4ij-quarkus.xml
+++ b/src/main/resources/META-INF/lsp4ij-quarkus.xml
@@ -1,21 +1,15 @@
 <idea-plugin>
+
     <extensions defaultExtensionNs="com.redhat.devtools.lsp4ij">
 
         <!-- Quarkus LSP -->
         <server id="microprofile"
-                label="Tools for MicroProfile"
+                bundle="messages.MicroProfileBundle"
+                labelKey="microprofile.server.label"
+                descriptionKey="microprofile.server.description"
                 icon="com.redhat.devtools.intellij.microprofile.lang.MicroProfileIcons.MicroProfile"
-                factoryClass="com.redhat.devtools.intellij.quarkus.lsp.QuarkusLanguageServerFactory">
-            <description><![CDATA[
-        The <a href="https://github.com/eclipse/lsp4mp">MicroProfile language server</a> provides <a href="https://microprofile.io/">MicroProfile</a> support in:
-        <ul>
-          <li><b>Java</b> files.</li>
-          <li>and <b>microprofile-config.properties</b> files.</li>
-        </ul>
-        This language server is extended with <a href="https://github.com/redhat-developer/quarkus-ls" >Quarkus extension</a> to provide <a href="https://quarkus.io/">Quarkus</a> support in <b>application.properties</b> file.
-        ]]>
-            </description>
-        </server>
+                factoryClass="com.redhat.devtools.intellij.quarkus.lsp.QuarkusLanguageServerFactory"/>
+
         <languageMapping language="Properties"
                          serverId="microprofile"
                          documentMatcher="com.redhat.devtools.intellij.quarkus.lsp.QuarkusDocumentMatcherForPropertiesFile"/>
diff --git a/src/main/resources/META-INF/lsp4ij-qute.xml b/src/main/resources/META-INF/lsp4ij-qute.xml
index a17462f80..0c17d8941 100644
--- a/src/main/resources/META-INF/lsp4ij-qute.xml
+++ b/src/main/resources/META-INF/lsp4ij-qute.xml
@@ -3,18 +3,11 @@
     <extensions defaultExtensionNs="com.redhat.devtools.lsp4ij">
         <!-- Qute LSP -->
         <server id="qute"
-                label="Qute support"
+                bundle="messages.QuteBundle"
+                labelKey="qute.server.label"
+                descriptionKey="qute.server.description"
                 icon="com.redhat.devtools.intellij.quarkus.lang.QuarkusIcons.Quarkus"
-                factoryClass="com.redhat.devtools.intellij.qute.lsp.QuteLanguageServerFactory">
-            <description><![CDATA[
-        The <a href="https://github.com/redhat-developer/quarkus-ls">Qute language server</a> provides <a href="https://quarkus.io/guides/qute-reference">Qute</a> support in:
-        <ul>
-          <li><b>Java</b> files.</li>
-          <li>and <b>*.html,*.txt,*.yml,*.json</b> Qute template files.</li>
-        </ul>
-        ]]>
-            </description>
-        </server>
+                factoryClass="com.redhat.devtools.intellij.qute.lsp.QuteLanguageServerFactory"/>
 
         <languageMapping language="Qute_"
                          serverId="qute"
diff --git a/src/main/resources/META-INF/plugin.xml b/src/main/resources/META-INF/plugin.xml
index e66c12605..7ef80b512 100644
--- a/src/main/resources/META-INF/plugin.xml
+++ b/src/main/resources/META-INF/plugin.xml
@@ -316,7 +316,7 @@
   </change-notes>
 
   <!-- please see http://www.jetbrains.org/intellij/sdk/docs/basics/getting_started/build_number_ranges.html for description -->
-  <idea-version since-build="222"/>
+  <idea-version since-build="223"/>
 
   <!-- please see http://www.jetbrains.org/intellij/sdk/docs/basics/getting_started/plugin_compatibility.html
        on how to target different products -->
diff --git a/src/main/resources/messages/MicroProfileBundle.properties b/src/main/resources/messages/MicroProfileBundle.properties
index f7d800e72..63df4444e 100644
--- a/src/main/resources/messages/MicroProfileBundle.properties
+++ b/src/main/resources/messages/MicroProfileBundle.properties
@@ -11,9 +11,17 @@
 #     Red Hat Inc. - initial API and implementation
 ###############################################################################
 
+# MicroProfile LS server
+microprofile.server.label=Tools for MicroProfile
+microprofile.server.description=The <a href="https://github.com/eclipse/lsp4mp">MicroProfile language server</a> provides <a href="https://microprofile.io/">MicroProfile</a> support in:\
+<ul>\
+<li><b>Java</b> files.</li>\
+<li>and <b>microprofile-config.properties</b> files.</li>\
+</ul>\
+This language server is extended with <a href="https://github.com/redhat-developer/quarkus-ls" >Quarkus extension</a> to provide <a href="https://quarkus.io/">Quarkus</a> support in <b>application.properties</b> file.\
+
 ## MicroProfile UI settings page
 microprofile=MicroProfile
-microprofile.title=MicroProfile
 microprofile.description=Configure MicroProfile support in Java and 'microprofile-config.properties' files.
 microprofile.properties.inspection.group.name=Properties
 microprofile.java.inspection.group.name=Java files
diff --git a/src/main/resources/messages/QuteBundle.properties b/src/main/resources/messages/QuteBundle.properties
index 201f11f21..95de00ca4 100644
--- a/src/main/resources/messages/QuteBundle.properties
+++ b/src/main/resources/messages/QuteBundle.properties
@@ -11,6 +11,14 @@
 #     Red Hat Inc. - initial API and implementation
 ###############################################################################
 
+# Qute LS server
+qute.server.label=Qute support
+qute.server.description=The <a href="https://github.com/redhat-developer/quarkus-ls">Qute language server</a> provides <a href="https://quarkus.io/guides/qute-reference">Qute</a> support in:\
+<ul>\
+<li><b>Java</b> files.</li>\
+<li>and <b>*.html,*.txt,*.yml,*.json</b> Qute template files.</li>\
+</ul>\
+
 ## Qute colors settings page
 options.qute.display.name=Qute
 options.qute.attribute.descriptor.comment=Comment