diff --git a/src/assets/data/team.json b/src/assets/data/team.json
new file mode 100644
index 0000000..d37813f
--- /dev/null
+++ b/src/assets/data/team.json
@@ -0,0 +1,70 @@
+[
+  {
+    "img": "/src/assets/img/team/Benjamin Frost.webp",
+    "name": "Benjamin Frost",
+    "lastRole": "Jury",
+    "hasMultipleRoles": true
+  },
+  {
+    "img": "/src/assets/img/team/Jonas Wanke.webp",
+    "name": "Jonas Wanke",
+    "lastRole": "Expert",
+    "skill": "Skill 08",
+    "hasMultipleRoles": true
+  },
+  {
+    "img": "/src/assets/img/team/Dr. Olaf Kappler.webp",
+    "name": "Dr. Olaf Kappler",
+    "lastRole": "Expert",
+    "skill": "Skill 09"
+  },
+  {
+    "img": "/src/assets/img/team/Doreen Kappler.webp",
+    "name": "Doreen Kappler",
+    "lastRole": "Good Fairy"
+  },
+  {
+    "img": "/src/assets/img/team/Glenn Skrzypczak.webp",
+    "name": "Glenn Skrzypczak",
+    "lastRole": "Expert",
+    "skill": "Skill 17",
+    "hasMultipleRoles": true
+  },
+  {
+    "img": "/src/assets/img/team/Elisa Boose.webp",
+    "name": "Elisa Boose",
+    "lastRole": "Trainer"
+  },
+  {
+    "img": "/src/assets/img/team/Michael Boose.webp",
+    "name": "Michael Boose",
+    "lastRole": "Trainer"
+  },
+  {
+    "img": "/src/assets/img/team/Joachim Schiller.webp",
+    "name": "Joachim Schiller",
+    "lastRole": "Jury",
+    "hasMultipleRoles": true
+  },
+  {
+    "img": "/src/assets/img/team/Justin Konratt.webp",
+    "name": "Justin Konratt",
+    "lastRole": "Jury",
+    "hasMultipleRoles": true
+  },
+  {
+    "img": "/src/assets/img/team/Kai Redmann.webp",
+    "name": "Kai Redmann",
+    "lastRole": "Workshop Manager"
+  },
+  {
+    "img": "/src/assets/img/team/Lukas Fischer.webp",
+    "name": "Lukas Fischer",
+    "lastRole": "Workshop Manager"
+  },
+  {
+    "img": "/src/assets/img/team/Thomas Steinfeld.webp",
+    "name": "Thomas Steinfeld",
+    "lastRole": "Mr. Speed Programming"
+  }
+]
diff --git a/src/assets/img/team.webp b/src/assets/img/team.webp
new file mode 100644
index 0000000..06c68b9
Binary files /dev/null and b/src/assets/img/team.webp differ
diff --git a/public/imgs/team/Benjamin Frost.webp b/src/assets/img/team/Benjamin Frost.webp
similarity index 100%
rename from public/imgs/team/Benjamin Frost.webp
rename to src/assets/img/team/Benjamin Frost.webp
diff --git a/public/imgs/team/Doreen Kappler.webp b/src/assets/img/team/Doreen Kappler.webp
similarity index 100%
rename from public/imgs/team/Doreen Kappler.webp
rename to src/assets/img/team/Doreen Kappler.webp
diff --git a/public/imgs/team/Dr. Olaf Kappler.webp b/src/assets/img/team/Dr. Olaf Kappler.webp
similarity index 100%
rename from public/imgs/team/Dr. Olaf Kappler.webp
rename to src/assets/img/team/Dr. Olaf Kappler.webp
diff --git a/public/imgs/team/Elisa Boose.webp b/src/assets/img/team/Elisa Boose.webp
similarity index 100%
rename from public/imgs/team/Elisa Boose.webp
rename to src/assets/img/team/Elisa Boose.webp
diff --git a/public/imgs/team/Glenn Skrzypczak.webp b/src/assets/img/team/Glenn Skrzypczak.webp
similarity index 100%
rename from public/imgs/team/Glenn Skrzypczak.webp
rename to src/assets/img/team/Glenn Skrzypczak.webp
diff --git a/public/imgs/team/Joachim Schiller.webp b/src/assets/img/team/Joachim Schiller.webp
similarity index 100%
rename from public/imgs/team/Joachim Schiller.webp
rename to src/assets/img/team/Joachim Schiller.webp
diff --git a/public/imgs/team/Jonas Wanke.webp b/src/assets/img/team/Jonas Wanke.webp
similarity index 100%
rename from public/imgs/team/Jonas Wanke.webp
rename to src/assets/img/team/Jonas Wanke.webp
diff --git a/public/imgs/team/Justin Konratt.webp b/src/assets/img/team/Justin Konratt.webp
similarity index 100%
rename from public/imgs/team/Justin Konratt.webp
rename to src/assets/img/team/Justin Konratt.webp
diff --git a/public/imgs/team/Kai Redmann.webp b/src/assets/img/team/Kai Redmann.webp
similarity index 100%
rename from public/imgs/team/Kai Redmann.webp
rename to src/assets/img/team/Kai Redmann.webp
diff --git a/public/imgs/team/Lukas Fischer.webp b/src/assets/img/team/Lukas Fischer.webp
similarity index 100%
rename from public/imgs/team/Lukas Fischer.webp
rename to src/assets/img/team/Lukas Fischer.webp
diff --git a/public/imgs/team/Michael Boose.webp b/src/assets/img/team/Michael Boose.webp
similarity index 100%
rename from public/imgs/team/Michael Boose.webp
rename to src/assets/img/team/Michael Boose.webp
diff --git a/public/imgs/team/Thomas Steinfeld.webp b/src/assets/img/team/Thomas Steinfeld.webp
similarity index 100%
rename from public/imgs/team/Thomas Steinfeld.webp
rename to src/assets/img/team/Thomas Steinfeld.webp
diff --git a/src/components/Header.astro b/src/components/Header.astro
index 47ec657..4be77ca 100644
--- a/src/components/Header.astro
+++ b/src/components/Header.astro
@@ -24,11 +24,22 @@ const skills = [
   {
     name: t({
       de: "Web-Entwicklung",
-      en: "Web Technologies"
+      en: "Web Technologies",
     }),
     href: getRelativeLocaleUrl(lang, "web-technologies"),
   },
 ];
