diff --git a/src/assets/data/team.json b/src/assets/data/team.json
index 6fe2d8a..bc35720 100644
--- a/src/assets/data/team.json
+++ b/src/assets/data/team.json
@@ -8,15 +8,15 @@
   {
     "img": "/src/assets/img/team/Jonas Wanke.webp",
     "name": "Jonas Wanke",
-    "lastRole": { "en": "Expert", "de": "Experte" },
-    "skill": "Skill 08",
+    "lastRole": { "en": "Expert", "de": "Bundestrainer" },
+    "skill": "Mobile Applications Development",
     "hasMultipleRoles": true
   },
   {
     "img": "/src/assets/img/team/Dr. Olaf Kappler.webp",
     "name": "Dr. Olaf Kappler",
-    "lastRole": { "en": "Expert", "de": "Experte" },
-    "skill": "Skill 09"
+    "lastRole": { "en": "Expert", "de": "Bundestrainer" },
+    "skill": "IT Software Solutions for Business"
   },
   {
     "img": "/src/assets/img/team/Doreen Kappler.webp",
@@ -26,8 +26,8 @@
   {
     "img": "/src/assets/img/team/Glenn Skrzypczak.webp",
     "name": "Glenn Skrzypczak",
-    "lastRole": { "en": "Expert", "de": "Experte" },
-    "skill": "Skill 17",
+    "lastRole": { "en": "Expert", "de": "Bundestrainer" },
+    "skill": "Web Technologies",
     "hasMultipleRoles": true
   },
   {
@@ -55,12 +55,12 @@
   {
     "img": "/src/assets/img/team/Kai Redmann.webp",
     "name": "Kai Redmann",
-    "lastRole": { "en": "Workshop Manager", "de": "Workshop Manager" }
+    "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" }
+    "lastRole": { "en": "Workshop-Manager", "de": "Workshop Manager" }
   },
   {
     "img": "/src/assets/img/team/Thomas Steinfeld.webp",
diff --git a/src/components/team/Person.astro b/src/components/team/Person.astro
index c23169d..33a325c 100644
--- a/src/components/team/Person.astro
+++ b/src/components/team/Person.astro
@@ -1,10 +1,11 @@
 ---
 import { getLangFromUrl, useTranslations } from "~/i18n/utils";
 import { PersonImage } from "./PersonImage";
+import type { Language } from "~/i18n";
 
 interface Props {
   name: string;
-  lastRole: { de: string; en: string };
+  lastRole: Record<Language, string>;
   img?: string;
   skill?: string;
   hasMultipleRoles?: boolean;
diff --git a/src/components/team/PersonImage.tsx b/src/components/team/PersonImage.tsx
index 642c4a7..5292f68 100644
--- a/src/components/team/PersonImage.tsx
+++ b/src/components/team/PersonImage.tsx
@@ -1,12 +1,16 @@
+import clsx from "clsx";
+
 export type PersonImageProps = {
   img?: string;
 };
 
 export const PersonImage = ({ img }: PersonImageProps) => {
-  const padding = !img ? "p-5" : "";
   return (
     <img
-      className={`mx-auto h-40 w-40 rounded-full object-cover shadow-lg xl:h-56 xl:w-56 ${padding}`}
+      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=""
     />