diff --git a/README.md b/README.md
index 5361a13..9d7869a 100644
--- a/README.md
+++ b/README.md
@@ -215,3 +215,13 @@ See [MDX troubleshooting](https://mdxjs.com/docs/troubleshooting-mdx/)
 <a href="https://github.com/danielcgilibert/blog-template/graphs/contributors">
   <img src="https://contrib.rocks/image?repo=danielcgilibert/blog-template" />
 </a>
+
+## Localisation
+
+https://docs.astro.build/en/guides/internationalization/
+
+https://docs.astro.build/en/recipes/i18n/#hide-default-language-in-the-url
+
+# Plausible
+
+https://plausible.io/blog/utm-tracking-tags
diff --git a/astro.config.mjs b/astro.config.mjs
index 94814b9..916a801 100644
--- a/astro.config.mjs
+++ b/astro.config.mjs
@@ -17,6 +17,13 @@ export default defineConfig({
       wrap: true
     }
   },
+  i18n: {
+    defaultLocale: "en",
+    locales: ["de", "en"],
+    routing: {
+      prefixDefaultLocale: false
+  }
+  },
   integrations: [mdx({
     syntaxHighlight: 'shiki',
     shikiConfig: {
diff --git a/src/assets/images/azure-service-connection.png b/src/assets/images/azure-service-connection.png
new file mode 100644
index 0000000..45bef61
Binary files /dev/null and b/src/assets/images/azure-service-connection.png differ
diff --git a/src/assets/images/blogimages/GitHub Actions.png b/src/assets/images/blogimages/GitHub Actions.png
new file mode 100644
index 0000000..85dcb8e
Binary files /dev/null and b/src/assets/images/blogimages/GitHub Actions.png differ
diff --git a/src/assets/images/blogimages/Streamlit-logo-primary-colormark-darktext.png b/src/assets/images/blogimages/Streamlit-logo-primary-colormark-darktext.png
new file mode 100644
index 0000000..209ceba
Binary files /dev/null and b/src/assets/images/blogimages/Streamlit-logo-primary-colormark-darktext.png differ
diff --git a/src/assets/images/blogimages/docker.png b/src/assets/images/blogimages/docker.png
new file mode 100644
index 0000000..717183d
Binary files /dev/null and b/src/assets/images/blogimages/docker.png differ
diff --git a/src/assets/images/blogimages/docker.webp b/src/assets/images/blogimages/docker.webp
new file mode 100644
index 0000000..145d251
Binary files /dev/null and b/src/assets/images/blogimages/docker.webp differ
diff --git a/src/assets/images/blogimages/entraid.png b/src/assets/images/blogimages/entraid.png
new file mode 100644
index 0000000..60201f8
Binary files /dev/null and b/src/assets/images/blogimages/entraid.png differ
diff --git a/src/assets/images/blogimages/queesdocker1-768x432-1.webp b/src/assets/images/blogimages/queesdocker1-768x432-1.webp
new file mode 100644
index 0000000..145d251
Binary files /dev/null and b/src/assets/images/blogimages/queesdocker1-768x432-1.webp differ
diff --git a/src/assets/images/blogimages/terraform.png b/src/assets/images/blogimages/terraform.png
new file mode 100644
index 0000000..dc05e7b
Binary files /dev/null and b/src/assets/images/blogimages/terraform.png differ
diff --git a/src/components/Header.astro b/src/components/Header.astro
index 32b2c30..adcbb83 100644
--- a/src/components/Header.astro
+++ b/src/components/Header.astro
@@ -27,6 +27,19 @@ const SOCIALNETWORKS = [
 		icon: TwitterIcon
 	}
 ]
+
+// Language options
+const LANGUAGES = [
+	{ code: 'en', name: 'English' },
+	{ code: 'es', name: 'Español' }
+]
+
+function changeLanguage(event) {
+	const selectedLanguage = event.target.value
+	const currentPath = window.location.pathname
+	const newPath = `/${selectedLanguage}${currentPath}`
+	window.location.href = newPath
+}
 ---
 
 <header class='relative flex items-center h-12 font-semibold'>
@@ -67,6 +80,13 @@ const SOCIALNETWORKS = [
 			<Search />
 		</div>
 		<ToggleTheme />
+			<select onChange={changeLanguage} class='ml-4 p-2 border rounded'>
+				{
+					LANGUAGES.map((lang) => (
+						<option value={lang.code}>{lang.name}</option>
+					))
+				}
+			</select>
 		<button id='astro-header-drawer-button' type='button' class='md:ml-6 md:hidden'>
 			<MenuIcon />
 			<span class='sr-only'>Show Menu</span>
diff --git a/src/content/blog/Streamlit-Bereitstellungshandbuch-Teil-1-Containerisierung.mdx b/src/content/blog/Streamlit-Bereitstellungshandbuch-Teil-1-Containerisierung.mdx
new file mode 100644
index 0000000..26ba3ec
--- /dev/null
+++ b/src/content/blog/Streamlit-Bereitstellungshandbuch-Teil-1-Containerisierung.mdx
@@ -0,0 +1,266 @@
+---
+heroImage: /src/assets/images/Terraform.png
+category: IaC
+description: >-
+  A step-by-step guide for creating the Terraform code to manage the infrastructure needed to host your Streamlit application on Azure.
+pubDate: 2024-07-14
+draft: false
+tags:
+  - terraform
+  - azure
+  - iac
+title: >-
+  Streamlit Bereitstellungshandbuch Teil 1 Containerisierung
+language: de
+---
+
+When I needed to create a quick proof of concept (PoC) using [Streamlit](https://streamlit.io/), I faced two constraints:
+
+- Self-hosted instead of using [Streamlit Community Cloud](https://streamlit.io/cloud).
+- Control access to the deployed website.
+
+With this in mind, containerizing the application and hosting it on Azure was the best solution with my skillset. This post kicks off a series detailing the process, broken down into the following parts:
+
+- **Part 1**: Containerizing a Streamlit app. **You are here** 😊
+- **Part 2**: GitHub Workflow for Building and Publishing to ghcr.io
+- **Part 3**: Azure Infrastructure via Terraform
+- **Part 4**: GitHub Workflow for Terraform Apply & Destroy
+
+Do you want to deploy your Streamlit application on Azure right now? Use the [template repository](https://github.com/WayneGoosen/azure-streamlit-poc) �
+
+## TL;DR
+
+Read the [completed Dockerfile](#completed-dockerfile), execute commands to [build the image](#build-the-docker-image) and [run the container](#run-the-docker-container).
+
+## Streamlit Application Files
+
+Before proceeding with the steps, ensure the following Streamlit application files are available. You can find these files in the [app folder](https://github.com/WayneGoosen/azure-streamlit-poc/tree/main/app) of the GitHub repository.
+
+### .streamlit/config.toml
+
+```toml
+[client]
+showErrorDetails = false
+toolbarMode = "auto"
+showSidebarNavigation = true
+
+[theme]
+base = "dark"
+
+[logger]
+level = "debug"
+messageFormat = "%(asctime)s %(message)s"
+
+[server]
+port = 80
+
+[browser]
+gatherUsageStats = false
+```
+
+### app.py
+
+```python
+import os
+import streamlit as st
+
+st.title("Streamlit on Azure �")
+st.header('Running on a Web App in a Container �', divider='rainbow')
+```
+
+### requirements.txt
+
+```
+streamlit
+```
+
+## Create a Dockerfile
+
+**Note:** Docker is a prerequisite, read the [install documentation](https://docs.docker.com/get-docker/) for more details.
+
+### Completed Dockerfile
+
+```dockerfile
+FROM python:3.9-slim
+
+LABEL maintainer="Wayne Goosen" \
+      version="1.0.0" \
+      description="Streamlit template for Docker. Uses app.py as the main file."
+
+WORKDIR /app
+
+RUN apt-get update \
+    && rm -rf /var/lib/apt/lists/*
+
+COPY requirements.txt .
+
+RUN pip3 install -r requirements.txt
+
+COPY .streamlit/config.toml .streamlit/
+COPY app.py .
+
+RUN groupadd -g 1005 appgroup && \
+    useradd -u 1005 -g appgroup appuser && \
+    chown -R appuser:appgroup /app
+
+EXPOSE 80
+
+USER appuser
+
+ENTRYPOINT ["streamlit", "run"]
+CMD ["app.py"]
+```
+
+### Dockerfile Walkthrough
+
+#### Specify Base Image
+
+```dockerfile
+FROM python:3.9-slim
+```
+
+- Uses a slim version of Python 3.9 as the base image, ensuring a minimal and efficient environment.
+
+#### Add Metadata Labels
+
+```dockerfile
+LABEL maintainer="Wayne Goosen" \
+      version="1.0.0" \
+      description="Streamlit template for Docker. Uses app.py as the main file."
+```
+
+- Provides metadata about the Docker image, including the maintainer, version, and description.
+
+#### Set Working Directory
+
+```dockerfile
+WORKDIR /app
+```
+
+- Sets the working directory inside the container to `/app`.
+- Note: Streamlit version 1.10.0 and higher, Streamlit apps cannot be run from the root directory of Linux distributions.
+
+#### Update Package List
+
+```dockerfile
+RUN apt-get update \
+    && rm -rf /var/lib/apt/lists/*
+```
+
+- Updates the package list for the APT package manager and then removes the cached package lists to reduce image size.
+
+#### Copy Requirements File
+
+```dockerfile
+COPY requirements.txt .
+```
+
+- Copies `requirements.txt` from the host machine to the current working directory in the container (`/app`).
+
+#### Install Python Dependencies
+
+```dockerfile
+RUN pip3 install -r requirements.txt
+```
+
+- Installs the Python dependencies listed in `requirements.txt` using `pip`.
+
+#### Copy Configuration and Application Files
+
+```dockerfile
+COPY .streamlit/config.toml .streamlit/
+COPY app.py .
+```
+
+- Copies the Streamlit configuration file and the main application file (`app.py`) into the container. Separated to support caching.
+
+#### Create Dedicated Application User and Group
+
+```dockerfile
+RUN groupadd -g 1005 appgroup && \
+    useradd -u 1005 -g appgroup appuser && \
+    chown -R appuser:appgroup /app
+```
+
+- Creates a new group `appgroup` with GID 1005.
+- Creates a new user `appuser` with UID 1005 and adds it to `appgroup`.
+- Changes the ownership of the `/app` directory to `appuser:appgroup`.
+
+#### Expose Port
+
+```dockerfile
+EXPOSE 80
+```
+
+- Informs Docker that the container will listen on port 80 at runtime.
+
+#### Switch to Non-Root User
+
+    ```dockerfile
+    USER appuser
+    ```
+    - Switches to the newly created `appuser` to run the application, enhancing security.
+
+#### Set Entry Point and Command
+
+    ```dockerfile
+    ENTRYPOINT ["streamlit", "run"]
+    CMD ["app.py"]
+    ```
+    - Sets the entry point (command that runs when a container starts) to `streamlit run`, and the default command to `app.py`, which runs the Streamlit application. This approach allows you to run the container with your custom parameters to `streamlit run`
+
+## Build the Docker Image
+
+To build the Docker image, navigate to the directory containing the Dockerfile and run the following command:
+
+```bash
+docker build -t streamlit-app .
+```
+
+The -t flag is used to tag the image. Here, we have tagged the image streamlit-app. If you run:
+
+```bash
+docker images
+```
+
+You should see a streamlit-app image under the REPOSITORY column. For example:
+
+| REPOSITORY    | TAG    | IMAGE ID     | CREATED            | SIZE  |
+| ------------- | ------ | ------------ | ------------------ | ----- |
+| streamlit-app | latest | 70b0759a094d | About a minute ago | 628MB |
+
+## Run the Docker Container
+
+To run the Docker container, use the following command:
+
+```bash
+docker run -p 8501:80 streamlit-app:latest
+```
+
+To view your app, browse to http://0.0.0.0:8501 or http://localhost:8501
+
+## Streamlit Configuration
+
+In order to provide Streamlit configuration, there are two approaches:
+
+- config.toml file ([What is TOML?](https://toml.io/))
+- command line parameters
+
+In this example it uses the config.toml and you can find more configuration options in the [documentation](https://docs.streamlit.io/develop/api-reference/configuration/config.toml). Below I will showcase an example setting the port below using both approaches.
+
+### Config.toml
+
+```toml
+[server]
+port = 80
+```
+
+### Parameters
+
+```bash
+streamlit run app.py --server.port=80
+```
+
+## References
+
+- [Deploy streamlit using Docker - Official Streamlit documentation on how to deploy using Docker.](https://docs.streamlit.io/deploy/tutorials/docker)
diff --git a/src/content/blog/azure-devops-service-connections-workload-identity-federation.mdx b/src/content/blog/azure-devops-service-connections-workload-identity-federation.mdx
new file mode 100644
index 0000000..e69de29
diff --git a/src/content/blog/azure-federated-identity-credentials-terraform-github-actions-guide.mdx b/src/content/blog/azure-federated-identity-credentials-terraform-github-actions-guide.mdx
index e3ab9ee..78e8885 100644
--- a/src/content/blog/azure-federated-identity-credentials-terraform-github-actions-guide.mdx
+++ b/src/content/blog/azure-federated-identity-credentials-terraform-github-actions-guide.mdx
@@ -10,6 +10,7 @@ tags:
   - Terraform
   - GitHub Actions
   - OIDC
+language: 'en'
 ---
 
 I recently needed to transition from authenticating via Service Principal with a client secret to using OpenID Connect for Terraform actions within a few GitHub Actions workflows. This post is to showcase what I needed to change as there was not a single source of this information to perform this update.
diff --git a/src/content/blog/pass-azure-devops-pipeline-parameters-variables-terraform.mdx b/src/content/blog/pass-azure-devops-pipeline-parameters-variables-terraform.mdx
index 5d7d71b..ffcad84 100644
--- a/src/content/blog/pass-azure-devops-pipeline-parameters-variables-terraform.mdx
+++ b/src/content/blog/pass-azure-devops-pipeline-parameters-variables-terraform.mdx
@@ -12,6 +12,7 @@ tags:
   - azuredevops
 title: >-
   Using Azure Pipeline Parameters & Variables in Terraform
+language: en
 ---
 
 import { Image } from 'astro:assets'
diff --git a/src/content/blog/platform-engineering-transition-docker-compose-to-score-specification.mdx b/src/content/blog/platform-engineering-transition-docker-compose-to-score-specification.mdx
index 4e3a5cc..be08c2a 100644
--- a/src/content/blog/platform-engineering-transition-docker-compose-to-score-specification.mdx
+++ b/src/content/blog/platform-engineering-transition-docker-compose-to-score-specification.mdx
@@ -12,6 +12,7 @@ tags:
   - dockercompose
 title: >-
   From Docker Compose to Score: A Platform Engineering Guide
+language: en
 ---
 
 Welcome! You’ve probably seen Platform Engineering everywhere, along with terms like Internal Developer Platform (IDP), Internal Developer Portal, and the shift towards graph-based backends instead of traditional pipelines. It feels like discovering design patterns for the first time or hearing about a new frontend framework—you’re eager to dive in. But where should you begin?
diff --git a/src/content/blog/streamlit-deployment-guide-part-1-containerization.mdx b/src/content/blog/streamlit-deployment-guide-part-1-containerization.mdx
index bb91e99..f1c76b1 100644
--- a/src/content/blog/streamlit-deployment-guide-part-1-containerization.mdx
+++ b/src/content/blog/streamlit-deployment-guide-part-1-containerization.mdx
@@ -8,6 +8,7 @@ tags:
   - streamlit
   - containers
 title: 'Streamlit Deployment Guide Part 1: Containerization'
+language: 'en'
 ---
 
 When I needed to create a quick proof of concept (PoC) using [Streamlit](https://streamlit.io/), I faced two constraints:
@@ -22,7 +23,7 @@ With this in mind, containerizing the application and hosting it on Azure was th
 - **Part 3**: Azure Infrastructure via Terraform
 - **Part 4**: GitHub Workflow for Terraform Apply & Destroy
 
-Do you want to deploy your Streamlit application on Azure right now? Use the [template repository](https://github.com/WayneGoosen/azure-streamlit-poc) 🚀
+Do you want to deploy your Streamlit application on Azure right now? Use the [template repository](https://github.com/WayneGoosen/azure-streamlit-poc) �
 
 ## TL;DR
 
@@ -60,8 +61,8 @@ gatherUsageStats = false
 import os
 import streamlit as st
 
-st.title("Streamlit on Azure 👋")
-st.header('Running on a Web App in a Container 🐳', divider='rainbow')
+st.title("Streamlit on Azure �")
+st.header('Running on a Web App in a Container �', divider='rainbow')
 ```
 
 ### requirements.txt
diff --git a/src/content/blog/streamlit-deployment-guide-part-2-gitHub-workflow.mdx b/src/content/blog/streamlit-deployment-guide-part-2-gitHub-workflow.mdx
index 18e05ec..1613b72 100644
--- a/src/content/blog/streamlit-deployment-guide-part-2-gitHub-workflow.mdx
+++ b/src/content/blog/streamlit-deployment-guide-part-2-gitHub-workflow.mdx
@@ -10,6 +10,7 @@ tags:
   - docker
 title: >-
   Streamlit Deployment Guide Part 2: GitHub Actions & ghcr.io
+language: en
 ---
 
 This showcases a GitHub Workflow walkthrough of building and publishing a Docker image to GitHub Container Registry. It continues a series detailing the process of deploying Streamlit app to Azure, broken down into the following parts:
@@ -19,7 +20,7 @@ This showcases a GitHub Workflow walkthrough of building and publishing a Docker
 - **Part 3**: Azure Infrastructure via Terraform
 - **Part 4**: GitHub Workflow for Terraform Apply & Destroy
 
-Do you want to deploy your Streamlit application on Azure right now? Use the [template repository](https://github.com/WayneGoosen/azure-streamlit-poc) 🚀
+Do you want to deploy your Streamlit application on Azure right now? Use the [template repository](https://github.com/WayneGoosen/azure-streamlit-poc) �
 
 ## TL;DR
 
diff --git a/src/content/blog/streamlit-deployment-guide-part-3-azure-infra.mdx b/src/content/blog/streamlit-deployment-guide-part-3-azure-infra.mdx
index edb25a3..46630ca 100644
--- a/src/content/blog/streamlit-deployment-guide-part-3-azure-infra.mdx
+++ b/src/content/blog/streamlit-deployment-guide-part-3-azure-infra.mdx
@@ -11,6 +11,7 @@ tags:
   - iac
 title: >-
   Streamlit Deployment Guide Part 3: Azure IaC with Terraform
+language: en
 ---
 
 import { Image } from 'astro:assets'
@@ -23,7 +24,7 @@ This showcases the Terraform code to manage the Infrastructure to host your Stre
 - **Part 3**: Azure Infrastructure via Terraform **You are here** 😊
 - **Part 4**: GitHub Workflow for Terraform Apply & Destroy
 
-Do you want to deploy your Streamlit application on Azure right now? Use the [template repository](https://github.com/WayneGoosen/azure-streamlit-poc) 🚀
+Do you want to deploy your Streamlit application on Azure right now? Use the [template repository](https://github.com/WayneGoosen/azure-streamlit-poc) �
 
 ## TL;DR
 
diff --git a/src/content/blog/streamlit-deployment-guide-part-4-github-tf-workflow.mdx b/src/content/blog/streamlit-deployment-guide-part-4-github-tf-workflow.mdx
index 0eb5ded..41a496a 100644
--- a/src/content/blog/streamlit-deployment-guide-part-4-github-tf-workflow.mdx
+++ b/src/content/blog/streamlit-deployment-guide-part-4-github-tf-workflow.mdx
@@ -12,6 +12,7 @@ tags:
   - github
 title: >-
   Streamlit Deployment Guide Part 4: Terraform Apply & Destroy
+language: en
 ---
 
 This post showcases a GitHub Workflow walkthrough for executing the necessary Terraform commands to provision and tear down Azure resources for the Streamlit application. It continues a series detailing the process of deploying a Streamlit app to Azure, broken down into the following parts:
@@ -21,7 +22,7 @@ This post showcases a GitHub Workflow walkthrough for executing the necessary Te
 - [**Part 3**: Azure Infrastructure via Terraform](https://waynegoosen.com/post/streamlit-deployment-guide-part-3-azure-infra/)
 - **Part 4**: GitHub Workflow for Terraform Apply & Destroy **You are here** 😊
 
-Do you want to deploy your Streamlit application on Azure right now? Use the [template repository](https://github.com/WayneGoosen/azure-streamlit-poc) 🚀
+Do you want to deploy your Streamlit application on Azure right now? Use the [template repository](https://github.com/WayneGoosen/azure-streamlit-poc) �
 
 ## TL;DR
 
diff --git a/src/content/config.ts b/src/content/config.ts
index 5dcb3a0..9fc0bdc 100644
--- a/src/content/config.ts
+++ b/src/content/config.ts
@@ -15,7 +15,8 @@ const blog = defineCollection({
 			heroImage: image(),
 			category: z.enum(CATEGORIES),
 			tags: z.array(z.string()),
-			draft: z.boolean().default(false)
+			draft: z.boolean().default(false),
+			language: z.string().default('en') // P3a68
 		})
 })
 
diff --git a/src/data/site.config.ts b/src/data/site.config.ts
index 75cbd03..fe7c407 100644
--- a/src/data/site.config.ts
+++ b/src/data/site.config.ts
@@ -6,6 +6,8 @@ interface SiteConfig {
 	ogLocale: string
 	shareMessage: string
 	paginationSize: number
+	languages: string[]
+	defaultLanguage: string
 }
 
 export const siteConfig: SiteConfig = {
@@ -15,5 +17,7 @@ export const siteConfig: SiteConfig = {
 	lang: 'en-GB',
 	ogLocale: 'en_GB',
 	shareMessage: 'Share this post', // Message to share a post on social media
-	paginationSize: 6 // Number of posts per page
+	paginationSize: 6, // Number of posts per page
+	languages: ['en', 'es'], // Supported languages
+	defaultLanguage: 'en' // Default language
 }
diff --git a/src/pages/about/index.astro b/src/pages/about/index.astro
index d36de90..a048941 100644
--- a/src/pages/about/index.astro
+++ b/src/pages/about/index.astro
@@ -4,13 +4,47 @@ import TitlePage from '@/components/TitlePage'
 import { Image } from 'astro:assets'
 import aboutBannerImage from '../../assets/images/letsshipmorebanner.png'
 import profilePicture from '../../assets/images/pp-with-color.png'
+import { siteConfig } from '@/data/site.config'
+
+// Get the selected language from the URL
+const url = new URL(Astro.url.href)
+const selectedLanguage = url.pathname.split('/')[1] || siteConfig.defaultLanguage
+
+// Language-specific content
+const content = {
+	en: {
+		title: 'About',
+		description:
+			'Brief intro of Wayne Goosen, author of this blog. Explore my passion for software/DevOps and how I aim to inform through personal insights and experiences.',
+		intro: "Howzit, I'm Wayne! 👋",
+		points: [
+			'🔭 Software and DevOps Engineer',
+			'🏠 I live in Switzerland🇨🇭, but I am proudly South African!🇿🇦',
+			"🌱 I'm currently learning about any technologies/methodologies on how to ship more",
+			'🚢 As every developer, the idea book is packed, aiming to ship at least one project a month. Follow to keep up to date 🙌',
+			'👨‍💻 Sharing my knowledge on my blog',
+			'🤖 Diving into Generative AI... Not sure this needs to be a disclaimer but I am using GitHub Copilot with my projects 🚀'
+		]
+	},
+	es: {
+		title: 'Acerca de',
+		description:
+			'Breve introducción de Wayne Goosen, autor de este blog. Explora mi pasión por el software/DevOps y cómo pretendo informar a través de experiencias e ideas personales.',
+		intro: '¡Hola, soy Wayne! 👋',
+		points: [
+			'🔭 Ingeniero de Software y DevOps',
+			'🏠 Vivo en Suiza🇨🇭, ¡pero estoy orgullosamente sudafricano!🇿🇦',
+			'Estoy aprendiendo sobre cualquier tecnología/metodología sobre cómo enviar más',
+			'🚢 Como todo desarrollador, el libro de ideas está lleno, con el objetivo de enviar al menos un proyecto al mes. Sigue para mantenerte al día 🙌',
+			'👨‍💻 Compartiendo mi conocimiento en mi blog',
+			'🤖 Sumergiéndome en la IA generativa... No estoy seguro de que esto necesite ser un descargo de responsabilidad, pero estoy usando GitHub Copilot con mis proyectos 🚀'
+		]
+	}
+}[selectedLanguage]
 ---
 
-<BaseLayout
-	title='About'
-	description='Brief intro of Wayne Goosen, author of this blog. Explore my passion for software/DevOps and how I aim to inform through personal insights and experiences.'
->
-	<TitlePage title='About' />
+<BaseLayout title={content?.title} description={content?.description}>
+	<TitlePage title={content?.title} />
 	<div class='relative'>
 		<Image src={aboutBannerImage} alt="Let's ship more banner." class='w-full' />
 		<Image
@@ -22,19 +56,8 @@ import profilePicture from '../../assets/images/pp-with-color.png'
 		/>
 	</div>
 
-	<h2 class='text-3xl mt-20 font-bold first-letter:uppercase'>Howzit, I'm Wayne! 👋</h2>
+	<h2 class='text-3xl mt-20 font-bold first-letter:uppercase'>{content?.intro}</h2>
 	<ul>
-		<li>🔭 Software and DevOps Engineer</li>
-		<li>🏠 I live in Switzerland🇨🇭, but I am proudly South African!🇿🇦</li>
-		<li>🌱 I'm currently learning about any technologies/methodologies on how to ship more</li>
-		<li>
-			🚢 As every developer, the idea book is packed, aiming to ship at least one project a month.
-			Follow to keep up to date 🙌
-		</li>
-		<li>👨‍💻 Sharing my knowledge on my blog</li>
-		<li>
-			🤖 Diving into Generative AI... Not sure this needs to be a disclaimer but I am using GitHub
-			Copilot with my projects 🚀
-		</li>
+		{content?.points.map((point) => <li>{point}</li>)}
 	</ul>
 </BaseLayout>
diff --git a/src/pages/category/[category]/[page].astro b/src/pages/category/[category]/[page].astro
index af6ce24..68d4fec 100644
--- a/src/pages/category/[category]/[page].astro
+++ b/src/pages/category/[category]/[page].astro
@@ -30,6 +30,13 @@ const { page } = Astro.props
 
 const unsluglifyNameCategory = unsluglify(params.category!.toLowerCase())
 const posts = page.data
+
+// Get the selected language from the URL
+const url = new URL(Astro.url.href)
+const selectedLanguage = url.pathname.split('/')[1] || siteConfig.defaultLanguage
+
+// Filter posts by the selected language
+const filteredPosts = posts.filter(post => post.data.language === selectedLanguage)
 ---
 
 <BaseLayout
@@ -39,6 +46,6 @@ const posts = page.data
 >
 	<TitlePage title={unsluglifyNameCategory} />
 	<ListCategories activeCategory={params.category} />
-	<ListPosts posts={posts} />
+	<ListPosts posts={filteredPosts} />
 	<Pagination page={page} />
 </BaseLayout>
diff --git a/src/pages/de/index.astro b/src/pages/de/index.astro
new file mode 100644
index 0000000..fcfa4a2
--- /dev/null
+++ b/src/pages/de/index.astro
@@ -0,0 +1,49 @@
+---
+import ListCategories from '@/components/ListCategories'
+import ListPosts from '@/components/ListPosts'
+import TitlePage from '@/components/TitlePage'
+import BaseLayout from '@/layouts/BaseLayout'
+import { getPosts } from '@/utils'
+import { siteConfig } from '@/data/site.config'
+
+const MAX_POSTS = 5 // max number of posts to show on the home page
+const posts = await getPosts(MAX_POSTS)
+
+// Get the selected language from the URL
+const url = new URL(Astro.url.href)
+const selectedLanguage = url.pathname.split('/')[1] || siteConfig.defaultLanguage
+
+// Filter posts by the selected language
+const filteredPosts = posts.filter((post) => post.data.language === selectedLanguage)
+---
+
+<BaseLayout
+	title='Platform Engineering & DevOps: Tips, Tools, & Best Practices'
+	description='Who is Wayne Goosen? He is a Software and DevOps Engineer with over a decade of IT experience, ready to help you ship faster and more efficiently.'
+>
+	<TitlePage title='Wayne Goosen' />
+	<ListCategories />
+
+	<div>
+		<h2 class='text-lg font-medium tracking-wide text-end'>Latest Posts</h2>
+		<ListPosts FirstBig={true} posts={filteredPosts} />
+	</div>
+</BaseLayout>
+
+<script>
+	import { animate } from 'motion'
+	const showAnimations = localStorage.getItem('animations') === 'true'
+
+	if (showAnimations) {
+		animate(
+			'.title',
+			{ y: [80, 0], opacity: [0, 1] },
+			{
+				duration: 2.5,
+				opacity: { duration: 3 },
+
+				offset: [0, 0.55, 0.75]
+			}
+		)
+	}
+</script>
diff --git a/src/pages/index.astro b/src/pages/index.astro
index 6c0b1dd..9ea6024 100644
--- a/src/pages/index.astro
+++ b/src/pages/index.astro
@@ -4,9 +4,17 @@ import ListPosts from '@/components/ListPosts'
 import TitlePage from '@/components/TitlePage'
 import BaseLayout from '@/layouts/BaseLayout'
 import { getPosts } from '@/utils'
+import { siteConfig } from '@/data/site.config'
 
 const MAX_POSTS = 5 // max number of posts to show on the home page
 const posts = await getPosts(MAX_POSTS)
+
+// Get the selected language from the URL
+const url = new URL(Astro.url.href)
+const selectedLanguage = url.pathname.split('/')[1] || siteConfig.defaultLanguage
+
+// Filter posts by the selected language
+const filteredPosts = posts.filter(post => post.data.language === selectedLanguage)
 ---
 
 <BaseLayout
@@ -18,7 +26,7 @@ const posts = await getPosts(MAX_POSTS)
 
 	<div>
 		<h2 class='text-lg font-medium tracking-wide text-end'>Latest Posts</h2>
-		<ListPosts FirstBig={true} posts={posts} />
+		<ListPosts FirstBig={true} posts={filteredPosts} />
 	</div>
 </BaseLayout>
 
diff --git a/src/pages/post/[...slug].astro b/src/pages/post/[...slug].astro
index 08aefc8..bbc1ec4 100644
--- a/src/pages/post/[...slug].astro
+++ b/src/pages/post/[...slug].astro
@@ -9,6 +9,7 @@ import { getPosts } from '@/utils'
 import SButton from '@/components/mdx/SButton'
 import Disqus from '@/components/Disqus'
 import { disqusConfig } from '@/data/disqus.config'
+import { siteConfig } from '@/data/site.config'
 
 const posts = await getCollection('blog')
 export async function getStaticPaths() {
@@ -36,6 +37,13 @@ const relatedPosts = getRelatedPosts(post)
 const { Content, headings, remarkPluginFrontmatter } = await post.render()
 
 const disqusEnabled = disqusConfig.enabled
+
+// Get the selected language from the URL
+const url = new URL(Astro.url.href)
+const selectedLanguage = url.pathname.split('/')[1] || siteConfig.defaultLanguage
+
+// Filter related posts by the selected language
+const filteredRelatedPosts = relatedPosts.filter(p => p.data.language === selectedLanguage)
 ---
 
 <BlogPost
@@ -62,7 +70,7 @@ const disqusEnabled = disqusConfig.enabled
 			<!-- related posts -->
 			<footer>
 				<h2 class='font-bold text-lg dark:text-white mb-6'>Related Posts</h2>
-				<ListRelatedPosts posts={relatedPosts} />
+				<ListRelatedPosts posts={filteredRelatedPosts} />
 			</footer>
 		</article>
 	</div>
diff --git a/src/pages/tags/[...tag]/index.astro b/src/pages/tags/[...tag]/index.astro
index 6452568..63945f6 100644
--- a/src/pages/tags/[...tag]/index.astro
+++ b/src/pages/tags/[...tag]/index.astro
@@ -3,6 +3,7 @@ import BaseLayout from '@/layouts/BaseLayout'
 import ListPosts from '@/components/ListPosts'
 import TitlePage from '@/components/TitlePage'
 import { getTags, getPostByTag } from '@/utils'
+import { siteConfig } from '@/data/site.config'
 
 export async function getStaticPaths() {
 	const tags = await getTags()
@@ -16,6 +17,13 @@ export async function getStaticPaths() {
 const { tag } = Astro.props
 
 const posts = await getPostByTag(tag)
+
+// Get the selected language from the URL
+const url = new URL(Astro.url.href)
+const selectedLanguage = url.pathname.split('/')[1] || siteConfig.defaultLanguage
+
+// Filter posts by the selected language
+const filteredPosts = posts.filter(post => post.data.language === selectedLanguage)
 ---
 
 <BaseLayout
@@ -24,5 +32,5 @@ const posts = await getPostByTag(tag)
 	isNoIndex={true}
 >
 	<TitlePage title={tag} />
-	<ListPosts posts={posts} />
+	<ListPosts posts={filteredPosts} />
 </BaseLayout>
diff --git a/src/pages/tags/index.astro b/src/pages/tags/index.astro
index 267d73c..1f09ea0 100644
--- a/src/pages/tags/index.astro
+++ b/src/pages/tags/index.astro
@@ -2,7 +2,16 @@
 import BaseLayout from '@/layouts/BaseLayout'
 import TitlePage from '@/components/TitlePage'
 import { getTags } from '@/utils'
+import { siteConfig } from '@/data/site.config'
+
 const tags = await getTags()
+
+// Get the selected language from the URL
+const url = new URL(Astro.url.href)
+const selectedLanguage = url.pathname.split('/')[1] || siteConfig.defaultLanguage
+
+// Filter tags by the selected language
+const filteredTags = tags.filter(tag => tag.language === selectedLanguage)
 ---
 
 <BaseLayout
@@ -13,7 +22,7 @@ const tags = await getTags()
 	<TitlePage title='Tags' />
 	<div class='flex justify-center flex-wrap gap-4'>
 		{
-			tags.map((tag) => (
+			filteredTags.map((tag) => (
 				<a
 					href={`/tags/${tag}`}
 					class='inline-block bg-gray-200  rounded-full px-3 py-1 text-sm font-semibold text-gray-700 mr-2 mb-2'