diff --git a/containers/org.eclipse.linuxtools.docker.editor.ls/META-INF/MANIFEST.MF b/containers/org.eclipse.linuxtools.docker.editor.ls/META-INF/MANIFEST.MF
index 7546a6a29d..26e82f6192 100644
--- a/containers/org.eclipse.linuxtools.docker.editor.ls/META-INF/MANIFEST.MF
+++ b/containers/org.eclipse.linuxtools.docker.editor.ls/META-INF/MANIFEST.MF
@@ -13,6 +13,7 @@ Require-Bundle: org.eclipse.lsp4e;bundle-version="0.11.0",
  org.eclipse.tm4e.registry;bundle-version="0.1.0",
  org.eclipse.tm4e.ui;bundle-version="0.1.0",
  org.eclipse.core.runtime;bundle-version="3.13.0",
- org.eclipse.wildwebdeveloper.embedder.node
+ org.eclipse.wildwebdeveloper.embedder.node,
+ org.eclipse.tm4e.language_pack;bundle-version="0.14.1"
 Eclipse-BundleShape: dir
 Automatic-Module-Name: org.eclipse.linuxtools.docker.editor.ls
diff --git a/containers/org.eclipse.linuxtools.docker.editor.ls/build.properties b/containers/org.eclipse.linuxtools.docker.editor.ls/build.properties
index a76c9aa224..a1918f3504 100644
--- a/containers/org.eclipse.linuxtools.docker.editor.ls/build.properties
+++ b/containers/org.eclipse.linuxtools.docker.editor.ls/build.properties
@@ -3,6 +3,5 @@ output.. = target/classes/
 bin.includes = META-INF/,\
                .,\
                plugin.xml,\
-               grammars/,\
                language-server/,\
                icons/
