diff --git a/environments/.env.develop b/environments/.env.develop
index 2e275bb..8f4f3be 100644
--- a/environments/.env.develop
+++ b/environments/.env.develop
@@ -4,4 +4,5 @@ AURA_DAPI_PREFIX=v2
 AURA_SITE_HOST=https://aura.wit.life
 AURA_PREFIX=api/v1
 AURA_OPEN_AI_HOST=https://api.openai.com
-AURA_OPEN_AI_PREFIX=v1
\ No newline at end of file
+AURA_OPEN_AI_PREFIX=v1
+AURA_YANDEX_COUNTER_NUMBER=95799066
\ No newline at end of file
diff --git a/environments/.env.production b/environments/.env.production
index 178f647..6d73dbc 100644
--- a/environments/.env.production
+++ b/environments/.env.production
@@ -4,4 +4,5 @@ AURA_DAPI_PREFIX=v2
 AURA_SITE_HOST=https://aura.wit.life
 AURA_PREFIX=api/v1
 AURA_OPEN_AI_HOST=https://api.openai.com
-AURA_OPEN_AI_PREFIX=v1
\ No newline at end of file
+AURA_OPEN_AI_PREFIX=v1
+AURA_YANDEX_COUNTER_NUMBER=95799066
\ No newline at end of file
diff --git a/index.html b/index.html
index 05b8e9c..1da3385 100755
--- a/index.html
+++ b/index.html
@@ -42,30 +42,6 @@
         }
       }
     </style>
-    <!-- <script type="text/javascript">
-      window.smartlook ||
-        (function (d) {
-          var o = (smartlook = function () {
-              o.api.push(arguments);
-            }),
-            h = d.getElementsByTagName("head")[0];
-          var c = d.createElement("script");
-          o.api = new Array();
-          c.async = true;
-          c.type = "text/javascript";
-          c.charset = "utf-8";
-          c.src = "https://web-sdk.smartlook.com/recorder.js";
-          h.appendChild(c);
-        })(document);
-      smartlook("init", "2162354c75f8e0cb315634bc429aced457d3230c", {
-        region: "eu",
-      });
-    </script> -->
-    <!-- <script
-      type="text/javascript"
-      src="//script.crazyegg.com/pages/scripts/0121/5622.js"
-      async="async"
-    ></script> -->
   </head>
   <body>
     <!-- Yandex.Metrika counter -->
@@ -91,16 +67,9 @@
         window,
         document,
         "script",
-        "https://mc.yandex.ru/metrika/tag.js",
+        "https://cdn.jsdelivr.net/npm/yandex-metrica-watch/tag.js",
         "ym"
       );
-
-      ym(95799066, "init", {
-        clickmap: true,
-        trackLinks: true,
-        accurateTrackBounce: true,
-        webvisor: true,
-      });
     </script>
     <noscript>
       <div>
@@ -113,14 +82,6 @@
     </noscript>
     <!-- /Yandex.Metrika counter -->
     <noscript>You need to enable JavaScript to run this app.</noscript>
-    <noscript
-      ><div>
-        <img
-          src="https://mc.yandex.ru/watch/95799066"
-          style="position: absolute; left: -9999px"
-          alt=""
-        /></div
-    ></noscript>
     <!-- Google Tag Manager (noscript) -->
     <noscript
       ><iframe
diff --git a/src/components/EmailEnterPage/index.tsx b/src/components/EmailEnterPage/index.tsx
index d3377c6..adb7488 100755
--- a/src/components/EmailEnterPage/index.tsx
+++ b/src/components/EmailEnterPage/index.tsx
@@ -15,6 +15,7 @@ import { useAuthentication } from "@/hooks/authentication/use-authentication";
 import { ESourceAuthorization } from "@/api/resources/User";
 import { EPlacementKeys, IPaywallProduct } from "@/api/resources/Paywall";
 import { usePaywall } from "@/hooks/paywall/usePaywall";
