diff --git a/src/assets/data/team.json b/src/assets/data/team.json
deleted file mode 100644
index cff7068..0000000
--- a/src/assets/data/team.json
+++ /dev/null
@@ -1,79 +0,0 @@
-[
-  {
-    "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/Dr. 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
deleted file mode 100644
index 06c68b9..0000000
Binary files a/src/assets/img/team.webp and /dev/null differ
diff --git a/src/assets/img/team/Benjamin Frost.webp b/src/assets/img/team/Benjamin Frost.webp
deleted file mode 100644
index 3b893d0..0000000
Binary files a/src/assets/img/team/Benjamin Frost.webp and /dev/null differ
diff --git a/src/assets/img/team/Doreen Kappler.webp b/src/assets/img/team/Doreen Kappler.webp
deleted file mode 100644
index 367ad76..0000000
Binary files a/src/assets/img/team/Doreen Kappler.webp and /dev/null differ
diff --git a/src/assets/img/team/Dr. Olaf Kappler.webp b/src/assets/img/team/Dr. Olaf Kappler.webp
deleted file mode 100644
index d95a7ca..0000000
Binary files a/src/assets/img/team/Dr. Olaf Kappler.webp and /dev/null differ
diff --git a/src/assets/img/team/Elisa Boose.webp b/src/assets/img/team/Elisa Boose.webp
deleted file mode 100644
index 56e8c57..0000000
Binary files a/src/assets/img/team/Elisa Boose.webp and /dev/null differ
diff --git a/src/assets/img/team/Glenn Skrzypczak.webp b/src/assets/img/team/Glenn Skrzypczak.webp
deleted file mode 100644
index 781d312..0000000
Binary files a/src/assets/img/team/Glenn Skrzypczak.webp and /dev/null differ
diff --git a/src/assets/img/team/Joachim Schiller.webp b/src/assets/img/team/Joachim Schiller.webp
deleted file mode 100644
index 08cfc01..0000000
Binary files a/src/assets/img/team/Joachim Schiller.webp and /dev/null differ
diff --git a/src/assets/img/team/Jonas Wanke.webp b/src/assets/img/team/Jonas Wanke.webp
deleted file mode 100644
index 4e6f63c..0000000
Binary files a/src/assets/img/team/Jonas Wanke.webp and /dev/null differ
diff --git a/src/assets/img/team/Justin Konratt.webp b/src/assets/img/team/Justin Konratt.webp
deleted file mode 100644
index 3abb48f..0000000
Binary files a/src/assets/img/team/Justin Konratt.webp and /dev/null differ
diff --git a/src/assets/img/team/Kai Redmann.webp b/src/assets/img/team/Kai Redmann.webp
deleted file mode 100644
index bd06396..0000000
Binary files a/src/assets/img/team/Kai Redmann.webp and /dev/null differ
diff --git a/src/assets/img/team/Lukas Fischer.webp b/src/assets/img/team/Lukas Fischer.webp
deleted file mode 100644
index c3f5172..0000000
Binary files a/src/assets/img/team/Lukas Fischer.webp and /dev/null differ
diff --git a/src/assets/img/team/Michael Boose.webp b/src/assets/img/team/Michael Boose.webp
deleted file mode 100644
index 7c7a4a0..0000000
Binary files a/src/assets/img/team/Michael Boose.webp and /dev/null differ
diff --git a/src/assets/img/team/Thomas Steinfeld.webp b/src/assets/img/team/Thomas Steinfeld.webp
deleted file mode 100644
index ea24f2f..0000000
Binary files a/src/assets/img/team/Thomas Steinfeld.webp and /dev/null differ
diff --git a/src/components/Header.astro b/src/components/Header.astro
index 2ef6258..47ec657 100644
--- a/src/components/Header.astro
+++ b/src/components/Header.astro
@@ -24,7 +24,7 @@ const skills = [
   {
     name: t({
       de: "Web-Entwicklung",
-      en: "Web Technologies",
+      en: "Web Technologies"
     }),
     href: getRelativeLocaleUrl(lang, "web-technologies"),
   },
@@ -46,12 +46,13 @@ 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
@@ -59,14 +60,6 @@ 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 7bc221c..352425b 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 00da198..f008706 100644
--- a/src/components/team/Person.astro
+++ b/src/components/team/Person.astro
@@ -1,36 +1,27 @@
 ---
-import { getLangFromUrl, useTranslations } from "~/i18n/utils";
-import { PersonImage } from "./PersonImage";
-import type { Language } from "~/i18n";
+import type { ComponentProps } from "astro/types";
+import SocialMediaList from "./SocialMediaList.astro";
 
-interface Props {
+type Props = ComponentProps<typeof SocialMediaList> & {
   name: string;
-  lastRole: Record<Language, string>;
-  img?: string;
-  skill?: Record<Language, string>;
-  hasMultipleRoles?: boolean;
-}
+  img: string;
+  info?: string;
+};
 
-const { name, img, lastRole, skill, hasMultipleRoles = false } = Astro.props;
-
-const lang = getLangFromUrl(Astro.url);
-const t = useTranslations(lang);
+const { name, img, info, links = [] } = Astro.props;
 ---
 
 <div class="space-y-6">
-  <PersonImage img={img} />
-  <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>
+  <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>}
     </div>
-    <p>
-      {skill || <br />}
-    </p>
+    <SocialMediaList links={links} />
   </div>
 </div>
diff --git a/src/components/team/PersonImage.tsx b/src/components/team/PersonImage.tsx
deleted file mode 100644
index 1919fb5..0000000
--- a/src/components/team/PersonImage.tsx
+++ /dev/null
@@ -1,18 +0,0 @@
-import clsx from "clsx";
-
-export type PersonImageProps = {
-  img?: string;
-};
-
-export const PersonImage = ({ img }: PersonImageProps) => {
-  return (
-    <img
-      className={clsx(
-        `mx-auto h-40 w-40 rounded-full object-cover shadow-lg xl:h-56 xl:w-56`,
-        img || "p-5",
-      )}
-      src={img ?? "/imgs/wsg/wsg_hands.svg"}
-      alt=""
-    />
-  );
-};
diff --git a/src/components/team/Team.astro b/src/components/team/Team.astro
index 1a29970..78c968d 100644
--- a/src/components/team/Team.astro
+++ b/src/components/team/Team.astro
@@ -1,24 +1,23 @@
 ---
+import type { ComponentProps } from "astro/types";
 import Person from "./Person.astro";
-import team from "~/assets/data/team.json";
+
+interface Props {
+  members: ComponentProps<typeof Person>[];
+}
+
+const { members } = Astro.props;
 ---
 
-<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"]}
-            img={member["img"]}
-            lastRole={member["lastRole"]}
-            skill={member["skill"]}
-            hasMultipleRoles={member["hasMultipleRoles"]}
-          />
-        ))
-    }
-  </div>
-</div>
+<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>
diff --git a/src/layouts/SkillPage.astro b/src/layouts/SkillPage.astro
index 364d588..438dbfe 100644
--- a/src/layouts/SkillPage.astro
+++ b/src/layouts/SkillPage.astro
@@ -7,6 +7,7 @@ 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";
@@ -17,6 +18,7 @@ interface Props {
   skillInformation: ComponentProps<typeof SkillInformation>;
   img: ImageMetadata;
   contact: string;
+  nationalTeam: ComponentProps<typeof Person>[];
   timelineEntries: ComponentProps<typeof TimeLine>["entries"];
   additionalLinks: ComponentProps<typeof LinkCard>[];
 }