diff --git a/containers/org.eclipse.linuxtools.docker.editor.ls/grammars/Dockerfile.tmLanguage b/containers/org.eclipse.linuxtools.docker.editor.ls/grammars/Dockerfile.tmLanguage
deleted file mode 100644
index a4a7b7ae8d..0000000000
--- a/containers/org.eclipse.linuxtools.docker.editor.ls/grammars/Dockerfile.tmLanguage
+++ /dev/null
@@ -1,160 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
-	<key>fileTypes</key>
-	<array>
-		<string>Dockerfile</string>
-	</array>
-	<key>name</key>
-	<string>Dockerfile</string>
-	<key>patterns</key>
-	<array>
-		<dict>
-			<key>captures</key>
-			<dict>
-				<key>1</key>
-				<dict>
-					<key>name</key>
-					<string>keyword.other.special-method.dockerfile</string>
-				</dict>
-				<key>2</key>
-				<dict>
-					<key>name</key>
-					<string>keyword.other.special-method.dockerfile</string>
-				</dict>
-			</dict>
-			<key>match</key>
-			<string>^\s*\b(?i:(FROM))\b.*?\b(?i:(AS))\b</string>
-		</dict>
-		<dict>
-			<key>captures</key>
-			<dict>
-				<key>1</key>
-				<dict>
-					<key>name</key>
-					<string>keyword.control.dockerfile</string>
-				</dict>
-				<key>2</key>
-				<dict>
-					<key>name</key>
-					<string>keyword.other.special-method.dockerfile</string>
-				</dict>
-			</dict>
-			<key>match</key>
-			<string>^\s*(?i:(ONBUILD)\s+)?(?i:(ADD|ARG|CMD|COPY|ENTRYPOINT|ENV|EXPOSE|FROM|HEALTHCHECK|LABEL|MAINTAINER|RUN|SHELL|STOPSIGNAL|USER|VOLUME|WORKDIR))\s</string>
-		</dict>
-		<dict>
-			<key>captures</key>
-			<dict>
-				<key>1</key>
-				<dict>
-					<key>name</key>
-					<string>keyword.operator.dockerfile</string>
-				</dict>
-				<key>2</key>
-				<dict>
-					<key>name</key>
-					<string>keyword.other.special-method.dockerfile</string>
-				</dict>
-			</dict>
-			<key>match</key>
-			<string>^\s*(?i:(ONBUILD)\s+)?(?i:(CMD|ENTRYPOINT))\s</string>
-		</dict>
-		<dict>
-			<key>begin</key>
-			<string>"</string>
-			<key>beginCaptures</key>
-			<dict>
-				<key>1</key>
-				<dict>
-					<key>name</key>
-					<string>punctuation.definition.string.begin.dockerfile</string>
-				</dict>
-			</dict>
-			<key>end</key>
-			<string>"</string>
-			<key>endCaptures</key>
-			<dict>
-				<key>1</key>
-				<dict>
-					<key>name</key>
-					<string>punctuation.definition.string.end.dockerfile</string>
-				</dict>
-			</dict>
-			<key>name</key>
-			<string>string.quoted.double.dockerfile</string>
-			<key>patterns</key>
-			<array>
-				<dict>
-					<key>match</key>
-					<string>\\.</string>
-					<key>name</key>
-					<string>constant.character.escaped.dockerfile</string>
-				</dict>
-			</array>
-		</dict>
-		<dict>
-			<key>begin</key>
-			<string>'</string>
-			<key>beginCaptures</key>
-			<dict>
-				<key>1</key>
-				<dict>
-					<key>name</key>
-					<string>punctuation.definition.string.begin.dockerfile</string>
-				</dict>
-			</dict>
-			<key>end</key>
-			<string>'</string>
-			<key>endCaptures</key>
-			<dict>
-				<key>1</key>
-				<dict>
-					<key>name</key>
-					<string>punctuation.definition.string.end.dockerfile</string>
-				</dict>
-			</dict>
-			<key>name</key>
-			<string>string.quoted.single.dockerfile</string>
-			<key>patterns</key>
-			<array>
-				<dict>
-					<key>match</key>
-					<string>\\.</string>
-					<key>name</key>
-					<string>constant.character.escaped.dockerfile</string>
-				</dict>
-			</array>
-		</dict>
-		<dict>
-			<key>captures</key>
-			<dict>
-				<key>1</key>
-				<dict>
-					<key>name</key>
-					<string>punctuation.whitespace.comment.leading.dockerfile</string>
-				</dict>
-				<key>2</key>
-				<dict>
-					<key>name</key>
-					<string>comment.line.number-sign.dockerfile</string>
-				</dict>
-				<key>3</key>
-				<dict>
-					<key>name</key>
-					<string>punctuation.definition.comment.dockerfile</string>
-				</dict>
-			</dict>
-			<key>comment</key>
-			<string>comment.line</string>
-			<key>match</key>
-			<string>^(\s*)((#).*$\n?)</string>
-		</dict>
-	</array>
-	<key>scopeName</key>
-	<string>source.dockerfile</string>
-	<key>uuid</key>
-	<string>a39d8795-59d2-49af-aa00-fe74ee29576e</string>
-</dict>
-</plist>
diff --git a/containers/org.eclipse.linuxtools.docker.editor.ls/plugin.xml b/containers/org.eclipse.linuxtools.docker.editor.ls/plugin.xml
index 3bb2679160..c203e01c31 100644
--- a/containers/org.eclipse.linuxtools.docker.editor.ls/plugin.xml
+++ b/containers/org.eclipse.linuxtools.docker.editor.ls/plugin.xml
@@ -9,50 +9,13 @@
             label="Dockerfile Language Server">
       </server>
       <contentTypeMapping
-            contentType="org.eclipse.linuxtools.docker.editor.ls"
+            contentType="org.eclipse.tm4e.language_pack.dockerfile"
             languageId="Dockerfile"
             id="org.eclipse.linuxtools.docker.editor.ls.server">
       </contentTypeMapping>
    </extension>
-   <extension
-         point="org.eclipse.ui.editors">
-      <editorContentTypeBinding
-            contentTypeId="org.eclipse.linuxtools.docker.editor.ls"
-            editorId="org.eclipse.ui.genericeditor.GenericEditor">
-      </editorContentTypeBinding>
-   </extension>
-   <extension
-         point="org.eclipse.core.contenttype.contentTypes">
-      <content-type
-            base-type="org.eclipse.core.runtime.text"
-            file-extensions="Dockerfile,Containerfile,dockerfile"
-            file-names="Dockerfile,Containerfile"
-            file-patterns="Dockerfile.*,Containerfile.*"
-            id="org.eclipse.linuxtools.docker.editor.ls"
-            name="Dockerfile"
-            priority="normal">
-      </content-type>
-   </extension>
-   <extension
-         point="org.eclipse.tm4e.registry.grammars">
-      <grammar
-            path="grammars/Dockerfile.tmLanguage"
-            scopeName="source.dockerfile">
-      </grammar>
-      <scopeNameContentTypeBinding
-            contentTypeId="org.eclipse.linuxtools.docker.editor.ls"
-            scopeName="source.dockerfile">
-      </scopeNameContentTypeBinding>
-   </extension>
-   <extension
-         point="org.eclipse.ui.genericeditor.presentationReconcilers">
-      <presentationReconciler
-            class="org.eclipse.tm4e.ui.text.TMPresentationReconciler"
-            contentType="org.eclipse.linuxtools.docker.editor.ls">
-      </presentationReconciler>
-   </extension>
    <extension point="org.eclipse.ui.genericeditor.icons">
-		<icon contentType="org.eclipse.linuxtools.docker.editor.ls" icon="icons/dockerfile.png" />
+		<icon contentType="org.eclipse.tm4e.language_pack.dockerfile" icon="icons/dockerfile.png" />
 	</extension>
 
 </plugin>
diff --git a/releng/org.eclipse.linuxtools.target/linuxtools-latest.target b/releng/org.eclipse.linuxtools.target/linuxtools-latest.target
index 1f4db76687..3a54dae93f 100644
--- a/releng/org.eclipse.linuxtools.target/linuxtools-latest.target
+++ b/releng/org.eclipse.linuxtools.target/linuxtools-latest.target
@@ -60,6 +60,7 @@
 <unit id="org.eclipse.zest.feature.group" version="0.0.0"/>
 <unit id="org.eclipse.lsp4e" version="0.0.0"/>
 <unit id="org.eclipse.tm4e.feature.feature.group" version="0.0.0"/>
+<unit id="org.eclipse.tm4e.language_pack.feature.feature.group" version="0.0.0"/>
 <repository location="https://download.eclipse.org/releases/latest/"/>
 </location>
 <location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit">