diff --git a/src/layouts/Base.astro b/src/layouts/Base.astro
index 3e3ba2b..a09b2f5 100644
--- a/src/layouts/Base.astro
+++ b/src/layouts/Base.astro
@@ -5,8 +5,10 @@ export interface Props {
   title: string;
   description?: string;
   image?: string;
+  keywords?: string;
+  author?: string;
 }
-const { title, description = "Computational and Statistical Genomics Lab – FIMM, University of Helsinki", image } = Astro.props;
+const { title, description = "Computational and Statistical Genomics Lab – FIMM, University of Helsinki", image, keywords, author } = Astro.props;
 const canonicalURL = new URL(Astro.url.pathname, Astro.site);
 const siteURL = Astro.site?.toString() ?? 'https://compstatgenlab.github.io/';
 const ogImage = image
@@ -22,6 +24,8 @@ const ogImage = image
   <link rel="canonical" href={canonicalURL} />
   <title>{title} | CompStatGen Lab</title>
   <meta name="description" content={description} />
+  {keywords && <meta name="keywords" content={keywords} />}
+  {author && <meta name="author" content={author} />}
   <meta property="og:type" content="website" />
   <meta property="og:site_name" content="CompStatGen Lab" />
   <meta property="og:title" content={`${title} | CompStatGen Lab`} />
diff --git a/src/layouts/Page.astro b/src/layouts/Page.astro
index 3e58eea..3ec1ccc 100644
--- a/src/layouts/Page.astro
+++ b/src/layouts/Page.astro
@@ -6,10 +6,12 @@ import Footer from '../components/Footer.astro';
 export interface Props {
   title: string;
   description?: string;
+  keywords?: string;
+  author?: string;
 }
-const { title, description } = Astro.props;
+const { title, description, keywords, author } = Astro.props;
 ---
-<Base title={title} description={description}>
+<Base title={title} description={description} keywords={keywords} author={author}>
   <slot name="head" slot="head" />
   <Nav />
   <main class="min-h-screen">
diff --git a/src/pages/index.astro b/src/pages/index.astro
index ccd13c1..9ca7e0a 100644
--- a/src/pages/index.astro
+++ b/src/pages/index.astro
@@ -9,29 +9,68 @@ const articles = (await getCollection('articles'))
   .sort((a, b) => b.data.date.valueOf() - a.data.date.valueOf())
   .slice(0, 3);
 ---
