diff --git a/.eslintrc b/.eslintrc
deleted file mode 100644
index c60b55323..000000000
--- a/.eslintrc
+++ /dev/null
@@ -1,6 +0,0 @@
-{
-    "extends": ["@diplodoc/eslint-config"],
-    "env": {
-        "node": true
-    }
-}
diff --git a/.eslintrc.js b/.eslintrc.js
new file mode 100644
index 000000000..ccda1b82e
--- /dev/null
+++ b/.eslintrc.js
@@ -0,0 +1,11 @@
+module.exports = {
+    "extends": ["@diplodoc/eslint-config"],
+    "root": true,
+    parserOptions: {
+        tsconfigRootDir: __dirname,
+        project: ['./tsconfig.json'],
+      },
+    "env": {
+        "node": true
+    }
+}
diff --git a/src/models.ts b/src/models.ts
index 2f78c192c..bbbf7d050 100644
--- a/src/models.ts
+++ b/src/models.ts
@@ -7,7 +7,13 @@ import {ChangelogItem} from '@diplodoc/transform/lib/plugins/changelog/types';
 
 export type VarsPreset = 'internal' | 'external';
 
-export type YfmPreset = Record<string, string>;
+export type VarsMetadata = {
+    [field: string]: string;
+}[];
+
+export type YfmPreset = Record<string, string> & {
+    __metadata?: VarsMetadata;
+};
 // eslint-disable-next-line @typescript-eslint/no-explicit-any
 export type Metadata = Record<string, any>;
 
@@ -65,10 +71,12 @@ export interface YfmArgv extends YfmConfig {
     staticContent: boolean;
 }
 
