diff --git a/.env.example b/.env.example
index e4f2b5f..7a088e6 100644
--- a/.env.example
+++ b/.env.example
@@ -2,14 +2,12 @@ ALGOLIA_APP_ID=
 ALGOLIA_API_KEY=
 ALGOLIA_INDEX_NAME=
 
-GISCUS_DISCUSSION_CATEGORY=
-GISCUS_DISCUSSION_CATEGORY_ID=
-GISCUS_PROJECT_ID=
-
-GOOGLE_ANALYTICS_TAG_ID=
-
-ORGANIZATION_NAME=
-REPOSITORY_NAME=
+COUNTER_GOOGLE=
+COUNTER_YANDEX=
 
+SITE_URL=
 SITE_TITLE=
-SITE_URL=
\ No newline at end of file
+SITE_ORANIZATION_NAME=
+SITE_PROJECT_NAME=
+
+# GISCUS settings in /src/theme/BlogPostItem.jsx
diff --git a/docusaurus.config.js b/docusaurus.config.js
index b5bd1ab..a0e2be7 100644
--- a/docusaurus.config.js
+++ b/docusaurus.config.js
@@ -8,15 +8,14 @@ const darkTheme = themes.dracula;
 
 /** @type {import('@docusaurus/types').Config} */
 const config = {
-  title: 'SantaSpeen',
+  title: process.env.SITE_TITLE,
   tagline: 'Personal Blog',
   favicon: 'img/favicon.ico',
-  url: 'https://santaspeen.ru',
+  url: process.env.SITE_URL,
   baseUrl: '/',
-  organizationName: 'santaspeen',
-  projectName: 'santaspeen.ru',
+  organizationName: process.env.SITE_ORANIZATION_NAME,
+  projectName: process.env.SITE_PROJECT_NAME,
   trailingSlash: false,
-  deploymentBranch: 'gh-pages',
   onBrokenLinks: 'throw',
   onBrokenMarkdownLinks: 'warn',
   i18n: {
@@ -51,10 +50,10 @@ const config = {
             },
           },
         },
-        // gtag: {
-        //   trackingID: process.env.GOOGLE_ANALYTICS_TAG_ID,
-        //   anonymizeIP: true,
-        // },
+        gtag: {
+          trackingID: process.env.COUNTER_GOOGLE,
+          anonymizeIP: true,
+        },
         theme: {
           customCss: require.resolve('./src/css/custom.css'),
         },
@@ -92,12 +91,6 @@ const config = {
         style: 'dark',
         copyright: `Copyright © ${new Date().getFullYear()} SantaSpeen`,
       },
-      // algolia: {
-      //   appId: process.env.ALGOLIA_APP_ID,
-      //   apiKey: process.env.ALGOLIA_API_KEY,
-      //   indexName: process.env.ALGOLIA_INDEX_NAME,
-      //   searchParameters: {},
-      // },
       prism: {
         additionalLanguages: ['bash', 'diff', 'json'],
         darkTheme: darkTheme,
@@ -108,6 +101,12 @@ const config = {
         disableSwitch: false,
         respectPrefersColorScheme: false,
       },
+      algolia: {
+        appId: process.env.ALGOLIA_APP_ID,
+        apiKey: process.env.ALGOLIA_API_KEY,
+        indexName: process.env.ALGOLIA_INDEX_NAME,
+        searchParameters: {},
+      },
     }),
   plugins: [
     [
@@ -115,6 +114,9 @@ const config = {
       /** @type {import('docusaurus-plugin-sass').Options} */
       {}
     ],
+    ['docusaurus-plugin-yandex-metrica', {
+      counterID: process.env.COUNTER_YANDEX,
+    }],
   ]
 };
 
diff --git a/src/theme/BlogPostItem.tsx b/src/theme/BlogPostItem.tsx
index 0234546..05617b7 100644
--- a/src/theme/BlogPostItem.tsx
+++ b/src/theme/BlogPostItem.tsx
@@ -5,19 +5,26 @@ import Giscus from "@giscus/react";
 
 export default function BlogPostItemWrapper(props) {
   const { isBlogPostPage } = useBlogPost();
+  
   if (!isBlogPostPage) {
     return <BlogPostItem {...props} />;
   }
+  
+  const repo = "SantaSpeen/santaspeen.ru-blog"
+  const repoId = "R_kgDOK6Fd_Q"
+  const category = "General"
+  const categoryId = "DIC_kwDOK6Fd_c4Cbwpe"
+
   return (
     <>
       <BlogPostItem {...props} />
       {(
         <div className="docusaurus-blog-comments">
           <Giscus
-            repo="SantaSpeen/santaspeen.ru-blog"
-            repoId="R_kgDOK6Fd_Q"
-            category="General"
-            categoryId="DIC_kwDOK6Fd_c4Cbwpe"
+            repo={repo}
+            repoId={repoId}
+            category={category}
+            categoryId={categoryId}
             mapping="pathname"
             reactionsEnabled="1"
             emitMetadata="0"
@@ -30,4 +37,4 @@ export default function BlogPostItemWrapper(props) {
       )}
     </>
   );
-}
\ No newline at end of file
+}