+
+const navigationItems = [
+  {
+    translation: { de: "Startseite", en: "Home" },
+    link: getRelativeLocaleUrl(lang, "/"),
+  },
+  {
+    translation: { de: "Unser Team", en: "Our Team" },
+    link: getRelativeLocaleUrl(lang, "/our-team"),
+  },
+];
 ---
 
 <header class="bg-wsg-orange-500 shadow">
@@ -46,13 +57,12 @@ const skills = [
         </a>
         <div class="ml-10 hidden space-x-8 lg:block">
           <a
-            href={getRelativeLocaleUrl(lang)}
+            href={getRelativeLocaleUrl(lang, "/")}
             class="text-base font-medium text-white hover:text-gray-100"
           >
             {t({ de: "Startseite", en: "Home" })}
           </a>
         </div>
-
         <div class="ml-10 hidden lg:block">
           <SkillsDropdown
             client:load
@@ -60,6 +70,14 @@ const skills = [
             skills={skills}
           />
         </div>
+        <div class="ml-10 hidden space-x-8 lg:block">
+          <a
+            href={getRelativeLocaleUrl(lang, "/our-team")}
+            class="text-base font-medium text-white hover:text-gray-100"
+          >
+            {t({ de: "Unser Team", en: "Our Team" })}
+          </a>
+        </div>
       </div>
       <LanguageDropdown
         client:load
diff --git a/src/components/Hero.astro b/src/components/Hero.astro
index 352425b..7bc221c 100644
--- a/src/components/Hero.astro
+++ b/src/components/Hero.astro
@@ -6,7 +6,7 @@ import HeroBgImage from "~/assets/img/hero-bg.jpg";
 
 interface Props {
   title: string;
-  subtitle: string;
+  subtitle?: string;
   img?: ImageMetadata;
   size?: "md" | "lg";
 }
@@ -27,7 +27,7 @@ const { title, subtitle, img = HeroBgImage, size = "lg" } = Astro.props;
     class={clsx(
       "relative mx-auto max-w-7xl px-4 text-center sm:px-6 lg:px-8",
       { "py-8 sm:py-16 md:py-32": size === "md" },
-      { "py-16 sm:py-32 md:py-64": size === "lg" },
+      { "py-16 sm:py-32 md:py-64": size === "lg" }
     )}
   >
     <h1
diff --git a/src/components/team/Person.astro b/src/components/team/Person.astro
index d35d9ca..b8a417e 100644
--- a/src/components/team/Person.astro
+++ b/src/components/team/Person.astro
@@ -1,24 +1,32 @@
 ---
-import { TeamMember } from "../../utils/async_helper";
-import type { PropsOf } from "../../utils/types";
-import SocialMediaList from "../social_media/SocialMediaList.astro";
+import { getLangFromUrl, useTranslations } from "~/i18n/utils";
+import { type TeamMember } from "../../utils/async_helper";
 import { PersonImage } from "./PersonImage";
 
-type Props = TeamMember;
+interface Props {
+  name: string;
+  lastRole: string;
+  img?: string;
+  skill?: string;
+  hasMultipleRoles?: boolean;
+}
 
-const { name, img, lastRole, skill, hasMultipleRoles } = Astro.props;
+const { name, img, lastRole, skill, hasMultipleRoles = false } = Astro.props;
+
+const lang = getLangFromUrl(Astro.url);
+const t = useTranslations(lang);
 ---
 
 <div class="space-y-6">
   <PersonImage img={img} />
-  <div class="text-center text-md font-light">
-    <h3 class="text-lg font-medium mb-1">{name}</h3>
+  <div class="text-md text-center font-light">
+    <h3 class="mb-1 text-lg font-medium">{name}</h3>
     <div>
       <p class="inline-block">
         {lastRole}
       </p>
       <p class="inline-block">
-        {hasMultipleRoles && t("team.more")}
+        {hasMultipleRoles && t({ de: "und mehr", en: "and more" })}
       </p>
     </div>
     <p>
diff --git a/src/components/team/PersonImage.tsx b/src/components/team/PersonImage.tsx
index 5dac0de..642c4a7 100644
--- a/src/components/team/PersonImage.tsx
+++ b/src/components/team/PersonImage.tsx
@@ -6,7 +6,7 @@ export const PersonImage = ({ img }: PersonImageProps) => {
   const padding = !img ? "p-5" : "";
   return (
     <img
-      className={`mx-auto h-40 w-40 rounded-full shadow-lg xl:h-56 xl:w-56 object-cover ${padding}`}
+      className={`mx-auto h-40 w-40 rounded-full object-cover shadow-lg xl:h-56 xl:w-56 ${padding}`}
       src={img ?? "/imgs/wsg/wsg_hands.svg"}
       alt=""
     />
diff --git a/src/components/team/Team.astro b/src/components/team/Team.astro
index 868f34e..1a29970 100644
--- a/src/components/team/Team.astro
+++ b/src/components/team/Team.astro
@@ -1,13 +1,11 @@
 ---
-import { load_team } from "../../utils/async_helper";
 import Person from "./Person.astro";
-
-const team = await load_team();
+import team from "~/assets/data/team.json";
 ---
 
 <div class="bg-white py-16">
   <div
-    class="grid grid-cols-2 md:grid-cols-3 lg:grid-cols-4 gap-y-16 mx-8 md:mx-24 mx-32"
+    class="mx-8 grid grid-cols-2 gap-y-16 md:mx-24 md:grid-cols-3 lg:grid-cols-4"
   >
     {
       team
diff --git a/src/pages/[lang]/our-team.astro b/src/pages/[lang]/our-team.astro
index 319fe0b..1cccc77 100644
--- a/src/pages/[lang]/our-team.astro
+++ b/src/pages/[lang]/our-team.astro
@@ -1,18 +1,17 @@
 ---
+import { getLangFromUrl, localeParams, useTranslations } from "~/i18n/utils";
 import Hero from "../../components/Hero.astro";
 import TeamPage from "../../components/team/Team.astro";
 import Layout from "../../layouts/Layout.astro";
-import { getStaticLangPaths, updateLang } from "../../routing/lang";
-import { t } from "i18next";
+import TeamImage from "~/assets/img/team.webp";
 
-export const getStaticPaths = getStaticLangPaths;
-updateLang(Astro.url.pathname);
+export const getStaticPaths = localeParams;
+
+const lang = getLangFromUrl(Astro.url);
+const t = useTranslations(lang);
 ---
 
-<Layout title={t("team.title")}>
-  <Hero
-    title={t("team.title")}
-    img="https:////live.staticflickr.com/65535/52434467221_676ae1bf70_h.jpg"
-  />
+<Layout title={t({ de: "Unser Team", en: "Our Team" })}>
+  <Hero title={t({ de: "Unser Team", en: "Our Team" })} img={TeamImage} />
   <TeamPage />
 </Layout>