+import metricService from "@/services/metric/metricService";
 
 interface IEmailEnterPage {
   redirectUrl?: string;
@@ -88,8 +89,7 @@ function EmailEnterPage({
 
   const handleClick = () => {
     authorize();
-    if (typeof window.ym === "function")
-      window.ym(95799066, "reachGoal", "EnteredEmail");
+    metricService.reachGoal("EnteredEmail");
   };
 
   const authorize = async () => {
diff --git a/src/components/PaymentPage/results/SuccessPage/index.tsx b/src/components/PaymentPage/results/SuccessPage/index.tsx
index 21a1e39..38a5a72 100644
--- a/src/components/PaymentPage/results/SuccessPage/index.tsx
+++ b/src/components/PaymentPage/results/SuccessPage/index.tsx
@@ -7,19 +7,20 @@ import MainButton from "@/components/MainButton";
 import { useDispatch } from "react-redux";
 import { actions } from "@/store";
 import { useEffect } from "react";
+import metricService from "@/services/metric/metricService";
 
 function PaymentSuccessPage(): JSX.Element {
   const { t } = useTranslation();
   const navigate = useNavigate();
   const dispatch = useDispatch();
+
   const handleNext = () => {
     dispatch(actions.status.update("subscribed"));
     navigate(routes.client.addReport());
   };
 
   useEffect(() => {
-    if (typeof window.ym === "function")
-      window.ym(95799066, "reachGoal", "PaymentSuccess");
+    metricService.reachGoal("PaymentSuccess");
   }, []);
 
   return (
diff --git a/src/components/pages/ABDesign/v1/pages/EmailEnterPage/index.tsx b/src/components/pages/ABDesign/v1/pages/EmailEnterPage/index.tsx
index 950db9b..6f4a44c 100644
--- a/src/components/pages/ABDesign/v1/pages/EmailEnterPage/index.tsx
+++ b/src/components/pages/ABDesign/v1/pages/EmailEnterPage/index.tsx
@@ -18,6 +18,7 @@ import { ESourceAuthorization } from "@/api/resources/User";
 import { useAuthentication } from "@/hooks/authentication/use-authentication";
 import { usePaywall } from "@/hooks/paywall/usePaywall";
 import { EPlacementKeys, IPaywallProduct } from "@/api/resources/Paywall";
+import metricService from "@/services/metric/metricService";
 
 interface IEmailEnterPage {
   redirectUrl?: string;
@@ -93,8 +94,7 @@ function EmailEnterPage({
 
   const handleClick = () => {
     authorize();
-    if (typeof window.ym === "function")
-      window.ym(95799066, "reachGoal", "EnteredEmail");
+    metricService.reachGoal("EnteredEmail");
   };
 
   const authorize = async () => {
diff --git a/src/components/pages/Gender/index.tsx b/src/components/pages/Gender/index.tsx
index 199a643..5110d26 100644
--- a/src/components/pages/Gender/index.tsx
+++ b/src/components/pages/Gender/index.tsx
@@ -7,6 +7,7 @@ import { actions } from "@/store";
 import { useEffect } from "react";
 import { useDispatch } from "react-redux";
 import { useNavigate, useParams } from "react-router-dom";
+import metricService from "@/services/metric/metricService";
 
 interface IGenderPageProps {
   productKey?: EProductKeys;
@@ -20,11 +21,9 @@ function GenderPage({ productKey }: IGenderPageProps): JSX.Element {
   useEffect(() => {
     const isShowTryApp = targetId === "i";
     dispatch(actions.userConfig.addIsShowTryApp(isShowTryApp));
-    if (targetId && typeof window.ym === "function" && targetId !== "i") {
-      window.ym(95799066, "userParams", {
-        genderFrom: targetId,
-      });
-    }
+    metricService.userParams({
+      genderFrom: targetId,
+    });
   }, [dispatch, targetId]);
 
   const selectGender = (gender: Gender) => {
diff --git a/src/components/pages/SinglePaymentPage/ResultPayment/SuccessPaymentPage/index.tsx b/src/components/pages/SinglePaymentPage/ResultPayment/SuccessPaymentPage/index.tsx
index 0a464fd..a0966f4 100644
--- a/src/components/pages/SinglePaymentPage/ResultPayment/SuccessPaymentPage/index.tsx
+++ b/src/components/pages/SinglePaymentPage/ResultPayment/SuccessPaymentPage/index.tsx
@@ -5,6 +5,7 @@ import MainButton from "@/components/MainButton";
 import { useNavigate } from "react-router-dom";
 import routes from "@/routes";
 import { useEffect } from "react";
+import metricService from "@/services/metric/metricService";
 
 function SuccessPaymentPage(): JSX.Element {
   const { t } = useTranslation();
@@ -15,8 +16,7 @@ function SuccessPaymentPage(): JSX.Element {
     : "The information has been sent to your email";
 
   useEffect(() => {
-    if (typeof window.ym === "function")
-      window.ym(95799066, "reachGoal", "PaymentSuccess");
+    metricService.reachGoal("PaymentSuccess");
   }, []);
 
   return (
diff --git a/src/components/palmistry/step-email/step-email.tsx b/src/components/palmistry/step-email/step-email.tsx
index f092fd4..bfcd90c 100644
--- a/src/components/palmistry/step-email/step-email.tsx
+++ b/src/components/palmistry/step-email/step-email.tsx
@@ -9,6 +9,7 @@ import Title from "@/components/Title";
 import Loader, { LoaderColor } from "@/components/Loader";
 import { useAuthentication } from "@/hooks/authentication/use-authentication";
 import { ESourceAuthorization } from "@/api/resources/User";
+import metricService from "@/services/metric/metricService";
 
 const emailRegex = /^[\w-]+(\.[\w-]+)*@[\w-]+(\.[\w-]+)+$/;
 
@@ -43,8 +44,7 @@ export default function StepEmail() {
 
   const authorize = async () => {
     await authorization(email, ESourceAuthorization["aura.palmistry"]);
-    if (typeof window.ym === "function")
-      window.ym(95799066, "reachGoal", "EnteredEmail");
+    metricService.reachGoal("EnteredEmail");
     setIsAuth(true);
   };
 
diff --git a/src/env.d.ts b/src/env.d.ts
index c7ddc5d..155ff67 100644
--- a/src/env.d.ts
+++ b/src/env.d.ts
@@ -4,6 +4,7 @@ interface ImportMetaEnv {
     AURA_DAPI_PREFIX: string,
     AURA_SITE_HOST: string,
     AURA_PREFIX: string,
-    AURA_OPEN_AI_HOST: number,
-    AURA_OPEN_AI_PREFIX: string
+    AURA_OPEN_AI_HOST: string,
+    AURA_OPEN_AI_PREFIX: string,
+    AURA_YANDEX_COUNTER_NUMBER: string
 }
\ No newline at end of file
diff --git a/src/init.tsx b/src/init.tsx
index 279bb7f..dc1433f 100755
--- a/src/init.tsx
+++ b/src/init.tsx
@@ -10,6 +10,9 @@ import { ApiContext, createApi } from "./api";
 import { LegalContext, buildLegal } from "./legal";
 import { getClientLocale, buildResources, fallbackLng } from "./locales";
 import App from "./components/App";
+import metricService from "./services/metric/metricService";
+
+const environments = import.meta.env;
 
 const init = async () => {
   const api = createApi();
@@ -35,23 +38,19 @@ const init = async () => {
     .use(new ReactPostprocessor())
     .init(options);
 
-  const isProduction = import.meta.env.MODE === "production";
+  const isProduction = environments.MODE === "production";
 
   // SCRIPTS TO HEAD
-  // const yandexMetric = () => {
-  //   const script = document.createElement("script");
-  //   script.setAttribute("src", "/metrics/yandex.js");
-  //   document.head.appendChild(script);
-  // };
-
   const smartLook = () => {
     if (!config.smartlook_manage) return;
     const script = document.createElement("script");
     script.setAttribute("src", "/metrics/smartlook.js");
     document.head.appendChild(script);
   };
+
+  metricService.initMetric();
+
   if (isProduction) {
-    // yandexMetric();
     smartLook();
   }
 
diff --git a/src/services/metric/metricService.ts b/src/services/metric/metricService.ts
new file mode 100644
index 0000000..d48081a
--- /dev/null
+++ b/src/services/metric/metricService.ts
@@ -0,0 +1,45 @@
+interface IUserParams {
+    UserID: number;
+    genderFrom: string;
+    email: string;
+}
+
+const environments = import.meta.env
+const metricCounterNumber = Number(environments.AURA_YANDEX_COUNTER_NUMBER)
+
+const setUserID = (userId: string) => {
+    if (typeof window.ym !== "function") return console.error("Yandex.Metric not found");
+
+    window.ym(metricCounterNumber, "setUserID", userId)
+    // eslint-disable-next-line react-hooks/exhaustive-deps
+}
+
+const userParams = (parameters: Partial<IUserParams>) => {
+    if (typeof window.ym !== "function") return console.error("Yandex.Metric not found");
+
+    window.ym(metricCounterNumber, "userParams", parameters)
+    // eslint-disable-next-line react-hooks/exhaustive-deps
+}
+
+const reachGoal = (goal: "EnteredEmail" | "PaymentSuccess") => {
+    if (typeof window.ym !== "function") return console.error("Yandex.Metric not found");
+
+    window.ym(metricCounterNumber, "reachGoal", goal)
+    // eslint-disable-next-line react-hooks/exhaustive-deps
+}
+
+const initMetric = () => {
+    if (typeof window.ym !== "function") return console.error("Yandex.Metric not found");
+
+    window.ym(metricCounterNumber, "init", {
+        clickmap: true,
+        trackLinks: true,
+        accurateTrackBounce: true,
+        webvisor: true,
+    });
+    console.log("Metric initialized");
+
+    // eslint-disable-next-line react-hooks/exhaustive-deps
+}
+
+export default { setUserID, userParams, reachGoal, initMetric }
\ No newline at end of file
