diff --git a/src/handlebars.ts b/src/handlebars.ts
index fb763a84..2baa6576 100644
--- a/src/handlebars.ts
+++ b/src/handlebars.ts
@@ -215,14 +215,14 @@ export var language = <ILanguage> {
 
 
 		handlebarsInSimpleState: [
-			[/\{\{\{?/, 'metatag.handlebars'],
-			[/\}\}\}?/, { token: 'metatag.handlebars', switchTo: '@$S2.$S3' }],
+			[/\{\{\{?/, 'punctuation.handlebars'],
+			[/\}\}\}?/, { token: 'punctuation.handlebars', switchTo: '@$S2.$S3' }],
 			{ include: 'handlebarsRoot' }
 		],
 
 		handlebarsInEmbeddedState: [
-			[/\{\{\{?/, 'metatag.handlebars'],
-			[/\}\}\}?/, { token: 'metatag.handlebars', switchTo: '@$S2.$S3', nextEmbedded: '$S3' }],
+			[/\{\{\{?/, 'punctuation.handlebars'],
+			[/\}\}\}?/, { token: 'punctuation.handlebars', switchTo: '@$S2.$S3', nextEmbedded: '$S3' }],
 			{ include: 'handlebarsRoot' }
 		],
 
diff --git a/test/handlebars.test.ts b/test/handlebars.test.ts
index ed1b5feb..49ec0855 100644
--- a/test/handlebars.test.ts
+++ b/test/handlebars.test.ts
@@ -18,8 +18,8 @@ function getTag(name: string) {
 }
 
 const handlebarsTokenTypes = {
-	EMBED: 'metatag.handlebars',
-	EMBED_UNESCAPED: 'metatag.handlebars',
+	EMBED: 'punctuation.handlebars',
+	EMBED_UNESCAPED: 'punctuation.handlebars',
 	KEYWORD: 'keyword.helper.handlebars',
 	VARIABLE: 'variable.parameter.handlebars',
 }