-<Base title="Home" description="Computational and Statistical Genomics – Rubinacci Lab, FIMM, University of Helsinki">
-  <script type="application/ld+json" slot="head" set:html={JSON.stringify({
-    "@context": "https://schema.org",
-    "@type": "ResearchOrganization",
-    "name": "Computational and Statistical Genomics Lab (CompStatGen Lab)",
-    "alternateName": "Rubinacci Lab",
-    "url": "https://compstatgenlab.github.io/",
-    "logo": "https://compstatgenlab.github.io/images/lab/spiral-logo.png",
-    "description": "We develop efficient statistical and computational methods to decode human genetic variation at scale, applying them to biobanks to understand the genetic basis of disease.",
-    "parentOrganization": {
-      "@type": "Organization",
-      "name": "FIMM – Institute for Molecular Medicine Finland",
-      "url": "https://www.fimm.fi/"
+<Base
+  title="Home"
+  description="Computational and Statistical Genomics Lab led by Simone Rubinacci at FIMM, University of Helsinki. We develop scalable statistical methods for genomics, imputation, and phasing."
+  keywords="Simone Rubinacci, computational genomics, statistical genomics, FIMM, imputation, phasing, GLIMPSE, SHAPEIT, biobank, population genetics, University of Helsinki"
+  author="Simone Rubinacci"
+>
+  <meta slot="head" name="author" content="Simone Rubinacci" />
+  <script type="application/ld+json" slot="head" set:html={JSON.stringify([
+    {
+      "@context": "https://schema.org",
+      "@type": "ResearchOrganization",
+      "name": "Computational and Statistical Genomics Lab (CompStatGen Lab)",
+      "alternateName": "Rubinacci Lab",
+      "url": "https://compstatgenlab.github.io/",
+      "logo": "https://compstatgenlab.github.io/images/lab/spiral-logo.png",
+      "description": "We develop efficient statistical and computational methods to decode human genetic variation at scale, applying them to biobanks to understand the genetic basis of disease.",
+      "founder": {
+        "@type": "Person",
+        "name": "Simone Rubinacci",
+        "url": "https://compstatgenlab.github.io/team",
+        "sameAs": [
+          "https://orcid.org/0000-0002-7725-4813",
+          "https://github.com/compstatgenlab"
+        ]
+      },
+      "parentOrganization": {
+        "@type": "Organization",
+        "name": "FIMM – Institute for Molecular Medicine Finland",
+        "url": "https://www.fimm.fi/"
+      },
+      "memberOf": {
+        "@type": "EducationalOrganization",
+        "name": "University of Helsinki",
+        "url": "https://www.helsinki.fi/"
+      },
+      "sameAs": [
+        "https://github.com/compstatgenlab",
+        "https://orcid.org/0000-0002-7725-4813"
+      ]
     },
-    "memberOf": {
-      "@type": "EducationalOrganization",
-      "name": "University of Helsinki",
-      "url": "https://www.helsinki.fi/"
-    },
-    "sameAs": [
-      "https://github.com/compstatgenlab"
-    ]
-  })} />
+    {
+      "@context": "https://schema.org",
+      "@type": "Person",
+      "name": "Simone Rubinacci",
+      "jobTitle": "FIMM-EMBL Group Leader",
+      "url": "https://compstatgenlab.github.io/team",
+      "worksFor": {
+        "@type": "Organization",
+        "name": "FIMM – Institute for Molecular Medicine Finland",
+        "url": "https://www.fimm.fi/"
+      },
+      "affiliation": {
+        "@type": "EducationalOrganization",
+        "name": "University of Helsinki",
+        "url": "https://www.helsinki.fi/"
+      },
+      "sameAs": [
+        "https://orcid.org/0000-0002-7725-4813",
+        "https://github.com/compstatgenlab"
+      ]
+    }
+  ])} />
   <Nav />
 
   <!-- ── HERO ───────────────────────────────────────────────────────── -->
diff --git a/src/pages/team.astro b/src/pages/team.astro
index ff1b17a..0996806 100644
--- a/src/pages/team.astro
+++ b/src/pages/team.astro
@@ -103,9 +103,31 @@ const alumni = [
 
 const roleOrder = ['FIMM-EMBL Group Leader', 'Postdoctoral researcher', 'Doctoral researcher', 'Research assistant', 'FIMM-EMBL doctoral researcher'];
 const sorted = [...members].sort((a, b) => roleOrder.indexOf(a.role) - roleOrder.indexOf(b.role));
+
+const memberNames = members.map(m => m.name).join(', ');
+
+const personSchemas = members.map(m => ({
+  "@context": "https://schema.org",
+  "@type": "Person",
+  "name": m.name,
+  "jobTitle": m.role,
+  "url": "https://compstatgenlab.github.io/team",
+  "worksFor": {
+    "@type": "Organization",
+    "name": "Computational and Statistical Genomics Lab (CompStatGen Lab)",
+    "url": "https://compstatgenlab.github.io/"
+  },
+  "sameAs": m.links.map(l => l.href),
+}));
 ---
 
-<Page title="Team" description="Group members of the Computational and Statistical Genomics lab">
+<Page
+  title="Team – Simone Rubinacci"
+  description={`Simone Rubinacci – Group Leader and PI of the Computational and Statistical Genomics Lab at FIMM, University of Helsinki. Team members: ${memberNames}.`}
+  keywords={`Simone Rubinacci, ${memberNames}, CompStatGen Lab, FIMM, computational genomics, statistical genomics, University of Helsinki`}
+  author="Simone Rubinacci"
+>
+  <script type="application/ld+json" slot="head" set:html={JSON.stringify(personSchemas)} />
   <div class="max-w-5xl mx-auto px-6 py-16">
 
     <p class="font-mono text-[0.68rem] tracking-[0.18em] uppercase text-teal-600 mb-3">People</p>