-export interface DocPreset {
+export type DocPreset = {
     default: YfmPreset;
     [varsPreset: string]: YfmPreset;
-}
+} & {
+    __metadata: Record<string, string>[];
+};
 
 export interface YfmToc extends Filter {
     name: string;
diff --git a/src/resolvers/md2html.ts b/src/resolvers/md2html.ts
index ed75c2ad0..565fa5cf1 100644
--- a/src/resolvers/md2html.ts
+++ b/src/resolvers/md2html.ts
@@ -16,7 +16,7 @@ import {
     transformToc,
 } from '../utils';
 import {Lang, PROCESSING_FINISHED} from '../constants';
-import {getAssetsPublicPath, getUpdatedMetadata} from '../services/metadata';
+import {getAssetsPublicPath, getVCSMetadata} from '../services/metadata';
 import {MarkdownItPluginCb} from '@diplodoc/transform/lib/plugins/typings';
 
 export interface FileTransformOptions {
@@ -42,6 +42,7 @@ export async function resolveMd2HTML(options: ResolverOptions): Promise<ResolveM
     const pathToFileDir: string =
         pathToDir === tocBase ? '' : pathToDir.replace(`${tocBase}${sep}`, '');
     const relativePathToIndex = relative(pathToDir, `${tocBase}${sep}`);
+    const vars = getVarsPerFile(inputPath);
 
     const {input, lang, allowCustomResources} = ArgvService.getConfig();
     const resolvedPath: string = resolve(input, inputPath);
@@ -54,13 +55,18 @@ export async function resolveMd2HTML(options: ResolverOptions): Promise<ResolveM
         result.html = result.html.replace(/\n+/gm, '');
     }
 
-    const updatedMetadata =
-        metadata && metadata.isContributorsEnabled
-            ? await getUpdatedMetadata(metadata, content, result?.meta)
-            : result.meta;
+    const updatedMetadata = metadata?.isContributorsEnabled
+        ? await getVCSMetadata(metadata, content, result?.meta)
+        : result.meta;
 
     const fileMeta = fileExtension === '.yaml' ? result.data.meta ?? {} : updatedMetadata;
 
+    if (Array.isArray(fileMeta?.metadata)) {
+        fileMeta.metadata.push(...(vars.__metadata || []));
+    } else {
+        fileMeta.metadata = vars.__metadata || [];
+    }
+
     if (allowCustomResources) {
         const {script, style} = metadata?.resources || {};
         fileMeta.style = (fileMeta.style || []).concat(style || []).map(fixRelativePath(inputPath));
diff --git a/src/resolvers/md2md.ts b/src/resolvers/md2md.ts
index d08d3cdc2..2245669cb 100644
--- a/src/resolvers/md2md.ts
+++ b/src/resolvers/md2md.ts
@@ -21,6 +21,7 @@ export async function resolveMd2Md(options: ResolveMd2MdOptions): Promise<void>
         readFileSync(resolvedInputPath, 'utf8'),
         metadata,
         vars.__system,
+        vars.__metadata,
     );
 
     const {result, changelogs} = transformMd2Md(content, {
diff --git a/src/services/metadata.ts b/src/services/metadata.ts
index 544a7a44b..3f5f4460f 100644
--- a/src/services/metadata.ts
+++ b/src/services/metadata.ts
@@ -1,7 +1,7 @@
-import {dump} from 'js-yaml';
+import {dump, load} from 'js-yaml';
 
 import {VCSConnector} from '../vcs-connector/connector-models';
-import {MetaDataOptions, Metadata, Resources} from '../models';
+import {MetaDataOptions, Metadata, Resources, VarsMetadata} from '../models';
 import {
     getAuthorDetails,
     updateAuthorMetadataStringByAuthorLogin,
@@ -22,6 +22,7 @@ async function getContentWithUpdatedMetadata(
     fileContent: string,
     options?: MetaDataOptions,
     systemVars?: unknown,
+    metadataVars?: VarsMetadata,
 ): Promise<string> {
     let result;
 
@@ -32,7 +33,9 @@ async function getContentWithUpdatedMetadata(
         addSourcePath: options?.addSourcePath,
         resources: options?.resources,
         systemVars,
+        metadataVars,
     });
+
     result = await getContentWithUpdatedDynamicMetadata(result, options);
 
     return result;
@@ -45,6 +48,7 @@ function getContentWithUpdatedStaticMetadata({
     addSourcePath,
     resources,
     systemVars,
+    metadataVars = [],
 }: {
     fileContent: string;
     sourcePath?: string;
@@ -52,10 +56,16 @@ function getContentWithUpdatedStaticMetadata({
     addSourcePath?: boolean;
     resources?: Resources;
     systemVars?: unknown;
+    metadataVars?: VarsMetadata;
 }): string {
     const newMetadatas: string[] = [];
 
-    if ((!addSystemMeta || !systemVars) && !addSourcePath && !resources) {
+    if (
+        (!addSystemMeta || !systemVars) &&
+        !addSourcePath &&
+        !resources &&
+        metadataVars.length === 0
+    ) {
         return fileContent;
     }
 
@@ -77,7 +87,25 @@ function getContentWithUpdatedStaticMetadata({
     if (matches && matches.length > 0) {
         const [, fileMetadata, , fileMainContent] = matches;
 
-        return `${getUpdatedMetadataString(newMetadatas, fileMetadata)}${fileMainContent}`;
+        if (!metadataVars.length) {
+            return `${getUpdatedMetadataString(newMetadatas, fileMetadata)}${fileMainContent}`;
+        }
+
+        const parsed = load(fileMetadata) as Record<string, any>;
+
+        if (!Array.isArray(parsed.metadata)) {
+            parsed.metadata = [parsed.metadata];
+        }
+
+        parsed.metadata = parsed.metadata.concat(metadataVars);
+
+        const patchedMetada = dump(parsed);
+
+        return `${getUpdatedMetadataString(newMetadatas, patchedMetada)}${fileMainContent}`;
+    }
+
+    if (metadataVars.length) {
+        newMetadatas.push(dump({metadata: metadataVars}));
     }
 
     return `${getUpdatedMetadataString(newMetadatas)}${fileContent}`;
@@ -239,7 +267,7 @@ function getUpdatedMetadataString(newMetadatas: string[], defaultMetadata = ''):
     }`;
 }
 
-async function getUpdatedMetadata(
+async function getVCSMetadata(
     options: MetaDataOptions,
     fileContent: string,
     meta?: Metadata,
@@ -309,6 +337,6 @@ function getAssetsPublicPath(filePath: string) {
 export {
     getContentWithUpdatedMetadata,
     getContentWithUpdatedStaticMetadata,
-    getUpdatedMetadata,
+    getVCSMetadata,
     getAssetsPublicPath,
 };
diff --git a/src/services/preset.ts b/src/services/preset.ts
index 78d126cad..c24533ba8 100644
--- a/src/services/preset.ts
+++ b/src/services/preset.ts
@@ -7,10 +7,11 @@ export type PresetStorage = Map<string, YfmPreset>;
 let presetStorage: PresetStorage = new Map();
 
 function add(parsedPreset: DocPreset, path: string, varsPreset: string) {
-    const combinedValues: YfmPreset = {
+    const combinedValues = {
         ...(parsedPreset.default || {}),
         ...(parsedPreset[varsPreset] || {}),
-    };
+        __metadata: parsedPreset.__metadata,
+    } as YfmPreset;
 
     const key = dirname(normalize(path));
     presetStorage.set(key, combinedValues);
diff --git a/src/utils/markup.ts b/src/utils/markup.ts
index da1781b7b..0be1f518f 100644
--- a/src/utils/markup.ts
+++ b/src/utils/markup.ts
@@ -1,34 +1,42 @@
 import {join} from 'path';
 import {platform} from 'process';
 
-import {CUSTOM_STYLE, Platforms, ResourceType} from '../constants';
-import {Resources, SinglePageResult} from '../models';
+import {CUSTOM_STYLE, Platforms} from '../constants';
+import {LeadingPage, Resources, SinglePageResult, TextItems, VarsMetadata} from '../models';
 import {ArgvService, PluginService} from '../services';
 import {preprocessPageHtmlForSinglePage} from './singlePage';
 
 import {DocInnerProps, DocPageData, render} from '@diplodoc/client/ssr';
 import manifest from '@diplodoc/client/manifest';
 
+import {escape} from 'html-escaper';
+
 const dst = (bundlePath: string) => (target: string) => join(bundlePath, target);
+export const сarriage = platform === Platforms.WINDOWS ? '\r\n' : '\n';
 
 export interface TitleMeta {
     title?: string;
 }
-export type Meta = TitleMeta & Resources;
+
+export type Meta = TitleMeta &
+    Resources & {
+        metadata: VarsMetadata;
+    };
 
 export function generateStaticMarkup(
     props: DocInnerProps<DocPageData>,
     pathToBundle: string,
 ): string {
-    const {title: metaTitle, style, script} = (props.data.meta as Meta) || {};
+    const {style, script, metadata, ...restYamlConfigMeta} = (props.data.meta as Meta) || {};
     const {title: tocTitle} = props.data.toc;
     const {title: pageTitle} = props.data;
 
     const title = getTitle({
-        metaTitle,
+        metaTitle: props.data.meta.title,
         tocTitle: tocTitle as string,
         pageTitle,
     });
+
     const resources = getResources({style, script});
 
     const {staticContent} = ArgvService.getConfig();
@@ -40,7 +48,7 @@ export function generateStaticMarkup(
         <html lang="${props.lang}">
             <head>
                 <meta charset="utf-8">
-                ${getMetadata(props.data.meta as Record<string, string>)}
+                ${getMetadata(metadata, restYamlConfigMeta)}
                 <meta name="viewport" content="width=device-width, initial-scale=1.0">
                 <title>${title}</title>
                 <style type="text/css">
@@ -93,21 +101,32 @@ function getTitle({tocTitle, metaTitle, pageTitle}: GetTitleOptions) {
     return resultPageTitle && tocTitle ? `${resultPageTitle} | ${tocTitle}` : '';
 }
 
-function getMetadata(metadata: Record<string, string>): string {
-    if (!metadata) {
-        return '';
+function getMetadata(metadata: VarsMetadata | undefined, restMeta: LeadingPage['meta']): string {
+    let result = '';
+
+    const addMetaTagsFromObject = (value: Record<string, string | boolean | TextItems>) => {
+        const args = Object.entries(value).reduce((acc, [name, content]) => {
+            return acc + `${escape(name)}="${escape(content.toString())}" `;
+        }, '');
+
+        if (args.length) {
+            result += `<meta ${args} />` + сarriage;
+        }
+    };
+
+    if (metadata) {
+        metadata.forEach(addMetaTagsFromObject);
     }
 
-    // Exclude resources from meta, proceed them separately
-    const metaEntries = Object.entries(metadata).filter(
-        ([key]) => !Object.keys(ResourceType).includes(key),
-    );
+    if (restMeta) {
+        Object.entries(restMeta)
+            .map(([name, value]) => {
+                return {name, content: value};
+            })
+            .forEach(addMetaTagsFromObject);
+    }
 
-    return metaEntries
-        .map(([name, content]) => {
-            return `<meta name="${name}" content="${content}">`;
-        })
-        .join('\n');
+    return result;
 }
 
 function getResources({style, script}: Resources) {
@@ -130,8 +149,6 @@ function getResources({style, script}: Resources) {
     return resourcesTags.join('\n');
 }
 
-export const сarriage = platform === Platforms.WINDOWS ? '\r\n' : '\n';
-
 export function joinSinglePageResults(
     singlePageResults: SinglePageResult[],
     root: string,
diff --git a/src/utils/presets.ts b/src/utils/presets.ts
index c2208c891..0b884e7bc 100644
--- a/src/utils/presets.ts
+++ b/src/utils/presets.ts
@@ -1,14 +1,17 @@
 import {dirname, relative, resolve} from 'path';
 
 import {ArgvService, PresetService} from '../services';
+import {YfmPreset} from '../models';
 
-export function getVarsPerFile(filePath: string): Record<string, string> {
+export function getVarsPerFile(filePath: string): YfmPreset {
     const {vars: argVars} = ArgvService.getConfig();
 
-    return {
+    const result = {
         ...PresetService.get(dirname(filePath)),
         ...argVars,
     };
+
+    return result;
 }
 
 export function getVarsPerRelativeFile(filePath: string): Record<string, string> {
diff --git a/tests/e2e/__snapshots__/include-toc.test.ts.snap b/tests/e2e/__snapshots__/include-toc.test.ts.snap
index f4a6da382..0754f3e23 100644
--- a/tests/e2e/__snapshots__/include-toc.test.ts.snap
+++ b/tests/e2e/__snapshots__/include-toc.test.ts.snap
@@ -143,7 +143,7 @@ base: .
 "
 `;
 
-exports[`Include toc Toc is included inline, not as a new section 1`] = `"[".yfm","file1.md","fileA.md","fileB.md","fileC.md","fileX.md","folder/fileA.md","folder/fileB.md","folder/fileC.md","folder/folder/fileC.md","toc.yaml"]"`;
+exports[`Include toc Toc is included inline, not as a new section 1`] = `"[".yfm","file1.md","fileX.md","folder/fileA.md","folder/fileB.md","folder/fileC.md","folder/folder/fileC.md","folder/toc.yaml","toc.yaml"]"`;
 
 exports[`Include toc Toc is included inline, not as a new section 2`] = `
 "applyPresets: true
@@ -156,51 +156,11 @@ exports[`Include toc Toc is included inline, not as a new section 3`] = `
 `;
 
 exports[`Include toc Toc is included inline, not as a new section 4`] = `
-"---
-title: File A
-description: YFM description
-sourcePath: folder/fileA.md
----
-# File A
-
----
-
-Lorem Ipsum has been the industry's standard dummy text ever since the 1500s, when an unknown printer took a galley of type and scrambled it to make a type specimen book.
-
----
-"
-`;
-
-exports[`Include toc Toc is included inline, not as a new section 5`] = `
-"---
-sourcePath: folder/fileB.md
----
-# File B
-
-Lorem Ipsum is simply dummy text of the printing and typesetting industry.
-
----
-
-Lorem Ipsum has been the industry's standard dummy text ever since the 1500s, when an unknown printer took a galley of type and scrambled it to make a type specimen book.
-
----
-"
-`;
-
-exports[`Include toc Toc is included inline, not as a new section 6`] = `
-"---
-sourcePath: folder/folder/fileC.md
----
-# File C
-"
-`;
-
-exports[`Include toc Toc is included inline, not as a new section 7`] = `
 "# File X
 "
 `;
 
-exports[`Include toc Toc is included inline, not as a new section 8`] = `
+exports[`Include toc Toc is included inline, not as a new section 5`] = `
 "---
 title: File A
 description: YFM description
@@ -215,7 +175,7 @@ Lorem Ipsum has been the industry's standard dummy text ever since the 1500s, wh
 "
 `;
 
-exports[`Include toc Toc is included inline, not as a new section 9`] = `
+exports[`Include toc Toc is included inline, not as a new section 6`] = `
 "# File B
 
 Lorem Ipsum is simply dummy text of the printing and typesetting industry.
@@ -228,7 +188,7 @@ Lorem Ipsum has been the industry's standard dummy text ever since the 1500s, wh
 "
 `;
 
-exports[`Include toc Toc is included inline, not as a new section 10`] = `
+exports[`Include toc Toc is included inline, not as a new section 7`] = `
 "---
 sourcePath: folder/folder/fileC.md
 ---
@@ -236,21 +196,27 @@ sourcePath: folder/folder/fileC.md
 "
 `;
 
-exports[`Include toc Toc is included inline, not as a new section 11`] = `
+exports[`Include toc Toc is included inline, not as a new section 8`] = `
 "# File C
 "
 `;
 
-exports[`Include toc Toc is included inline, not as a new section 12`] = `
+exports[`Include toc Toc is included inline, not as a new section 9`] = `
 "items:
-  - name: Name1
-    href: file1.md
   - name: NameA
     href: fileA.md
   - name: NameB
     href: fileB.md
   - name: NameC
     href: fileC.md
+base: folder
+"
+`;
+
+exports[`Include toc Toc is included inline, not as a new section 10`] = `
+"items:
+  - name: Name1
+    href: file1.md
   - name: NameX
     href: fileX.md
 base: .
diff --git a/tests/e2e/__snapshots__/load-custom-resources.spec.ts.snap b/tests/e2e/__snapshots__/load-custom-resources.spec.ts.snap
index 75b9a40fe..c7af8005b 100644
--- a/tests/e2e/__snapshots__/load-custom-resources.spec.ts.snap
+++ b/tests/e2e/__snapshots__/load-custom-resources.spec.ts.snap
@@ -45,7 +45,7 @@ exports[`Allow load custom resources md2html single page with custom resources 2
     </div>
     <script type="application/javascript">
       window.STATIC_CONTENT = false
-                   window.__DATA__ = {"data":{"leading":true,"toc":{"title":"Documentation","href":"index.html","items":[{"name":"Documentation","href":"page.html","id":"Documentation-RANDOM"},{"name":"Config","href":"project/config.html","id":"Config-RANDOM"}],"base":"."},"data":{"title":"Documentation","description":"","meta":{"title":"Documentation","noIndex":true,"style":["_assets/style/test.css"],"script":["_assets/script/test1.js"]},"links":[{"title":"Getting started with Documentation","description":"This guide will show you the basics of working with Documentation","href":"page.html"}]},"meta":{"title":"Documentation","noIndex":true,"style":["_assets/style/test.css"],"script":["_assets/script/test1.js"]}},"router":{"pathname":"index.html"},"lang":"ru"};
+                   window.__DATA__ = {"data":{"leading":true,"toc":{"title":"Documentation","href":"index.html","items":[{"name":"Documentation","href":"page.html","id":"Documentation-RANDOM"},{"name":"Config","href":"project/config.html","id":"Config-RANDOM"}],"base":"."},"data":{"title":"Documentation","description":"","meta":{"title":"Documentation","noIndex":true,"metadata":[],"style":["_assets/style/test.css"],"script":["_assets/script/test1.js"]},"links":[{"title":"Getting started with Documentation","description":"This guide will show you the basics of working with Documentation","href":"page.html"}]},"meta":{"title":"Documentation","noIndex":true,"metadata":[],"style":["_assets/style/test.css"],"script":["_assets/script/test1.js"]}},"router":{"pathname":"index.html"},"lang":"ru"};
     </script>
     <script type="application/javascript"
             src="_bundle/vendor.js"
@@ -68,8 +68,8 @@ exports[`Allow load custom resources md2html single page with custom resources 3
 <html lang="ru">
   <head>
     <meta charset="utf-8">
-    <meta name="meta"
-          content="some meta"
+    <meta name="yfm"
+          content="builder"
     >
     <meta name="viewport"
           content="width=device-width, initial-scale=1.0"
@@ -103,7 +103,7 @@ exports[`Allow load custom resources md2html single page with custom resources 3
     </div>
     <script type="application/javascript">
       window.STATIC_CONTENT = false
-                   window.__DATA__ = {"data":{"leading":false,"toc":{"title":"Documentation","href":"index.html","items":[{"name":"Documentation","href":"page.html","id":"Documentation-RANDOM"},{"name":"Config","href":"project/config.html","id":"Config-RANDOM"}],"base":"."},"meta":{"meta":"some meta","style":["_assets/style/test.css"],"script":["_assets/script/test1.js"]},"assets":[],"headings":[],"title":"","includes":[],"html":"
+                   window.__DATA__ = {"data":{"leading":false,"toc":{"title":"Documentation","href":"index.html","items":[{"name":"Documentation","href":"page.html","id":"Documentation-RANDOM"},{"name":"Config","href":"project/config.html","id":"Config-RANDOM"}],"base":"."},"meta":{"metadata":[{"name":"yfm","content":"builder"}],"style":["_assets/style/test.css"],"script":["_assets/script/test1.js"]},"assets":[],"headings":[],"title":"","includes":[],"html":"
       <p>Lorem
       </p>"},"router":{"pathname":"page.html"},"lang":"ru"};
     </script>
@@ -160,7 +160,7 @@ exports[`Allow load custom resources md2html single page with custom resources 4
     </div>
     <script type="application/javascript">
       window.STATIC_CONTENT = false
-                   window.__DATA__ = {"data":{"leading":false,"toc":{"title":"Documentation","href":"../index.html","items":[{"name":"Documentation","href":"../page.html","id":"Documentation-RANDOM"},{"name":"Config","href":"../project/config.html","id":"Config-RANDOM"}],"base":"."},"meta":{"style":["../_assets/style/test.css"],"script":["../_assets/script/test1.js"]},"assets":[],"headings":[],"title":"","includes":[],"html":"
+                   window.__DATA__ = {"data":{"leading":false,"toc":{"title":"Documentation","href":"../index.html","items":[{"name":"Documentation","href":"../page.html","id":"Documentation-RANDOM"},{"name":"Config","href":"../project/config.html","id":"Config-RANDOM"}],"base":"."},"meta":{"metadata":[],"style":["../_assets/style/test.css"],"script":["../_assets/script/test1.js"]},"assets":[],"headings":[],"title":"","includes":[],"html":"
       <p>Lorem
       </p>"},"router":{"pathname":"../project/config.html"},"lang":"ru"};
     </script>
@@ -287,7 +287,7 @@ exports[`Allow load custom resources md2html with custom resources 2`] = `
     </div>
     <script type="application/javascript">
       window.STATIC_CONTENT = false
-                   window.__DATA__ = {"data":{"leading":true,"toc":{"title":"Documentation","href":"index.html","items":[{"name":"Documentation","href":"page.html","id":"Documentation-RANDOM"},{"name":"Config","href":"project/config.html","id":"Config-RANDOM"}],"base":"."},"data":{"title":"Documentation","description":"","meta":{"title":"Documentation","noIndex":true,"style":["_assets/style/test.css"],"script":["_assets/script/test1.js"]},"links":[{"title":"Getting started with Documentation","description":"This guide will show you the basics of working with Documentation","href":"page.html"}]},"meta":{"title":"Documentation","noIndex":true,"style":["_assets/style/test.css"],"script":["_assets/script/test1.js"]}},"router":{"pathname":"index.html"},"lang":"ru"};
+                   window.__DATA__ = {"data":{"leading":true,"toc":{"title":"Documentation","href":"index.html","items":[{"name":"Documentation","href":"page.html","id":"Documentation-RANDOM"},{"name":"Config","href":"project/config.html","id":"Config-RANDOM"}],"base":"."},"data":{"title":"Documentation","description":"","meta":{"title":"Documentation","noIndex":true,"metadata":[],"style":["_assets/style/test.css"],"script":["_assets/script/test1.js"]},"links":[{"title":"Getting started with Documentation","description":"This guide will show you the basics of working with Documentation","href":"page.html"}]},"meta":{"title":"Documentation","noIndex":true,"metadata":[],"style":["_assets/style/test.css"],"script":["_assets/script/test1.js"]}},"router":{"pathname":"index.html"},"lang":"ru"};
     </script>
     <script type="application/javascript"
             src="_bundle/vendor.js"
@@ -310,8 +310,8 @@ exports[`Allow load custom resources md2html with custom resources 3`] = `
 <html lang="ru">
   <head>
     <meta charset="utf-8">
-    <meta name="meta"
-          content="some meta"
+    <meta name="yfm"
+          content="builder"
     >
     <meta name="viewport"
           content="width=device-width, initial-scale=1.0"
@@ -345,7 +345,7 @@ exports[`Allow load custom resources md2html with custom resources 3`] = `
     </div>
     <script type="application/javascript">
       window.STATIC_CONTENT = false
-                   window.__DATA__ = {"data":{"leading":false,"toc":{"title":"Documentation","href":"index.html","items":[{"name":"Documentation","href":"page.html","id":"Documentation-RANDOM"},{"name":"Config","href":"project/config.html","id":"Config-RANDOM"}],"base":"."},"meta":{"meta":"some meta","style":["_assets/style/test.css"],"script":["_assets/script/test1.js"]},"assets":[],"headings":[],"title":"","includes":[],"html":"
+                   window.__DATA__ = {"data":{"leading":false,"toc":{"title":"Documentation","href":"index.html","items":[{"name":"Documentation","href":"page.html","id":"Documentation-RANDOM"},{"name":"Config","href":"project/config.html","id":"Config-RANDOM"}],"base":"."},"meta":{"metadata":[{"name":"yfm","content":"builder"}],"style":["_assets/style/test.css"],"script":["_assets/script/test1.js"]},"assets":[],"headings":[],"title":"","includes":[],"html":"
       <p>Lorem
       </p>"},"router":{"pathname":"page.html"},"lang":"ru"};
     </script>
@@ -402,7 +402,7 @@ exports[`Allow load custom resources md2html with custom resources 4`] = `
     </div>
     <script type="application/javascript">
       window.STATIC_CONTENT = false
-                   window.__DATA__ = {"data":{"leading":false,"toc":{"title":"Documentation","href":"../index.html","items":[{"name":"Documentation","href":"../page.html","id":"Documentation-RANDOM"},{"name":"Config","href":"../project/config.html","id":"Config-RANDOM"}],"base":"."},"meta":{"style":["../_assets/style/test.css"],"script":["../_assets/script/test1.js"]},"assets":[],"headings":[],"title":"","includes":[],"html":"
+                   window.__DATA__ = {"data":{"leading":false,"toc":{"title":"Documentation","href":"../index.html","items":[{"name":"Documentation","href":"../page.html","id":"Documentation-RANDOM"},{"name":"Config","href":"../project/config.html","id":"Config-RANDOM"}],"base":"."},"meta":{"metadata":[],"style":["../_assets/style/test.css"],"script":["../_assets/script/test1.js"]},"assets":[],"headings":[],"title":"","includes":[],"html":"
       <p>Lorem
       </p>"},"router":{"pathname":"../project/config.html"},"lang":"ru"};
     </script>
@@ -452,7 +452,9 @@ links:
 
 exports[`Allow load custom resources md2md with custom resources 4`] = `
 "---
-meta: some meta
+metadata:
+  - name: yfm
+    content: builder
 style:
   - _assets/style/test.css
 script:
@@ -460,7 +462,8 @@ script:
 
 ---
 
-Lorem"
+Lorem
+"
 `;
 
 exports[`Allow load custom resources md2md with custom resources 5`] = `
diff --git a/tests/e2e/__snapshots__/metadata.spec.ts.snap b/tests/e2e/__snapshots__/metadata.spec.ts.snap
new file mode 100644
index 000000000..0cebf865d
--- /dev/null
+++ b/tests/e2e/__snapshots__/metadata.spec.ts.snap
@@ -0,0 +1,232 @@
+// Jest Snapshot v1, https://goo.gl/fbAQLP
+
+exports[`Allow load custom resources md2html with metadata 1`] = `"["_bundle/app.css","_bundle/app.js","_bundle/react.js","_bundle/vendor.css","_bundle/vendor.js","index.html","page.html","project/config.html"]"`;
+
+exports[`Allow load custom resources md2html with metadata 2`] = `
+<!DOCTYPE html>
+<html lang="ru">
+  <head>
+    <meta charset="utf-8">
+    <meta name="test-yfm"
+          content="inline test"
+    >
+    <meta name="yfm-config"
+          content="config test"
+    >
+    <meta name="title"
+          content="Documentation"
+    >
+    <meta name="noIndex"
+          content="true"
+    >
+    <meta name="viewport"
+          content="width=device-width, initial-scale=1.0"
+    >
+    <title>
+      Documentation | Documentation
+    </title>
+    <style type="text/css">
+      body {
+                        height: 100vh;
+                    }
+    </style>
+    <link type="text/css"
+          rel="stylesheet"
+          href="_bundle/vendor.css"
+    >
+    <link type="text/css"
+          rel="stylesheet"
+          href="_bundle/app.css"
+    >
+  </head>
+  <body class="yc-root yc-root_theme_light">
+    <div id="root">
+    </div>
+    <script type="application/javascript">
+      window.STATIC_CONTENT = false
+                   window.__DATA__ = {"data":{"leading":true,"toc":{"title":"Documentation","href":"index.html","items":[{"name":"Documentation","href":"page.html","id":"Documentation-RANDOM"},{"name":"Config","href":"project/config.html","id":"Config-RANDOM"}],"base":"."},"data":{"title":"Documentation","description":"","meta":{"title":"Documentation","noIndex":true,"metadata":[{"name":"test-yfm","content":"inline test"},{"name":"yfm-config","content":"config test"}],"style":[],"script":[]},"links":[{"title":"Getting started with Documentation","description":"This guide will show you the basics of working with Documentation","href":"page.html"}]},"meta":{"title":"Documentation","noIndex":true,"metadata":[{"name":"test-yfm","content":"inline test"},{"name":"yfm-config","content":"config test"}],"style":[],"script":[]}},"router":{"pathname":"index.html"},"lang":"ru"};
+    </script>
+    <script type="application/javascript"
+            src="_bundle/vendor.js"
+    >
+    </script>
+    <script type="application/javascript"
+            src="_bundle/react.js"
+    >
+    </script>
+    <script type="application/javascript"
+            src="_bundle/app.js"
+    >
+    </script>
+  </body>
+</html>
+`;
+
+exports[`Allow load custom resources md2html with metadata 3`] = `
+<!DOCTYPE html>
+<html lang="ru">
+  <head>
+    <meta charset="utf-8">
+    <meta name="yfm">
+    <meta name="test-yfm"
+          content="inline test"
+    >
+    <meta name="yfm-config"
+          content="config test"
+    >
+    <meta name="viewport"
+          content="width=device-width, initial-scale=1.0"
+    >
+    <title>
+      Documentation
+    </title>
+    <style type="text/css">
+      body {
+                        height: 100vh;
+                    }
+    </style>
+    <link type="text/css"
+          rel="stylesheet"
+          href="_bundle/vendor.css"
+    >
+    <link type="text/css"
+          rel="stylesheet"
+          href="_bundle/app.css"
+    >
+  </head>
+  <body class="yc-root yc-root_theme_light">
+    <div id="root">
+    </div>
+    <script type="application/javascript">
+      window.STATIC_CONTENT = false
+                   window.__DATA__ = {"data":{"leading":false,"toc":{"title":"Documentation","href":"index.html","items":[{"name":"Documentation","href":"page.html","id":"Documentation-RANDOM"},{"name":"Config","href":"project/config.html","id":"Config-RANDOM"}],"base":"."},"meta":{"metadata":[{"name":"yfm","value":"builder in page"},{"name":"test-yfm","content":"inline test"},{"name":"yfm-config","content":"config test"}],"style":[],"script":[]},"assets":[],"headings":[],"title":"","includes":[],"html":"
+      <p>Lorem
+      </p>"},"router":{"pathname":"page.html"},"lang":"ru"};
+    </script>
+    <script type="application/javascript"
+            src="_bundle/vendor.js"
+    >
+    </script>
+    <script type="application/javascript"
+            src="_bundle/react.js"
+    >
+    </script>
+    <script type="application/javascript"
+            src="_bundle/app.js"
+    >
+    </script>
+  </body>
+</html>
+`;
+
+exports[`Allow load custom resources md2html with metadata 4`] = `
+<!DOCTYPE html>
+<html lang="ru">
+  <head>
+    <meta charset="utf-8">
+    <meta name="yfm">
+    <meta name="test-yfm"
+          content="inline test"
+    >
+    <meta name="yfm-config"
+          content="config test"
+    >
+    <meta name="viewport"
+          content="width=device-width, initial-scale=1.0"
+    >
+    <title>
+      Documentation
+    </title>
+    <style type="text/css">
+      body {
+                        height: 100vh;
+                    }
+    </style>
+    <link type="text/css"
+          rel="stylesheet"
+          href="../_bundle/vendor.css"
+    >
+    <link type="text/css"
+          rel="stylesheet"
+          href="../_bundle/app.css"
+    >
+  </head>
+  <body class="yc-root yc-root_theme_light">
+    <div id="root">
+    </div>
+    <script type="application/javascript">
+      window.STATIC_CONTENT = false
+                   window.__DATA__ = {"data":{"leading":false,"toc":{"title":"Documentation","href":"../index.html","items":[{"name":"Documentation","href":"../page.html","id":"Documentation-RANDOM"},{"name":"Config","href":"../project/config.html","id":"Config-RANDOM"}],"base":"."},"meta":{"metadata":[{"name":"yfm","value":"builder in config"},{"name":"test-yfm","content":"inline test"},{"name":"yfm-config","content":"config test"}],"style":[],"script":[]},"assets":[],"headings":[],"title":"","includes":[],"html":"
+      <p>Lorem
+      </p>"},"router":{"pathname":"../project/config.html"},"lang":"ru"};
+    </script>
+    <script type="application/javascript"
+            src="../_bundle/vendor.js"
+    >
+    </script>
+    <script type="application/javascript"
+            src="../_bundle/react.js"
+    >
+    </script>
+    <script type="application/javascript"
+            src="../_bundle/app.js"
+    >
+    </script>
+  </body>
+</html>
+`;
+
+exports[`Allow load custom resources md2md with metadata 1`] = `"["index.yaml","page.md","project/config.md","toc.yaml"]"`;
+
+exports[`Allow load custom resources md2md with metadata 2`] = `
+"title: Documentation
+description: ''
+meta:
+  title: Documentation
+  noIndex: true
+links:
+  - title: Getting started with Documentation
+    description: This guide will show you the basics of working with Documentation
+    href: page.md
+"
+`;
+
+exports[`Allow load custom resources md2md with metadata 3`] = `
+"---
+metadata:
+  - name: test-yfm
+    content: inline test
+  - name: yfm-config
+    content: config test
+  - name: yfm
+    content: builder in page
+---
+
+Lorem"
+`;
+
+exports[`Allow load custom resources md2md with metadata 4`] = `
+"---
+metadata:
+  - name: test-yfm
+    content: inline test
+  - name: yfm-config
+    content: config test
+  - name: yfm
+    value: builder in config
+---
+
+Lorem"
+`;
+
+exports[`Allow load custom resources md2md with metadata 5`] = `
+"title: Documentation
+href: index.yaml
+items:
+  - name: Documentation
+    href: page.md
+  - name: Config
+    href: project/config.md
+base: .
+"
+`;
diff --git a/tests/e2e/metadata.spec.ts b/tests/e2e/metadata.spec.ts
new file mode 100644
index 000000000..b941ae27e
--- /dev/null
+++ b/tests/e2e/metadata.spec.ts
@@ -0,0 +1,15 @@
+import {getTestPaths, runYfmDocs, compareDirectories} from '../utils';
+
+const geretateMapTestTemplate = (testTitle: string, testRootPath: string, {md2md = true, md2html = true}) => {
+    test(testTitle, () => {
+        const {inputPath, outputPath} = getTestPaths(testRootPath);
+        runYfmDocs(inputPath, outputPath, {md2md, md2html});
+        compareDirectories(outputPath);
+    });
+}
+
+describe('Allow load custom resources', () => {
+    geretateMapTestTemplate('md2md with metadata', 'mocks/metadata/md2md-with-metadata', {md2html: false})
+
+    geretateMapTestTemplate('md2html with metadata', 'mocks/metadata/md2html-with-metadata', {md2md: false})
+});
diff --git a/tests/mocks/load-custom-resources/md2html-with-resources/input/page.md b/tests/mocks/load-custom-resources/md2html-with-resources/input/page.md
index 0f927d5c4..ab14aea30 100644
--- a/tests/mocks/load-custom-resources/md2html-with-resources/input/page.md
+++ b/tests/mocks/load-custom-resources/md2html-with-resources/input/page.md
@@ -1,5 +1,7 @@
 ---
-meta: some meta
+metadata:
+  - name: yfm
+    content: builder
 ---
 
-Lorem
\ No newline at end of file
+Lorem
diff --git a/tests/mocks/load-custom-resources/md2md-with-resources/input/page.md b/tests/mocks/load-custom-resources/md2md-with-resources/input/page.md
index 0f927d5c4..ab14aea30 100644
--- a/tests/mocks/load-custom-resources/md2md-with-resources/input/page.md
+++ b/tests/mocks/load-custom-resources/md2md-with-resources/input/page.md
@@ -1,5 +1,7 @@
 ---
-meta: some meta
+metadata:
+  - name: yfm
+    content: builder
 ---
 
-Lorem
\ No newline at end of file
+Lorem
diff --git a/tests/mocks/load-custom-resources/single-page-with-resources/input/page.md b/tests/mocks/load-custom-resources/single-page-with-resources/input/page.md
index 0f927d5c4..ab14aea30 100644
--- a/tests/mocks/load-custom-resources/single-page-with-resources/input/page.md
+++ b/tests/mocks/load-custom-resources/single-page-with-resources/input/page.md
@@ -1,5 +1,7 @@
 ---
-meta: some meta
+metadata:
+  - name: yfm
+    content: builder
 ---
 
-Lorem
\ No newline at end of file
+Lorem
diff --git a/tests/mocks/metadata/md2html-with-metadata/input/index.yaml b/tests/mocks/metadata/md2html-with-metadata/input/index.yaml
new file mode 100644
index 000000000..60f350c8d
--- /dev/null
+++ b/tests/mocks/metadata/md2html-with-metadata/input/index.yaml
@@ -0,0 +1,9 @@
+title: Documentation
+description: ""
+meta:
+  title: Documentation
+  noIndex: true
+links:
+  - title: Getting started with Documentation
+    description: This guide will show you the basics of working with Documentation
+    href: page.md
diff --git a/tests/mocks/metadata/md2html-with-metadata/input/page.md b/tests/mocks/metadata/md2html-with-metadata/input/page.md
new file mode 100644
index 000000000..d5a9a94c4
--- /dev/null
+++ b/tests/mocks/metadata/md2html-with-metadata/input/page.md
@@ -0,0 +1,7 @@
+---
+metadata:
+  - name: yfm
+    value: builder in page
+---
+
+Lorem
\ No newline at end of file
diff --git a/tests/mocks/metadata/md2html-with-metadata/input/presets.yaml b/tests/mocks/metadata/md2html-with-metadata/input/presets.yaml
new file mode 100644
index 000000000..a5dec198e
--- /dev/null
+++ b/tests/mocks/metadata/md2html-with-metadata/input/presets.yaml
@@ -0,0 +1,5 @@
+__metadata:
+  - name: test-yfm
+    content: inline test
+  - name: yfm-config
+    content: config test
diff --git a/tests/mocks/metadata/md2html-with-metadata/input/project/config.md b/tests/mocks/metadata/md2html-with-metadata/input/project/config.md
new file mode 100644
index 000000000..2e1519666
--- /dev/null
+++ b/tests/mocks/metadata/md2html-with-metadata/input/project/config.md
@@ -0,0 +1,7 @@
+---
+metadata:
+  - name: yfm
+    value: builder in config
+---
+
+Lorem
\ No newline at end of file
diff --git a/tests/mocks/metadata/md2html-with-metadata/input/toc.yaml b/tests/mocks/metadata/md2html-with-metadata/input/toc.yaml
new file mode 100644
index 000000000..35f2b4c6c
--- /dev/null
+++ b/tests/mocks/metadata/md2html-with-metadata/input/toc.yaml
@@ -0,0 +1,7 @@
+title: Documentation
+href: index.yaml
+items:
+  - name: Documentation
+    href: page.md
+  - name: Config
+    href: project/config.md
\ No newline at end of file
diff --git a/tests/mocks/metadata/md2md-with-metadata/input/index.yaml b/tests/mocks/metadata/md2md-with-metadata/input/index.yaml
new file mode 100644
index 000000000..60f350c8d
--- /dev/null
+++ b/tests/mocks/metadata/md2md-with-metadata/input/index.yaml
@@ -0,0 +1,9 @@
+title: Documentation
+description: ""
+meta:
+  title: Documentation
+  noIndex: true
+links:
+  - title: Getting started with Documentation
+    description: This guide will show you the basics of working with Documentation
+    href: page.md
diff --git a/tests/mocks/metadata/md2md-with-metadata/input/page.md b/tests/mocks/metadata/md2md-with-metadata/input/page.md
new file mode 100644
index 000000000..847a0324d
--- /dev/null
+++ b/tests/mocks/metadata/md2md-with-metadata/input/page.md
@@ -0,0 +1,7 @@
+---
+metadata:
+  - name: yfm
+    content: builder in page
+---
+
+Lorem
\ No newline at end of file
diff --git a/tests/mocks/metadata/md2md-with-metadata/input/presets.yaml b/tests/mocks/metadata/md2md-with-metadata/input/presets.yaml
new file mode 100644
index 000000000..a5dec198e
--- /dev/null
+++ b/tests/mocks/metadata/md2md-with-metadata/input/presets.yaml
@@ -0,0 +1,5 @@
+__metadata:
+  - name: test-yfm
+    content: inline test
+  - name: yfm-config
+    content: config test
diff --git a/tests/mocks/metadata/md2md-with-metadata/input/project/config.md b/tests/mocks/metadata/md2md-with-metadata/input/project/config.md
new file mode 100644
index 000000000..2e1519666
--- /dev/null
+++ b/tests/mocks/metadata/md2md-with-metadata/input/project/config.md
@@ -0,0 +1,7 @@
+---
+metadata:
+  - name: yfm
+    value: builder in config
+---
+
+Lorem
\ No newline at end of file
diff --git a/tests/mocks/metadata/md2md-with-metadata/input/toc.yaml b/tests/mocks/metadata/md2md-with-metadata/input/toc.yaml
new file mode 100644
index 000000000..35f2b4c6c
--- /dev/null
+++ b/tests/mocks/metadata/md2md-with-metadata/input/toc.yaml
@@ -0,0 +1,7 @@
+title: Documentation
+href: index.yaml
+items:
+  - name: Documentation
+    href: page.md
+  - name: Config
+    href: project/config.md
\ No newline at end of file
diff --git a/tests/units/services/metadata.test.ts b/tests/units/services/metadata.test.ts
index 36b2464ef..3cefec685 100644
--- a/tests/units/services/metadata.test.ts
+++ b/tests/units/services/metadata.test.ts
@@ -1,5 +1,5 @@
 import {Contributor, Contributors, Metadata, MetaDataOptions} from 'models';
-import {getUpdatedMetadata} from 'services/metadata';
+import {getVCSMetadata} from 'services/metadata';
 import {replaceDoubleToSingleQuotes} from 'utils/markup';
 import {VCSConnector} from 'vcs-connector/connector-models';
 
@@ -35,7 +35,7 @@ jest.mock('services/authors', () => ({
 }));
 
 const defaultVCSConnector: VCSConnector = {
-    addNestedContributorsForPath: () => { },
+    addNestedContributorsForPath: () => {},
     getContributorsByPath: () => Promise.resolve(null),
     getUserByLogin: () => Promise.resolve(null),
     getExternalAuthorByPath: () => null,
@@ -64,7 +64,7 @@ describe('getUpdatedMetadata', () => {
         };
         metaDataOptions.isContributorsEnabled = false;
 
-        const newMetadata = await getUpdatedMetadata(metaDataOptions, fileContent);
+        const newMetadata = await getVCSMetadata(metaDataOptions, fileContent);
 
         expect(newMetadata).toEqual(expectedMetadata);
     });
@@ -76,77 +76,89 @@ describe('getUpdatedMetadata', () => {
         };
         metaDataOptions.vcsConnector = undefined;
 
-        const newMetadata = await getUpdatedMetadata(metaDataOptions, fileContent);
+        const newMetadata = await getVCSMetadata(metaDataOptions, fileContent);
 
         expect(newMetadata).toEqual(expectedMetadata);
     });
 
-    test('returns new metadata with filled contributors ' +
-        'when metadata options has "isContributorsEnabled" and "vcsConnector"', async () => {
-        const fileContent = '';
-        const expectedMetadata = {
-            contributors: contributorsString,
-        };
-
-        const newMetadata = await getUpdatedMetadata(metaDataOptions, fileContent);
-
-        expect(newMetadata).toEqual(expectedMetadata);
-    });
-
-    test('returns updated metadata with empty contributors when file has default metadata ' +
-        'and metadata options has "vcsConnector" and do not have "isContributorsEnabled"', async () => {
-        const fileContent = '';
-        const meta: Metadata = {
-            title: 'Some title',
-        };
-        const expectedMetadata = {
-            ...meta,
-            contributors: '[]',
-            author: null,
-        };
-        metaDataOptions.isContributorsEnabled = false;
-
-        const newMetadata = await getUpdatedMetadata(metaDataOptions, fileContent, meta);
-
-        expect(newMetadata).toEqual(expectedMetadata);
-    });
-
-    test('returns updated metadata with empty contributors when file has metadata with author ' +
-        'and metadata options has "vcsConnector" and do not have "isContributorsEnabled"', async () => {
-        const fileContent = '';
-        const meta: Metadata = {
-            title: 'Some title',
-            author: 'Some author',
-        };
-        const expectedMetadata = {
-            ...meta,
-            contributors: '[]',
-            author: authorString,
-        };
-        metaDataOptions.isContributorsEnabled = false;
-
-        const newMetadata = await getUpdatedMetadata(metaDataOptions, fileContent, meta);
-
-        expect(newMetadata).toEqual(expectedMetadata);
-    });
-
-    test('returns updated metadata with empty contributors when file has metadata with author ' +
-        'and metadata options do not have "isContributorsEnabled" and "vcsConnector"', async () => {
-        const fileContent = '';
-        const meta: Metadata = {
-            title: 'Some title',
-            author: 'Some author',
-        };
-        const expectedMetadata = {
-            ...meta,
-            contributors: '[]',
-            author: null,
-        };
-        metaDataOptions.isContributorsEnabled = false;
-        metaDataOptions.vcsConnector = undefined;
-
-        const newMetadata = await getUpdatedMetadata(metaDataOptions, fileContent, meta);
-
-        expect(newMetadata).toEqual(expectedMetadata);
-    });
+    test(
+        'returns new metadata with filled contributors ' +
+            'when metadata options has "isContributorsEnabled" and "vcsConnector"',
+        async () => {
+            const fileContent = '';
+            const expectedMetadata = {
+                contributors: contributorsString,
+            };
+
+            const newMetadata = await getVCSMetadata(metaDataOptions, fileContent);
+
+            expect(newMetadata).toEqual(expectedMetadata);
+        },
+    );
+
+    test(
+        'returns updated metadata with empty contributors when file has default metadata ' +
+            'and metadata options has "vcsConnector" and do not have "isContributorsEnabled"',
+        async () => {
+            const fileContent = '';
+            const meta: Metadata = {
+                title: 'Some title',
+            };
+            const expectedMetadata = {
+                ...meta,
+                contributors: '[]',
+                author: null,
+            };
+            metaDataOptions.isContributorsEnabled = false;
+
+            const newMetadata = await getVCSMetadata(metaDataOptions, fileContent, meta);
+
+            expect(newMetadata).toEqual(expectedMetadata);
+        },
+    );
+
+    test(
+        'returns updated metadata with empty contributors when file has metadata with author ' +
+            'and metadata options has "vcsConnector" and do not have "isContributorsEnabled"',
+        async () => {
+            const fileContent = '';
+            const meta: Metadata = {
+                title: 'Some title',
+                author: 'Some author',
+            };
+            const expectedMetadata = {
+                ...meta,
+                contributors: '[]',
+                author: authorString,
+            };
+            metaDataOptions.isContributorsEnabled = false;
+
+            const newMetadata = await getVCSMetadata(metaDataOptions, fileContent, meta);
+
+            expect(newMetadata).toEqual(expectedMetadata);
+        },
+    );
+
+    test(
+        'returns updated metadata with empty contributors when file has metadata with author ' +
+            'and metadata options do not have "isContributorsEnabled" and "vcsConnector"',
+        async () => {
+            const fileContent = '';
+            const meta: Metadata = {
+                title: 'Some title',
+                author: 'Some author',
+            };
+            const expectedMetadata = {
+                ...meta,
+                contributors: '[]',
+                author: null,
+            };
+            metaDataOptions.isContributorsEnabled = false;
+            metaDataOptions.vcsConnector = undefined;
+
+            const newMetadata = await getVCSMetadata(metaDataOptions, fileContent, meta);
+
+            expect(newMetadata).toEqual(expectedMetadata);
+        },
+    );
 });
diff --git a/tsconfig.json b/tsconfig.json
index 4572080e5..9f6569773 100644
--- a/tsconfig.json
+++ b/tsconfig.json
@@ -1,9 +1,10 @@
 {
   "extends": "@diplodoc/tsconfig",
   "compilerOptions": {
+    "lib": ["ES2019"],
     "target": "es6",
-    "moduleResolution": "NodeNext",
-    "outDir": "build"
+    "outDir": "build",
+    "module": "CommonJS"
   },
   "include": ["src"],
   "exclude": ["node_modules"],