@@ -26,6 +28,7 @@ const {
   skillDescription,
   skillInformation,
   img,
+  nationalTeam,
   timelineEntries,
   additionalLinks,
   contact,
diff --git a/src/pages/[lang]/our-team.astro b/src/pages/[lang]/our-team.astro
deleted file mode 100644
index 1cccc77..0000000
--- a/src/pages/[lang]/our-team.astro
+++ /dev/null
@@ -1,17 +0,0 @@
----
-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 TeamImage from "~/assets/img/team.webp";
-
-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} />
-  <TeamPage />
-</Layout>
diff --git a/src/pages/en/it-software-solutions-for-business.astro b/src/pages/en/it-software-solutions-for-business.astro
index 59b1136..fb2383e 100644
--- a/src/pages/en/it-software-solutions-for-business.astro
+++ b/src/pages/en/it-software-solutions-for-business.astro
@@ -24,6 +24,7 @@ const historyData = historyJson[lang]["skill09"];
   }}
   img={Skill09Image}
   contact="mailto:skills@kapplers.de"
+  nationalTeam={[]}
   timelineEntries={Object.values(historyData)}
   additionalLinks={[
     {
diff --git a/src/pages/en/mobile-applications-development.astro b/src/pages/en/mobile-applications-development.astro
index 3cbdcf5..6ff13f5 100644
--- a/src/pages/en/mobile-applications-development.astro
+++ b/src/pages/en/mobile-applications-development.astro
@@ -24,6 +24,7 @@ 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/web-technologies.astro b/src/pages/en/web-technologies.astro
index d486ca1..1d6d52a 100644
--- a/src/pages/en/web-technologies.astro
+++ b/src/pages/en/web-technologies.astro
@@ -24,6 +24,7 @@ const historyData = historyJson[lang]["skill17"];
   }}
   img={Skill09Image}
   contact="mailto:glenn.skrzypczak@gmail.com"
+  nationalTeam={[]}
   timelineEntries={Object.values(historyData)}
   additionalLinks={[
     {
diff --git a/src/pages/it-software-solutions-for-business.astro b/src/pages/it-software-solutions-for-business.astro
index e9c85e9..87e0753 100644
--- a/src/pages/it-software-solutions-for-business.astro
+++ b/src/pages/it-software-solutions-for-business.astro
@@ -24,6 +24,7 @@ const historyData = historyJson[lang]["skill09"];
   }}
   img={Skill09Image}
   contact="mailto:skills@kapplers.de"
+  nationalTeam={[]}
   timelineEntries={Object.values(historyData)}
   additionalLinks={[
     {
diff --git a/src/pages/mobile-applications-development.astro b/src/pages/mobile-applications-development.astro
index 1280463..7ff2133 100644
--- a/src/pages/mobile-applications-development.astro
+++ b/src/pages/mobile-applications-development.astro
@@ -24,6 +24,7 @@ const historyData = historyJson[lang]["skill08"];
   }}
   img={Skill08Image}
   contact="mailto:worldskills@jonas-wanke.de"
+  nationalTeam={[]}
   timelineEntries={Object.values(historyData)}
   additionalLinks={[
     {
diff --git a/src/pages/web-technologies.astro b/src/pages/web-technologies.astro
index ec6f784..82232b1 100644
--- a/src/pages/web-technologies.astro
+++ b/src/pages/web-technologies.astro
@@ -24,6 +24,7 @@ const historyData = historyJson[lang]["skill17"];
   }}
   img={Skill09Image}
   contact="mailto:glenn.skrzypczak@gmail.com"
+  nationalTeam={[]}
   timelineEntries={Object.values(historyData)}
   additionalLinks={[
     {