diff --git a/src/assets/data/team.json b/src/assets/data/team.json
new file mode 100644
index 0000000..e00e476
--- /dev/null
+++ b/src/assets/data/team.json
@@ -0,0 +1,79 @@
+[
+  {
+    "img": "/src/assets/img/team/benjamin-frost.webp",
+    "name": "Benjamin Frost",
+    "lastRole": { "de": "Jury", "en": "Jury" },
+    "hasMultipleRoles": true
+  },
+  {
+    "img": "/src/assets/img/team/jonas-wanke.webp",
+    "name": "Jonas Wanke",
+    "lastRole": { "en": "Expert", "de": "Bundestrainer" },
+    "skill": {
+      "de": "App-Entwicklung",
+      "en": "Mobile Applications Development"
+    },
+    "hasMultipleRoles": true
+  },
+  {
+    "img": "/src/assets/img/team/olaf-kappler.webp",
+    "name": "Dr. Olaf Kappler",
+    "lastRole": { "en": "Expert", "de": "Bundestrainer" },
+    "skill": {
+      "de": "Software-Entwicklung",
+      "en": "Software Applications Development"
+    }
+  },
+  {
+    "img": "/src/assets/img/team/doreen-kappler.webp",
+    "name": "Doreen Kappler",
+    "lastRole": { "de": "Good Fairy", "en": "Good Fairy" }
+  },
+  {
+    "img": "/src/assets/img/team/glenn-skrzypczak.webp",
+    "name": "Glenn Skrzypczak",
+    "lastRole": { "en": "Expert", "de": "Bundestrainer" },
+    "skill": {
+      "de": "Web-Entwicklung",
+      "en": "Web Technologies"
+    },
+    "hasMultipleRoles": true
+  },
+  {
+    "img": "/src/assets/img/team/elisa-boose.webp",
+    "name": "Elisa Boose",
+    "lastRole": { "en": "Trainer", "de": "Trainer" }
+  },
+  {
+    "img": "/src/assets/img/team/michael-boose.webp",
+    "name": "Michael Boose",
+    "lastRole": { "en": "Trainer", "de": "Trainer" }
+  },
+  {
+    "img": "/src/assets/img/team/joachim-schiller.webp",
+    "name": "Joachim Schiller",
+    "lastRole": { "de": "Jury", "en": "Jury" },
+    "hasMultipleRoles": true
+  },
+  {
+    "img": "/src/assets/img/team/justin-konratt.webp",
+    "name": "Justin Konratt",
+    "lastRole": { "de": "Jury", "en": "Jury" },
+    "hasMultipleRoles": true
+  },
+  {
+    "img": "/src/assets/img/team/kai-redmann.webp",
+    "name": "Kai Redmann",
+    "lastRole": { "en": "Workshop-Manager", "de": "Workshop Manager" }
+  },
+  {
+    "img": "/src/assets/img/team/lukas-fischer.webp",
+    "name": "Lukas Fischer",
+    "lastRole": { "en": "Workshop-Manager", "de": "Workshop Manager" }
+  },
+  {
+    "img": "/src/assets/img/team/thomas-steinfeld.webp",
+    "name": "Thomas Steinfeld",
+    "lastRole": { "en": "Mr. Speed Programming", "de": "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/src/assets/img/team/benjamin-frost.webp b/src/assets/img/team/benjamin-frost.webp
new file mode 100644
index 0000000..3b893d0
Binary files /dev/null and b/src/assets/img/team/benjamin-frost.webp differ
diff --git a/src/assets/img/team/doreen-kappler.webp b/src/assets/img/team/doreen-kappler.webp
new file mode 100644
index 0000000..367ad76
Binary files /dev/null and b/src/assets/img/team/doreen-kappler.webp differ
diff --git a/src/assets/img/team/elisa-boose.webp b/src/assets/img/team/elisa-boose.webp
new file mode 100644
index 0000000..56e8c57
Binary files /dev/null and b/src/assets/img/team/elisa-boose.webp differ
diff --git a/src/assets/img/team/glenn-skrzypczak.webp b/src/assets/img/team/glenn-skrzypczak.webp
new file mode 100644
index 0000000..781d312
Binary files /dev/null and b/src/assets/img/team/glenn-skrzypczak.webp differ
diff --git a/src/assets/img/team/joachim-schiller.webp b/src/assets/img/team/joachim-schiller.webp
new file mode 100644
index 0000000..08cfc01
Binary files /dev/null and b/src/assets/img/team/joachim-schiller.webp differ
diff --git a/src/assets/img/team/jonas-wanke.webp b/src/assets/img/team/jonas-wanke.webp
new file mode 100644
index 0000000..4e6f63c
Binary files /dev/null and b/src/assets/img/team/jonas-wanke.webp differ
diff --git a/src/assets/img/team/justin-konratt.webp b/src/assets/img/team/justin-konratt.webp
new file mode 100644
index 0000000..3abb48f
Binary files /dev/null and b/src/assets/img/team/justin-konratt.webp differ
diff --git a/src/assets/img/team/kai-redmann.webp b/src/assets/img/team/kai-redmann.webp
new file mode 100644
index 0000000..bd06396
Binary files /dev/null and b/src/assets/img/team/kai-redmann.webp differ
diff --git a/src/assets/img/team/lukas-fischer.webp b/src/assets/img/team/lukas-fischer.webp
new file mode 100644
index 0000000..c3f5172
Binary files /dev/null and b/src/assets/img/team/lukas-fischer.webp differ
diff --git a/src/assets/img/team/michael-boose.webp b/src/assets/img/team/michael-boose.webp
new file mode 100644
index 0000000..7c7a4a0
Binary files /dev/null and b/src/assets/img/team/michael-boose.webp differ
diff --git a/src/assets/img/team/olaf-kappler.webp b/src/assets/img/team/olaf-kappler.webp
new file mode 100644
index 0000000..d95a7ca
Binary files /dev/null and b/src/assets/img/team/olaf-kappler.webp differ
diff --git a/src/assets/img/team/thomas-steinfeld.webp b/src/assets/img/team/thomas-steinfeld.webp
new file mode 100644
index 0000000..ea24f2f
Binary files /dev/null and b/src/assets/img/team/thomas-steinfeld.webp differ
diff --git a/src/components/Header.astro b/src/components/Header.astro
index 817226e..3377fd3 100644
--- a/src/components/Header.astro
+++ b/src/components/Header.astro
@@ -46,13 +46,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 +59,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 f008706..cc3a3c1 100644
--- a/src/components/team/Person.astro
+++ b/src/components/team/Person.astro
@@ -1,27 +1,42 @@
 ---
-import type { ComponentProps } from "astro/types";
-import SocialMediaList from "./SocialMediaList.astro";
+import type { Language } from "~/i18n";
+import { getLangFromUrl, useTranslations } from "~/i18n/utils";
+import PersonImage from "./PersonImage.astro";
 
-type Props = ComponentProps<typeof SocialMediaList> & {
+interface Props {
   name: string;
-  img: string;
-  info?: string;
-};
+  lastRole: Record<Language, string>;
+  imagePath?: string;
+  skill?: Record<Language, string>;
+  hasMultipleRoles?: boolean;
+}
 
-const { name, img, info, links = [] } = Astro.props;
+const {
+  name,
+  imagePath,
+  lastRole,
+  skill,
+  hasMultipleRoles = false,
+} = Astro.props;
+
+const lang = getLangFromUrl(Astro.url);
+const t = useTranslations(lang);
 ---
 
 <div class="space-y-6">
-  <img
-    class="mx-auto h-40 w-40 rounded-full object-cover shadow-lg xl:h-56 xl:w-56"
-    src={img}
-    alt=""
-  />
-  <div class="space-y-2">
-    <div class="space-y-1 text-lg font-medium leading-6">
-      <h3>{name}</h3>
-      {info && <p class="text-wsg-orange-500">{info}</p>}
+  <PersonImage imagePath={imagePath} />
+  <div class="text-md text-center font-light">
+    <h3 class="mb-1 text-lg font-medium">{name}</h3>
+    <div>
+      <p class="inline-block">
+        {t(lastRole)}
+      </p>
+      <p class="inline-block">
+        {hasMultipleRoles && t({ de: "und mehr", en: "and more" })}
+      </p>
     </div>
-    <SocialMediaList links={links} />
+    <p>
+      {skill || <br />}
+    </p>
   </div>
 </div>
diff --git a/src/components/team/PersonImage.astro b/src/components/team/PersonImage.astro
new file mode 100644
index 0000000..c73d804
--- /dev/null
+++ b/src/components/team/PersonImage.astro
@@ -0,0 +1,23 @@
+---
+import { Image } from "astro:assets";
+import { clsx } from "clsx";
+import WsgHandsImage from "~/assets/img/wsg-hands.svg";
+
+interface Props {
+  imagePath?: string;
+}
+
+const { imagePath } = Astro.props;
+const images = import.meta.glob<{ default: ImageMetadata }>(
+  "/src/assets/**/*.{jpeg,jpg,png,gif,webp}",
+);
+---
+
+<Image
+  class={clsx(
+    "mx-auto h-40 w-40 rounded-full object-cover shadow-lg xl:h-56 xl:w-56",
+    imagePath && "p-5",
+  )}
+  src={imagePath ? images[imagePath]() : WsgHandsImage}
+  alt=""
+/>
diff --git a/src/components/team/Team.astro b/src/components/team/Team.astro
index 78c968d..e653b5a 100644
--- a/src/components/team/Team.astro
+++ b/src/components/team/Team.astro
@@ -1,23 +1,24 @@
 ---
-import type { ComponentProps } from "astro/types";
+import team from "~/assets/data/team.json";
 import Person from "./Person.astro";
-
-interface Props {
-  members: ComponentProps<typeof Person>[];
-}
-
-const { members } = Astro.props;
 ---
 
-<ul
-  role="list"
-  class="mx-auto space-y-16 sm:grid sm:grid-cols-2 sm:gap-16 sm:space-y-0 lg:max-w-5xl lg:grid-cols-3"
->
-  {
-    members.map((member) => (
-      <li>
-        <Person {...member} />
-      </li>
-    ))
-  }
-</ul>
+<div class="bg-white py-16">
+  <div
+    class="mx-8 grid grid-cols-2 gap-y-16 md:mx-24 md:grid-cols-3 lg:grid-cols-4"
+  >
+    {
+      team
+        .sort((first, second) => first["name"].localeCompare(second["name"]))
+        .map((member) => (
+          <Person
+            name={member["name"]}
+            imagePath={member["img"]}
+            lastRole={member["lastRole"]}
+            skill={member["skill"]}
+            hasMultipleRoles={member["hasMultipleRoles"]}
+          />
+        ))
+    }
+  </div>
+</div>
diff --git a/src/layouts/SkillPage.astro b/src/layouts/SkillPage.astro
index 438dbfe..364d588 100644
--- a/src/layouts/SkillPage.astro
+++ b/src/layouts/SkillPage.astro
@@ -7,7 +7,6 @@ import HeadedSection from "~/components/sections/HeadedSection.astro";
 import WavedSection from "~/components/sections/WavedSection.astro";
 import SkillInformation from "~/components/skill/SkillInformation.astro";
 import SkillRoadmap from "~/components/skill/SkillRoadmap.astro";
-import type Person from "~/components/team/Person.astro";
 import TimeLine from "~/components/timeline/TimeLine.astro";
 import { getLangFromUrl, useTranslations } from "~/i18n";
 import Layout from "./Layout.astro";
@@ -18,7 +17,6 @@ interface Props {
   skillInformation: ComponentProps<typeof SkillInformation>;
   img: ImageMetadata;
   contact: string;
-  nationalTeam: ComponentProps<typeof Person>[];
   timelineEntries: ComponentProps<typeof TimeLine>["entries"];
   additionalLinks: ComponentProps<typeof LinkCard>[];
 }
@@ -28,7 +26,6 @@ const {
   skillDescription,
   skillInformation,
   img,
-  nationalTeam,
   timelineEntries,
   additionalLinks,
   contact,
diff --git a/src/pages/[lang]/our-team.astro b/src/pages/[lang]/our-team.astro
new file mode 100644
index 0000000..d710bbc
--- /dev/null
+++ b/src/pages/[lang]/our-team.astro
@@ -0,0 +1,17 @@
+---
+import TeamImage from "~/assets/img/team.webp";
+import { getLangFromUrl, localeParams, useTranslations } from "~/i18n/utils";
+import Hero from "../../components/Hero.astro";
+import TeamList from "../../components/team/Team.astro";
+import Layout from "../../layouts/Layout.astro";
+
+export const getStaticPaths = localeParams;
+
+const lang = getLangFromUrl(Astro.url);
+const t = useTranslations(lang);
+---
+
+<Layout title={t({ de: "Unser Team", en: "Our Team" })}>
+  <Hero title={t({ de: "Unser Team", en: "Our Team" })} img={TeamImage} />
+  <TeamList />
+</Layout>
diff --git a/src/pages/en/mobile-applications-development.astro b/src/pages/en/mobile-applications-development.astro
index 6ff13f5..3cbdcf5 100644
--- a/src/pages/en/mobile-applications-development.astro
+++ b/src/pages/en/mobile-applications-development.astro
@@ -24,7 +24,6 @@ const historyData = historyJson[lang]["skill08"];
   }}
   img={Skill08Image}
   contact="mailto:worldskills@jonas-wanke.de"
-  nationalTeam={[]}
   timelineEntries={Object.values(historyData)}
   additionalLinks={[
     {
diff --git a/src/pages/en/software-applications-development.astro b/src/pages/en/software-applications-development.astro
index db005ec..1724c38 100644
--- a/src/pages/en/software-applications-development.astro
+++ b/src/pages/en/software-applications-development.astro
@@ -24,7 +24,6 @@ const historyData = historyJson[lang]["skill09"];
   }}
   img={Skill09Image}
   contact="mailto:skills@kapplers.de"
-  nationalTeam={[]}
   timelineEntries={Object.values(historyData)}
   additionalLinks={[
     {
diff --git a/src/pages/en/web-technologies.astro b/src/pages/en/web-technologies.astro
index 1d6d52a..d486ca1 100644
--- a/src/pages/en/web-technologies.astro
+++ b/src/pages/en/web-technologies.astro
@@ -24,7 +24,6 @@ const historyData = historyJson[lang]["skill17"];
   }}
   img={Skill09Image}
   contact="mailto:glenn.skrzypczak@gmail.com"
-  nationalTeam={[]}
   timelineEntries={Object.values(historyData)}
   additionalLinks={[
     {
diff --git a/src/pages/mobile-applications-development.astro b/src/pages/mobile-applications-development.astro
index 7ff2133..1280463 100644
--- a/src/pages/mobile-applications-development.astro
+++ b/src/pages/mobile-applications-development.astro
@@ -24,7 +24,6 @@ const historyData = historyJson[lang]["skill08"];
   }}
   img={Skill08Image}
   contact="mailto:worldskills@jonas-wanke.de"
-  nationalTeam={[]}
   timelineEntries={Object.values(historyData)}
   additionalLinks={[
     {
diff --git a/src/pages/software-applications-development.astro b/src/pages/software-applications-development.astro
index 87e0753..e9c85e9 100644
--- a/src/pages/software-applications-development.astro
+++ b/src/pages/software-applications-development.astro
@@ -24,7 +24,6 @@ const historyData = historyJson[lang]["skill09"];
   }}
   img={Skill09Image}
   contact="mailto:skills@kapplers.de"
-  nationalTeam={[]}
   timelineEntries={Object.values(historyData)}
   additionalLinks={[
     {
diff --git a/src/pages/web-technologies.astro b/src/pages/web-technologies.astro
index 82232b1..ec6f784 100644
--- a/src/pages/web-technologies.astro
+++ b/src/pages/web-technologies.astro
@@ -24,7 +24,6 @@ const historyData = historyJson[lang]["skill17"];
   }}
   img={Skill09Image}
   contact="mailto:glenn.skrzypczak@gmail.com"
-  nationalTeam={[]}
   timelineEntries={Object.values(historyData)}
   additionalLinks={[
     {