diff --git a/headless-services/bosh-language-server/src/main/java/org/springframework/ide/vscode/bosh/BoshDeploymentManifestSchema.java b/headless-services/bosh-language-server/src/main/java/org/springframework/ide/vscode/bosh/BoshDeploymentManifestSchema.java
index da647c853..b3659f836 100644
--- a/headless-services/bosh-language-server/src/main/java/org/springframework/ide/vscode/bosh/BoshDeploymentManifestSchema.java
+++ b/headless-services/bosh-language-server/src/main/java/org/springframework/ide/vscode/bosh/BoshDeploymentManifestSchema.java
@@ -76,6 +76,8 @@ public class BoshDeploymentManifestSchema implements YamlSchema {
 		YType t_variable = t_params; //TODO: https://www.pivotaltracker.com/story/show/148627441
 		addProp(TOPLEVEL_TYPE, "variables", f.yseq(t_variable));
 
+		addProp(TOPLEVEL_TYPE, "tags", t_params);
+		
 	}
 
 	@Override
diff --git a/headless-services/bosh-language-server/src/main/resources/desc/BoshDeploymentManifest/tags.md b/headless-services/bosh-language-server/src/main/resources/desc/BoshDeploymentManifest/tags.md
new file mode 100644
index 000000000..fe4e83eb6
--- /dev/null
+++ b/headless-services/bosh-language-server/src/main/resources/desc/BoshDeploymentManifest/tags.md
@@ -0,0 +1,6 @@
+*Optional*. Specifies key value pairs to be sent to the CPI for VM tagging. Combined with runtime config level tags during the deploy. Available in bosh-release v258+.
+
+Example:
+
+	tags:
+	  project: cf
diff --git a/headless-services/bosh-language-server/src/test/java/org/springframework/ide/vscode/concourse/BoshEditorTest.java b/headless-services/bosh-language-server/src/test/java/org/springframework/ide/vscode/concourse/BoshEditorTest.java
index 7c11ea14f..3e1cef3e8 100644
--- a/headless-services/bosh-language-server/src/test/java/org/springframework/ide/vscode/concourse/BoshEditorTest.java
+++ b/headless-services/bosh-language-server/src/test/java/org/springframework/ide/vscode/concourse/BoshEditorTest.java
@@ -91,6 +91,8 @@ public class BoshEditorTest {
 				"    alternative_names: [cc.cf.internal]\n" +
 				"properties:\n" +
 				"  a-property: the-value\n" +
+				"tags:\n" + 
+				"  project: cf\n" + 
 				"blah: hoooo\n"
 		);
 		editor.assertProblems(
@@ -106,7 +108,7 @@ public class BoshEditorTest {
 		editor.assertHoverContains("instance_groups", "Specifies the mapping between release [jobs](https://bosh.io/docs/terminology.html#job) and instance groups.");
 		editor.assertHoverContains("properties", 3, "Describes global properties. Deprecated");
 		editor.assertHoverContains("variables", "Describes variables");
-		
+		editor.assertHoverContains("tags", "Specifies key value pairs to be sent to the CPI for VM tagging");
 	}
 
 	@Test public void toplevelV2PropertyCompletions() throws Exception {