diff --git a/.dockerfile b/.dockerfile
deleted file mode 100644
index e69de29..0000000
diff --git a/.dockerignore b/.dockerignore
index e69de29..d218ad4 100644
--- a/.dockerignore
+++ b/.dockerignore
@@ -0,0 +1,14 @@
+node_modules
+dist
+.astro
+.env
+.env.example
+.git
+.gitignore
+dockerfile
+.dockerignore
+.vscode
+.prettierrc
+codegen.ts
+schema.graphql
+README.md
\ No newline at end of file
diff --git a/.env.example b/.env.example
index a3aa8f6..9cf0e4d 100644
--- a/.env.example
+++ b/.env.example
@@ -1,3 +1,4 @@
+ASTRO_TELEMETRY_DISABLED=1
 DIRECTUS_URL=
 DIRECTUS_URL_GRAPHQL=
 DIRECTUS_TOKEN=
\ No newline at end of file
diff --git a/Dockerfile b/Dockerfile
new file mode 100644
index 0000000..d2f5bbf
--- /dev/null
+++ b/Dockerfile
@@ -0,0 +1,19 @@
+ARG NODE_IMAGE=node:24.0.0-alpine
+
+FROM ${NODE_IMAGE} AS build
+
+WORKDIR /app
+COPY package*.json .
+RUN npm ci
+COPY . .
+RUN npm run build
+
+FROM ${NODE_IMAGE} AS production
+WORKDIR /app
+
+COPY --from=build /app/dist ./dist
+COPY --from=build /app/package*.json .
+RUN npm ci --omit=dev
+
+EXPOSE 9966
+CMD [ "node", "./dist/server/entry.mjs"]
\ No newline at end of file
diff --git a/compose.yml b/compose.yml
index e69de29..85e0943 100644
--- a/compose.yml
+++ b/compose.yml
@@ -0,0 +1,17 @@
+services:
+  yarkov-tech-node:
+    container_name: yarkov-tech-node
+    restart: unless-stopped
+    image: sergeyyarkov/yarkovtech:latest
+    networks:
+      - nginx_net
+    env_file: .env
+    build:
+      context: ./
+      dockerfile: Dockerfile
+    ports:
+      - 9966
+
+networks:
+  nginx_net:
+    external: true
\ No newline at end of file
diff --git a/nginx/website.conf b/nginx/website.conf
deleted file mode 100644
index e69de29..0000000
diff --git a/src/components/AvailableOnLangs.astro b/src/components/AvailableOnLangs.astro
index c88666c..954a0cf 100644
--- a/src/components/AvailableOnLangs.astro
+++ b/src/components/AvailableOnLangs.astro
@@ -22,14 +22,15 @@ const { articles } = Astro.props;
 					(a) =>
 						a && (
 							<a
-								href={`${createRelativeArticleUrl({ slug: a.slug, articleLang: `${a.languages_code?.code.split("-")[0]}`, pubDate: a.pub_date })}`}>{`${a.languages_code?.name}`}</a>
+								href={`${createRelativeArticleUrl({ slug: a.slug, articleLang: `${a.languages_code?.code.split("-")[0]}`, pubDate: a.pub_date })}`}
+							>{`${a.languages_code?.name}`}</a>
 						)
 				)}
 		</div>
 	)
 }
 
-<style lang='scss'>
+<style lang="scss">
 	div {
 		margin: 10px 0;
 		font-size: var(--font-size-lg);
diff --git a/src/i18n/utils.ts b/src/i18n/utils.ts
index 8322b48..eafe183 100644
--- a/src/i18n/utils.ts
+++ b/src/i18n/utils.ts
@@ -12,7 +12,11 @@ export function getLanguageKeys(): Array<string> {
 }
 
 export function getLanguageFromURL(pathname: string): LanguageKeys {
-	const lang = pathname.split("/")[1] as LanguageKeys;
+	const splittedPathName = pathname.split("/");
+	let lang = splittedPathName[1] as LanguageKeys;
+
+	if ((lang as string) === "blog") lang = splittedPathName[2] as LanguageKeys;
+
 	if (Object.hasOwn(languages, lang)) return lang;
 	return DEFAULT_LANGUAGE;
 }
@@ -22,7 +26,7 @@ export function isPageLangSupported(Astro: Readonly<AstroGlobal>) {
 	const params = Astro.params as { lang: string };
 	if (SUPPORTED_LANGUAGES.includes(params.lang as LanguageKeys)) return true;
 	return false;
-} 
+}
 
 export function removeLangFromURL(pathname: string): string {
 	const splittedPath = pathname.split("/");
diff --git a/src/pages/blog/[...url].astro b/src/pages/blog/[...url].astro
index 5a20ca1..bf3603e 100644
--- a/src/pages/blog/[...url].astro
+++ b/src/pages/blog/[...url].astro
@@ -2,7 +2,6 @@
 import ArticleLayout from "@root/layouts/article.astro";
 import { getArticleTranslationsBySlug, incArticleTranslationViews } from "@/src/queries";
 
-// Example of an URL: https://website.com/blog/01-01-2025/my-article/
 const { url } = Astro.params as { url: string };
 const slug = url.split("/").at(-1);
 
diff --git a/src/utils/article.ts b/src/utils/article.ts
index 09193aa..27cd934 100644
--- a/src/utils/article.ts
+++ b/src/utils/article.ts
@@ -31,7 +31,7 @@ export function filterArticlesByPageLang<
 
 /**
  * This will create a relative url based on article entry.
- * `/en/blog/2023-01-01/my-first-article`
+ * `/blog/en/2023-01-01/my-first-article`
  */
 export function createRelativeArticleUrl(
 	params: { slug: string; articleLang: string; pubDate: string },
@@ -40,7 +40,7 @@ export function createRelativeArticleUrl(
 	const { pubDate, articleLang, slug } = params;
 	const date = pubDate.split("T")[0];
 	const lang = articleLang !== DEFAULT_LANGUAGE ? "/" + articleLang : "";
-	return `${lang}/${prefix}/${date}/${slug}`;
+	return `/${prefix}${lang}/${date}/${slug}`;
 }
 
 export function formatToArticleBlocks(articles: ArticleQuery["article"][0]["translations"]) {