diff --git a/config/_default/config.yml b/config/_default/config.yml
index ef51ac1d72f5..0aba5d88e7c0 100644
--- a/config/_default/config.yml
+++ b/config/_default/config.yml
@@ -86,6 +86,14 @@ params:
     meta_desc: |
         Pulumi's open source infrastructure as code SDK enables you to create, deploy,
         and manage infrastructure on any cloud, using your favorite languages.
+    
+    # Schema.org configuration
+    schema:
+        # Pulumi CLI version - dynamically updated by CI/CD
+        pulumi_version: "3.198.0"
+        
+        # Performance optimization
+        max_content_scan_length: 5000
 
 minify:
   tdewolff:
diff --git a/data/cloud_resources.yml b/data/cloud_resources.yml
new file mode 100644
index 000000000000..61d610f7db1f
--- /dev/null
+++ b/data/cloud_resources.yml
@@ -0,0 +1,474 @@
+# Cloud Resources Configuration for Schema.org Detection
+# This file defines cloud services and resources for automatic detection in content
+# Each resource includes patterns for content/URL matching and schema.org metadata
+
+resources:
+  # AWS Resources
+  - id: aws_s3
+    patterns:
+      - "aws:s3"
+      - "s3.bucket"
+      - "s3 bucket"
+    url_pattern: "/s3/"
+    schema:
+      type: "SoftwareApplication"
+      id: "https://docs.aws.amazon.com/s3/"
+      name: "Amazon S3"
+      description: "Object Storage Service"
+      applicationCategory: "Storage"
+      sameAs: "https://www.wikidata.org/wiki/Q201490"
+  
+  - id: aws_ec2
+    patterns:
+      - "aws:ec2"
+      - "ec2.instance"
+      - "ec2 instance"
+    url_pattern: "/ec2/"
+    schema:
+      type: "SoftwareApplication"
+      id: "https://docs.aws.amazon.com/ec2/"
+      name: "Amazon EC2"
+      description: "Elastic Compute Cloud"
+      applicationCategory: "Compute"
+      sameAs: "https://www.wikidata.org/wiki/Q507639"
+  
+  - id: aws_lambda
+    patterns:
+      - "aws:lambda"
+      - "lambda.function"
+    url_pattern: "/lambda/"
+    schema:
+      type: "SoftwareApplication"
+      id: "https://docs.aws.amazon.com/lambda/"
+      name: "AWS Lambda"
+      description: "Serverless Computing Service"
+      applicationCategory: "Serverless"
+      sameAs: "https://www.wikidata.org/wiki/Q28759395"
+  
+  - id: aws_rds
+    patterns:
+      - "aws:rds"
+      - "rds.instance"
+    url_pattern: "/rds/"
+    schema:
+      type: "SoftwareApplication"
+      id: "https://docs.aws.amazon.com/rds/"
+      name: "Amazon RDS"
+      description: "Relational Database Service"
+      applicationCategory: "Database"
+      sameAs: "https://www.wikidata.org/wiki/Q2833151"
+  
+  - id: aws_dynamodb
+    patterns:
+      - "aws:dynamodb"
+      - "dynamodb.table"
+    url_pattern: "/dynamodb/"
+    schema:
+      type: "SoftwareApplication"
+      id: "https://docs.aws.amazon.com/dynamodb/"
+      name: "Amazon DynamoDB"
+      description: "NoSQL Database Service"
+      applicationCategory: "Database"
+      sameAs: "https://www.wikidata.org/wiki/Q3630640"
+  
+  - id: aws_eks
+    patterns:
+      - "aws:eks"
+      - "eks.cluster"
+      - "eks"
+      - "elastic kubernetes service"
+    url_pattern: "/eks/"
+    schema:
+      type: "SoftwareApplication"
+      id: "https://docs.aws.amazon.com/eks/"
+      name: "Amazon EKS"
+      description: "Managed Kubernetes Service"
+      applicationCategory: "Container"
+      sameAs: "https://www.wikidata.org/wiki/Q53628743"
+  
+  - id: aws_ecs
+    patterns:
+      - "aws:ecs"
+      - "ecs.cluster"
+      - "ecs.service"
+      - "ecs"
+      - "elastic container service"
+    url_pattern: "/ecs/"
+    schema:
+      type: "SoftwareApplication"
+      id: "https://docs.aws.amazon.com/ecs/"
+      name: "Amazon ECS"
+      description: "Container Orchestration Service"
+      applicationCategory: "Container"
+      sameAs: "https://www.wikidata.org/wiki/Q24935329"
+  
+  - id: aws_api_gateway
+    patterns:
+      - "aws:apigateway"
+      - "api gateway"
+    url_pattern: "/api-gateway/"
+    schema:
+      type: "SoftwareApplication"
+      id: "https://docs.aws.amazon.com/apigateway/"
+      name: "Amazon API Gateway"
+      description: "API Management Service"
+      applicationCategory: "API"
+      sameAs: "https://www.wikidata.org/wiki/Q21166062"
+  
+  - id: aws_iam
+    patterns:
+      - "aws:iam"
+      - "iam.role"
+      - "iam.policy"
+    url_pattern: "/iam/"
+    schema:
+      type: "SoftwareApplication"
+      id: "https://docs.aws.amazon.com/iam/"
+      name: "AWS IAM"
+      description: "Identity and Access Management"
+      applicationCategory: "Security"
+      sameAs: "https://www.wikidata.org/wiki/Q4654926"
+  
+  - id: aws_vpc
+    patterns:
+      - "aws:vpc"
+      - "vpc"
+      - "subnet"
+    url_pattern: "/vpc/"
+    schema:
+      type: "SoftwareApplication"
+      id: "https://docs.aws.amazon.com/vpc/"
+      name: "Amazon VPC"
+      description: "Virtual Private Cloud"
+      applicationCategory: "Networking"
+      sameAs: "https://www.wikidata.org/wiki/Q7932203"
+  
+  # Azure Resources
+  - id: azure_storage
+    patterns:
+      - "azure:storage"
+      - "storage.account"
+      - "blob storage"
+    url_pattern: "/storage/"
+    schema:
+      type: "SoftwareApplication"
+      id: "https://docs.microsoft.com/azure/storage/"
+      name: "Azure Storage"
+      description: "Cloud Storage Service"
+      applicationCategory: "Storage"
+      sameAs: "https://www.wikidata.org/wiki/Q28403817"
+  
+  - id: azure_compute
+    patterns:
+      - "azure:compute"
+      - "virtualmachine"
+      - "azure vm"
+    url_pattern: "/compute/"
+    schema:
+      type: "SoftwareApplication"
+      id: "https://docs.microsoft.com/azure/virtual-machines/"
+      name: "Azure Virtual Machines"
+      description: "Cloud Compute Service"
+      applicationCategory: "Compute"
+      sameAs: "https://www.wikidata.org/wiki/Q28403835"
+  
+  - id: azure_functions
+    patterns:
+      - "azure:web"
+      - "azure functions"
+      - "function app"
+    url_pattern: "/functions/"
+    schema:
+      type: "SoftwareApplication"
+      id: "https://docs.microsoft.com/azure/azure-functions/"
+      name: "Azure Functions"
+      description: "Serverless Computing Service"
+      applicationCategory: "Serverless"
+      sameAs: "https://www.wikidata.org/wiki/Q28403841"
+  
+  - id: azure_sql
+    patterns:
+      - "azure:sql"
+      - "sql database"
+      - "azure sql"
+    url_pattern: "/sql/"
+    schema:
+      type: "SoftwareApplication"
+      id: "https://docs.microsoft.com/azure/sql-database/"
+      name: "Azure SQL Database"
+      description: "Managed Relational Database"
+      applicationCategory: "Database"
+      sameAs: "https://www.wikidata.org/wiki/Q28403850"
+  
+  - id: azure_cosmos
+    patterns:
+      - "azure:cosmosdb"
+      - "cosmos db"
+    url_pattern: "/cosmosdb/"
+    schema:
+      type: "SoftwareApplication"
+      id: "https://docs.microsoft.com/azure/cosmos-db/"
+      name: "Azure Cosmos DB"
+      description: "NoSQL Database Service"
+      applicationCategory: "Database"
+      sameAs: "https://www.wikidata.org/wiki/Q28403854"
+  
+  - id: azure_aks
+    patterns:
+      - "aks"
+      - "azure kubernetes"
+      - "azure:aks"
+      - "azure kubernetes service"
+    url_pattern: "/aks/"
+    schema:
+      type: "SoftwareApplication"
+      id: "https://docs.microsoft.com/azure/aks/"
+      name: "Azure Kubernetes Service"
+      description: "Managed Kubernetes Service"
+      applicationCategory: "Container"
+      sameAs: "https://www.wikidata.org/wiki/Q60748086"
+  
+  # Google Cloud Resources
+  - id: gcp_storage
+    patterns:
+      - "gcp:storage"
+      - "cloud storage"
+      - "gcs bucket"
+    url_pattern: "/storage/"
+    schema:
+      type: "SoftwareApplication"
+      id: "https://cloud.google.com/storage/docs"
+      name: "Google Cloud Storage"
+      description: "Object Storage Service"
+      applicationCategory: "Storage"
+      sameAs: "https://www.wikidata.org/wiki/Q28524083"
+  
+  - id: gcp_compute
+    patterns:
+      - "gcp:compute"
+      - "compute engine"
+      - "gce instance"
+    url_pattern: "/compute/"
+    schema:
+      type: "SoftwareApplication"
+      id: "https://cloud.google.com/compute/docs"
+      name: "Google Compute Engine"
+      description: "Virtual Machine Service"
+      applicationCategory: "Compute"
+      sameAs: "https://www.wikidata.org/wiki/Q28524086"
+  
+  - id: gcp_functions
+    patterns:
+      - "cloud functions"
+      - "gcp:cloudfunctions"
+    url_pattern: "/functions/"
+    schema:
+      type: "SoftwareApplication"
+      id: "https://cloud.google.com/functions/docs"
+      name: "Google Cloud Functions"
+      description: "Serverless Computing Service"
+      applicationCategory: "Serverless"
+      sameAs: "https://www.wikidata.org/wiki/Q28524092"
+  
+  - id: gcp_sql
+    patterns:
+      - "cloud sql"
+      - "gcp:sql"
+    url_pattern: "/sql/"
+    schema:
+      type: "SoftwareApplication"
+      id: "https://cloud.google.com/sql/docs"
+      name: "Google Cloud SQL"
+      description: "Managed Relational Database"
+      applicationCategory: "Database"
+      sameAs: "https://www.wikidata.org/wiki/Q28524095"
+  
+  - id: gcp_bigquery
+    patterns:
+      - "bigquery"
+      - "gcp:bigquery"
+    url_pattern: "/bigquery/"
+    schema:
+      type: "SoftwareApplication"
+      id: "https://cloud.google.com/bigquery/docs"
+      name: "Google BigQuery"
+      description: "Data Warehouse Service"
+      applicationCategory: "Analytics"
+      sameAs: "https://www.wikidata.org/wiki/Q4903817"
+  
+  - id: gcp_gke
+    patterns:
+      - "gke"
+      - "google kubernetes engine"
+    url_pattern: "/gke/"
+    schema:
+      type: "SoftwareApplication"
+      id: "https://cloud.google.com/kubernetes-engine/docs"
+      name: "Google Kubernetes Engine"
+      description: "Managed Kubernetes Service"
+      applicationCategory: "Container"
+      sameAs: "https://www.wikidata.org/wiki/Q28524102"
+  
+  # Other Cloud Providers
+  - id: kubernetes
+    patterns:
+      - "kubernetes"
+      - "k8s"
+    url_pattern: "/kubernetes/"
+    schema:
+      type: "SoftwareApplication"
+      id: "https://kubernetes.io/"
+      name: "Kubernetes"
+      description: "Container Orchestration Platform"
+      applicationCategory: "Container"
+      sameAs: "https://www.wikidata.org/wiki/Q22661583"
+  
+  - id: digitalocean
+    patterns:
+      - "digitalocean"
+      - "do:"
+    url_pattern: "/digitalocean/"
+    schema:
+      type: "Organization"
+      id: "https://www.digitalocean.com/"
+      name: "DigitalOcean"
+      description: "Cloud Infrastructure Provider"
+      applicationCategory: "Cloud"
+
+  # Modern AI/ML Services
+  - id: aws_bedrock
+    patterns:
+      - "bedrock"
+      - "aws:bedrock"
+      - "amazon bedrock"
+    url_pattern: "/bedrock/"
+    schema:
+      type: "SoftwareApplication"
+      id: "https://docs.aws.amazon.com/bedrock/"
+      name: "Amazon Bedrock"
+      description: "Fully managed service for foundation models"
+      applicationCategory: "AI/ML"
+      sameAs: "https://www.wikidata.org/wiki/Q124358384"
+
+  - id: aws_sagemaker
+    patterns:
+      - "sagemaker"
+      - "aws:sagemaker"
+    url_pattern: "/sagemaker/"
+    schema:
+      type: "SoftwareApplication"
+      id: "https://docs.aws.amazon.com/sagemaker/"
+      name: "Amazon SageMaker"
+      description: "Machine Learning Platform"
+      applicationCategory: "AI/ML"
+      sameAs: "https://www.wikidata.org/wiki/Q46831741"
+
+  - id: azure_openai
+    patterns:
+      - "azure openai"
+      - "azure:openai"
+      - "azure cognitive services openai"
+    url_pattern: "/azure-openai/"
+    schema:
+      type: "SoftwareApplication"
+      id: "https://docs.microsoft.com/azure/cognitive-services/openai/"
+      name: "Azure OpenAI Service"
+      description: "Azure OpenAI Service for GPT models"
+      applicationCategory: "AI/ML"
+      sameAs: "https://www.wikidata.org/wiki/Q112916447"
+
+  - id: azure_ml
+    patterns:
+      - "azure ml"
+      - "azure machine learning"
+      - "azure:machinelearning"
+    url_pattern: "/azure-ml/"
+    schema:
+      type: "SoftwareApplication"
+      id: "https://docs.microsoft.com/azure/machine-learning/"
+      name: "Azure Machine Learning"
+      description: "Cloud-based machine learning service"
+      applicationCategory: "AI/ML"
+      sameAs: "https://www.wikidata.org/wiki/Q85754434"
+
+  - id: gcp_vertex_ai
+    patterns:
+      - "vertex ai"
+      - "gcp:vertexai"
+      - "google vertex"
+    url_pattern: "/vertex-ai/"
+    schema:
+      type: "SoftwareApplication"
+      id: "https://cloud.google.com/vertex-ai/docs"
+      name: "Google Vertex AI"
+      description: "Unified AI platform for ML workflows"
+      applicationCategory: "AI/ML"
+      sameAs: "https://www.wikidata.org/wiki/Q107417512"
+
+  # Container Orchestration Services (moved to main sections above)
+  # Observability Platforms
+  - id: datadog
+    patterns:
+      - "datadog"
+      - "dd:"
+    url_pattern: "/datadog/"
+    schema:
+      type: "SoftwareApplication"
+      id: "https://www.datadoghq.com/"
+      name: "Datadog"
+      description: "Monitoring and Analytics Platform"
+      applicationCategory: "Observability"
+      sameAs: "https://www.wikidata.org/wiki/Q5227881"
+
+  - id: new_relic
+    patterns:
+      - "new relic"
+      - "newrelic"
+    url_pattern: "/newrelic/"
+    schema:
+      type: "SoftwareApplication"
+      id: "https://newrelic.com/"
+      name: "New Relic"
+      description: "Application Performance Monitoring"
+      applicationCategory: "Observability"
+      sameAs: "https://www.wikidata.org/wiki/Q1983322"
+
+  - id: grafana
+    patterns:
+      - "grafana"
+    url_pattern: "/grafana/"
+    schema:
+      type: "SoftwareApplication"
+      id: "https://grafana.com/"
+      name: "Grafana"
+      description: "Open source analytics and monitoring"
+      applicationCategory: "Observability"
+      sameAs: "https://www.wikidata.org/wiki/Q19881875"
+
+  # Edge Computing
+  - id: aws_cloudfront
+    patterns:
+      - "cloudfront"
+      - "aws:cloudfront"
+    url_pattern: "/cloudfront/"
+    schema:
+      type: "SoftwareApplication"
+      id: "https://docs.aws.amazon.com/cloudfront/"
+      name: "Amazon CloudFront"
+      description: "Content Delivery Network"
+      applicationCategory: "CDN"
+      sameAs: "https://www.wikidata.org/wiki/Q4740915"
+
+  - id: azure_frontdoor
+    patterns:
+      - "front door"
+      - "azure:frontdoor"
+      - "azure front door"
+    url_pattern: "/frontdoor/"
+    schema:
+      type: "SoftwareApplication"
+      id: "https://docs.microsoft.com/azure/frontdoor/"
+      name: "Azure Front Door"
+      description: "Global content delivery network"
+      applicationCategory: "CDN"
+      sameAs: "https://www.wikidata.org/wiki/Q104767091"
diff --git a/layouts/partials/head.html b/layouts/partials/head.html
index f1cf4ab607e1..0ba508c19da8 100644
--- a/layouts/partials/head.html
+++ b/layouts/partials/head.html
@@ -53,169 +53,8 @@
         <meta name="robots" content="noindex" />
     {{ end }}
 
-    <!-- Organization schema for google -->
-    {{ if eq .Params.include_organization_schema true }}
-        <script type="application/ld+json">
-            {
-                "@context": "https://schema.org",
-                "@type": "Corporation",
-                "name": "Pulumi",
-                "@id": "https://www.pulumi.com/product/",
-                "description": "Pulumi lets engineers deliver infrastructure as code faster, using any programming language. The Pulumi Platform enables customers to manage 10x more resources at lower cost than traditional tools, while Pulumi Insights unlocks analytics and search across cloud infrastructure, and enables novel AI-driven infrastructure automation.",
-                "logo": "https://camo.githubusercontent.com/ffc5afc9f46a37b2f0d286d9d0af06786843507b2ddc162cdb41ef6a08f3b5ab/68747470733a2f2f7777772e70756c756d692e636f6d2f696d616765732f6c6f676f2f6c6f676f2d6f6e2d77686974652d626f782e7376673f",
-                "foundingDate" : "2017",
-                "address": {
-                    "@type": "PostalAddress",
-                    "addressLocality": "Seattle, WA",
-                    "addressCountry": "United States",
-                    "postalCode": "98101",
-                    "streetAddress": "1525” 4th Ave. Suite 800"
-                },
-                "email": "mailto:team@pulumi.com",
-                "url": "https://www.pulumi.com",
-                "sameAs": [
-                    "https://twitter.com/PulumiCorp",
-                    "https://www.linkedin.com/company/pulumi",
-                    "https://www.youtube.com/channel/UC2Dhyn4Ev52YSbcpfnfP0Mw",
-                    "https://github.com/pulumi/pulumi"
-                ]
-            }
-        </script>
-    {{ end }}
-
-
-    <!-- Workshop info for Google events. -->
-    {{ if .Params.event_data }}
-        <script type="application/ld+json">
-            {
-                "@context": "https://schema.org",
-                "@type": "Event",
-                "name": "{{ .Params.event_data.name }}",
-                "startDate": "{{ .Params.event_data.start_date }}",
-                "endDate": "{{ .Params.event_data.end_date }}",
-                "eventStatus": "https://schema.org/EventScheduled",
-                "eventAttendanceMode": "https://schema.org/OnlineEventAttendanceMode",
-                "location": {
-                  "@type": "VirtualLocation",
-                  "url": {{ .Params.event_data.url }}
-                },
-                "description": "{{ .Params.event_data.description }}",
-                "organizer": {
-                  "@type": "Organization",
-                  "name": "Pulumi",
-                  "url": "https://pulumi.com"
-                }
-              }
-        </script>
-    {{ end }}
-    
-    <!-- BlogPosting schema for blog posts -->
-    {{ if and (eq .Type "blog") .IsPage }}
-        <script type="application/ld+json">
-            {
-                "@context": "https://schema.org",
-                "@type": "BlogPosting",
-                "headline": "{{ .Title }}",
-                "datePublished": "{{ .Date.Format "2006-01-02T15:04:05Z07:00" }}",
-                {{ if .Lastmod }}
-                "dateModified": "{{ .Lastmod.Format "2006-01-02T15:04:05Z07:00" }}",
-                {{ else }}
-                "dateModified": "{{ .Date.Format "2006-01-02T15:04:05Z07:00" }}",
-                {{ end }}
-                "mainEntityOfPage": {
-                    "@type": "WebPage",
-                    "@id": "{{ .Permalink }}"
-                },
-                "description": "{{ with .Params.meta_desc }}{{ . }}{{ else }}{{ .Summary }}{{ end }}",
-                {{ if .Params.meta_image }}
-                    {{ if in "blog templates" .Section }}
-                        "image": "{{ (.Resources.GetMatch .Params.meta_image).Permalink }}",
-                    {{ else }}
-                        "image": "{{ .Params.meta_image | absURL }}",
-                    {{ end }}
-                {{ else }}
-                    "image": "{{ "/logos/brand/og-default.png" | absURL }}",
-                {{ end }}
-                "url": "{{ .Permalink }}",
-                "wordCount": "{{ .WordCount }}",
-                "publisher": {
-                    "@type": "Organization",
-                    "name": "Pulumi",
-                    "logo": {
-                        "@type": "ImageObject",
-                        "url": "{{ "/logos/logo.svg" | absURL }}"
-                    }
-                },
-                {{ if .Params.authors }}
-                    "author": [
-                        {{ $authorLen := len .Params.authors }}
-                        {{ range $index, $authorID := .Params.authors }}
-                            {{ with $authorData := index $.Site.Data.team.team $authorID }}
-                            {
-                                "@type": "Person",
-                                "name": "{{ $authorData.name }}"
-                                {{ if $authorData.title }}, "jobTitle": "{{ $authorData.title }}"{{ end }}
-                                {{ if $authorData.social }}
-                                    {{ if $authorData.social.twitter }}, "sameAs": "https://twitter.com/{{ $authorData.social.twitter }}"{{ end }}
-                                {{ end }}
-                            }{{ if ne (add $index 1) $authorLen }},{{ end }}
-                            {{ end }}
-                        {{ end }}
-                    ],
-                {{ else }}
-                    "author": {
-                        "@type": "Organization",
-                        "name": "Pulumi"
-                    },
-                {{ end }}
-                {{ if .Params.tags }}
-                    "keywords": "{{ delimit .Params.tags ", " }}"
-                {{ end }}
-            }
-        </script>
-    {{ end }}
-
-    <!-- Event info for Google events (in-person exhibitions)-->
-    {{ if .Params.exhibition_data }}
-        {{ with .Params.exhibition_data }}
-            <script type="application/ld+json">
-                {
-                    "@context": "https://schema.org",
-                    "@type": "ExhibitionEvent",
-                    "name": "{{ .name }}",
-                    "description": "{{ .description }}",
-                    "startDate": "{{ .start_date }}",
-                    "endDate": "{{ .end_date }}",
-                    "location": {
-                      "@type": "Place",
-                      "name": "{{ .location.name }}",
-                      "address": {
-                        "@type": "PostalAddress",
-                        "streetAddress": "{{ .location.address.street }}",
-                        "addressLocality": "{{ .location.address.locality }}",
-                        "addressRegion": "{{ .location.address.region }}",
-                        "postalCode": "{{ .location.address.postal_code }}",
-                        "addressCountry": "{{ .location.address.country }}"
-                      }
-                    },
-                    "organizer": {
-                      "@type": "Organization",
-                      "name": "{{ .organizer.name }}",
-                      "url": {{ .organizer.url }}
-                    },
-                    "exhibitor": {
-                      "@type": "Organization",
-                      "name": "Pulumi",
-                      "url": "https://pulumi.com",
-                      "description": "Pulumi helps teams create, deploy, and manage modern cloud applications using infrastructure as code."
-                    },
-                    "boothNumber": "{{ .booth }}",
-                    "eventStatus": "https://schema.org/EventScheduled",
-                    "eventAttendanceMode": "https://schema.org/OfflineEventAttendanceMode"
-                }
-            </script>
-        {{ end }}
-    {{ end }}
+    <!-- Structured Data Schemas -->
+    {{ partial "schema/loader.html" . }}
 
 
     <!--
diff --git a/layouts/partials/schema/base/breadcrumb.html b/layouts/partials/schema/base/breadcrumb.html
new file mode 100644
index 000000000000..9092ed1f5cdd
--- /dev/null
+++ b/layouts/partials/schema/base/breadcrumb.html
@@ -0,0 +1,84 @@
+{{/* Automatic Breadcrumb Generator - Creates navigation hierarchy for all pages */}}
+
+{{ $breadcrumbs := slice }}
+{{ $position := 1 }}
+
+{{/* Always start with home */}}
+{{ $breadcrumbs = $breadcrumbs | append (dict
+  "@type" "ListItem"
+  "position" $position
+  "name" "Home"
+  "item" "https://www.pulumi.com"
+) }}
+
+{{/* Build breadcrumbs from URL path */}}
+{{ $currentPath := "" }}
+{{ $pathSegments := split (trim .RelPermalink "/") "/" }}
+
+{{ range $index, $segment := $pathSegments }}
+  {{ if $segment }}
+    {{ $position = add $position 1 }}
+    {{ $currentPath = printf "%s/%s" $currentPath $segment }}
+    
+    {{/* Get proper name for segment */}}
+    {{ $name := humanize $segment }}
+    
+    {{/* Try to get actual page title */}}
+    {{ with $.Site.GetPage $currentPath }}
+      {{ $name = .Title }}
+    {{ else }}
+      {{/* Common path name mappings */}}
+      {{ $nameMap := dict
+        "docs" "Documentation"
+        "blog" "Blog"
+        "tutorials" "Tutorials"
+        "reference" "API Reference"
+        "pkg" "Packages"
+        "esc" "Pulumi ESC"
+        "iac" "Infrastructure as Code"
+        "guides" "Guides"
+        "get-started" "Getting Started"
+        "aws" "AWS"
+        "azure" "Azure"
+        "gcp" "Google Cloud"
+        "kubernetes" "Kubernetes"
+        "product" "Products"
+        "pricing" "Pricing"
+        "events" "Events"
+        "careers" "Careers"
+        "templates" "Templates"
+        "case-studies" "Case Studies"
+        "webinars" "Webinars"
+        "pulumi-cloud" "Pulumi Cloud"
+      }}
+      {{ with index $nameMap $segment }}
+        {{ $name = . }}
+      {{ end }}
+    {{ end }}
+    
+    {{/* Create breadcrumb item */}}
+    {{ $item := dict
+      "@type" "ListItem"
+      "position" $position
+      "name" $name
+    }}
+    
+    {{/* Add URL for all items except the current page (last item) */}}
+    {{ if ne $index (sub (len $pathSegments) 1) }}
+      {{ $item = merge $item (dict "item" (printf "https://www.pulumi.com%s/" $currentPath)) }}
+    {{ end }}
+    
+    {{ $breadcrumbs = $breadcrumbs | append $item }}
+  {{ end }}
+{{ end }}
+
+{{/* Only output if we have more than just home */}}
+{{ if gt (len $breadcrumbs) 1 }}
+<script type="application/ld+json">
+{
+  "@context": "https://schema.org",
+  "@type": "BreadcrumbList",
+  "itemListElement": {{ $breadcrumbs | jsonify | safeJS }}
+}
+</script>
+{{ end }}
diff --git a/layouts/partials/schema/base/organization.html b/layouts/partials/schema/base/organization.html
new file mode 100644
index 000000000000..7120c34cd6d7
--- /dev/null
+++ b/layouts/partials/schema/base/organization.html
@@ -0,0 +1,63 @@
+{{/* Enhanced Organization Schema - Singleton with knowledge graph properties */}}
+
+{{/* Only output full schema on homepage or pages with the flag (backward compatibility) */}}
+{{ if or .IsHome (eq .Params.include_organization_schema true) }}
+<script type="application/ld+json">
+{
+  "@context": "https://schema.org",
+  "@type": ["Organization", "Corporation"],
+  "@id": "https://www.pulumi.com/#organization",
+  "name": "Pulumi Corporation",
+  "legalName": "Pulumi Corporation",
+  "alternateName": "Pulumi",
+  "url": "https://www.pulumi.com",
+  "logo": {
+    "@type": "ImageObject",
+    "url": "https://www.pulumi.com/logos/brand/logo.png",
+    "width": 600,
+    "height": 60
+  },
+  "description": "Pulumi enables cloud infrastructure teams to define, deploy, and manage cloud resources using familiar programming languages. The Pulumi Platform enables customers to manage 10x more resources at lower cost than traditional tools.",
+  "foundingDate": "2017",
+  "founders": [
+    {"@type": "Person", "name": "Joe Duffy"},
+    {"@type": "Person", "name": "Eric Rudder"}
+  ],
+  "address": {
+    "@type": "PostalAddress",
+    "streetAddress": "601 Union St Suite 1415",
+    "addressLocality": "Seattle",
+    "addressRegion": "WA",
+    "postalCode": "98101",
+    "addressCountry": "US"
+  },
+  "email": "team@pulumi.com",
+  "contactPoint": {
+    "@type": "ContactPoint",
+    "contactType": "sales",
+    "email": "sales@pulumi.com",
+    "url": "https://www.pulumi.com/contact"
+  },
+  "sameAs": [
+    "https://github.com/pulumi",
+    "https://twitter.com/PulumiCorp",
+    "https://www.linkedin.com/company/pulumi",
+    "https://www.youtube.com/channel/UC2Dhyn4Ev52YSbcpfnfP0Mw"
+  ],
+  "knowsAbout": [
+    "Infrastructure as Code",
+    "Cloud Computing",
+    "DevOps",
+    "Platform Engineering",
+    "Cloud Security",
+    "Kubernetes",
+    "Serverless Computing",
+    "Multi-Cloud Architecture"
+  ],
+  "owns": {
+    "@type": "SoftwareApplication",
+    "@id": "https://www.pulumi.com/#pulumi-cli"
+  }
+}
+</script>
+{{ end }}
diff --git a/layouts/partials/schema/base/software-app.html b/layouts/partials/schema/base/software-app.html
new file mode 100644
index 000000000000..5ba917a3bda8
--- /dev/null
+++ b/layouts/partials/schema/base/software-app.html
@@ -0,0 +1,30 @@
+{{/* SoftwareApplication Schema for Pulumi CLI - Required for software rich results */}}
+<script type="application/ld+json">
+{
+  "@context": "https://schema.org",
+  "@type": "SoftwareApplication",
+  "@id": "https://www.pulumi.com/#pulumi-cli",
+  "name": "Pulumi CLI",
+  "alternateName": "Pulumi",
+  "description": "Open source infrastructure as code SDK. Deploy cloud resources using TypeScript, Python, Go, C#, Java, or YAML. Build on AWS, Azure, Google Cloud, Kubernetes, and 150+ providers.",
+  "applicationCategory": "DeveloperApplication",
+  "applicationSubCategory": "Infrastructure as Code",
+  "operatingSystem": ["Windows", "macOS", "Linux"],
+  "offers": {
+    "@type": "Offer",
+    "price": "0",
+    "priceCurrency": "USD",
+    "availability": "https://schema.org/InStock"
+  },
+  "softwareVersion": "{{ .Site.Params.schema.pulumi_version | default "3.198.0" }}",
+  "downloadUrl": "https://get.pulumi.com/",
+  "installUrl": "https://www.pulumi.com/docs/iac/download-install/",
+  "releaseNotes": "https://www.pulumi.com/docs/reference/changelog/",
+  "softwareRequirements": "Node.js 18+ or Python 3.8+ or Go 1.21+ or .NET 6+ or Java 11+",
+  "license": "Apache-2.0",
+  "url": "https://github.com/pulumi/pulumi",
+  "creator": {"@id": "https://www.pulumi.com/#organization"},
+  "maintainer": {"@id": "https://www.pulumi.com/#organization"},
+  "keywords": "infrastructure as code, IaC, cloud, DevOps, automation"
+}
+</script>
diff --git a/layouts/partials/schema/base/website.html b/layouts/partials/schema/base/website.html
new file mode 100644
index 000000000000..a9f9910f736b
--- /dev/null
+++ b/layouts/partials/schema/base/website.html
@@ -0,0 +1,34 @@
+{{/* WebSite Schema with SearchAction - For AI and search engines to understand site structure */}}
+<script type="application/ld+json">
+{
+  "@context": "https://schema.org",
+  "@type": "WebSite",
+  "@id": "https://www.pulumi.com/#website",
+  "name": "Pulumi",
+  "alternateName": "Pulumi IaC Platform",
+  "url": "https://www.pulumi.com",
+  "description": "Infrastructure as Code platform with AI. Deploy to any cloud using TypeScript, Python, Go, C#, Java, or YAML.",
+  "inLanguage": "en-US",
+  "publisher": {"@id": "https://www.pulumi.com/#organization"},
+  "potentialAction": {
+    "@type": "SearchAction",
+    "target": {
+      "@type": "EntryPoint",
+      "urlTemplate": "https://www.pulumi.com/search/?q={search_term_string}"
+    },
+    "query-input": "required name=search_term_string"
+  },
+  "about": {
+    "@type": "Thing",
+    "name": "Infrastructure as Code",
+    "description": "Managing cloud infrastructure through code instead of manual processes"
+  },
+  "mentions": [
+    {"@type": "Thing", "name": "Amazon Web Services", "sameAs": "https://aws.amazon.com"},
+    {"@type": "Thing", "name": "Microsoft Azure", "sameAs": "https://azure.microsoft.com"},
+    {"@type": "Thing", "name": "Google Cloud Platform", "sameAs": "https://cloud.google.com"},
+    {"@type": "Thing", "name": "Kubernetes", "sameAs": "https://kubernetes.io"},
+    {"@type": "Thing", "name": "Docker", "sameAs": "https://docker.com"}
+  ]
+}
+</script>
diff --git a/layouts/partials/schema/collectors/article-entity.html b/layouts/partials/schema/collectors/article-entity.html
new file mode 100644
index 000000000000..724b7c62468e
--- /dev/null
+++ b/layouts/partials/schema/collectors/article-entity.html
@@ -0,0 +1,123 @@
+{{/* Returns TechArticle entity for @graph */}}
+
+{{/* Get content for analysis */}}
+{{ $content := .Content | plainify }}
+{{ $wordCount := $content | countwords }}
+{{ if not $wordCount }}
+  {{ $wordCount = 500 }}
+{{ end }}
+
+{{/* Build TechArticle entity */}}
+{{ $schema := dict
+  "@type" "TechArticle"
+  "@id" "#main-content"
+  "headline" .Title
+  "url" .Permalink
+  "wordCount" $wordCount
+  "inLanguage" "en-US"
+}}
+
+{{/* Add dates with proper fallback handling */}}
+{{ $publishDate := .PublishDate }}
+{{ $modifiedDate := .Lastmod }}
+
+{{/* Fix invalid dates */}}
+{{ if or (not $publishDate) (eq ($publishDate.Format "2006-01-02") "0001-01-01") }}
+  {{ if and .GitInfo .GitInfo.AuthorDate }}
+    {{ $publishDate = .GitInfo.AuthorDate }}
+  {{ else }}
+    {{ $publishDate = now }}
+  {{ end }}
+{{ end }}
+
+{{ if or (not $modifiedDate) (eq ($modifiedDate.Format "2006-01-02") "0001-01-01") }}
+  {{ if and .GitInfo .GitInfo.AuthorDate }}
+    {{ $modifiedDate = .GitInfo.AuthorDate }}
+  {{ else }}
+    {{ $modifiedDate = $publishDate }}
+  {{ end }}
+{{ end }}
+
+{{ $schema = merge $schema (dict
+  "datePublished" ($publishDate.Format "2006-01-02T15:04:05Z07:00")
+  "dateModified" ($modifiedDate.Format "2006-01-02T15:04:05Z07:00")
+) }}
+
+{{/* Add description */}}
+{{ with (or .Params.meta_desc .Summary) }}
+  {{ $schema = merge $schema (dict "description" .) }}
+{{ end }}
+
+{{/* Add image */}}
+{{ $image := "" }}
+{{ if .Params.meta_image }}
+  {{/* Fix URL concatenation to avoid double slashes */}}
+  {{ $baseURL := .Permalink }}
+  {{ if not (strings.HasSuffix $baseURL "/") }}
+    {{ $baseURL = printf "%s/" $baseURL }}
+  {{ end }}
+  {{ $imagePath := .Params.meta_image }}
+  {{ if strings.HasPrefix $imagePath "/" }}
+    {{ $imagePath = strings.TrimPrefix "/" $imagePath }}
+  {{ end }}
+  {{ $image = printf "%s%s" $baseURL $imagePath }}
+{{ else if in .RelPermalink "/docs/clouds/aws/" }}
+  {{ $image = "https://www.pulumi.com/images/docs/meta-images/docs-clouds-aws-meta-image.png" }}
+{{ else }}
+  {{ $image = "https://www.pulumi.com/images/docs/meta-images/docs-meta.png" }}
+{{ end }}
+{{ $schema = merge $schema (dict "image" (slice $image)) }}
+
+{{/* Add keywords */}}
+{{ $schema = merge $schema (dict "keywords" "infrastructure as code, cloud, devops, automation") }}
+
+{{/* Calculate reading time */}}
+{{ $readTime := div $wordCount 200 }}
+{{ if lt $readTime 1 }}{{ $readTime = 1 }}{{ end }}
+{{ $duration := printf "PT%dM" $readTime }}
+{{ $schema = merge $schema (dict "timeRequired" $duration) }}
+
+{{/* Add author as organization for docs */}}
+{{ $schema = merge $schema (dict
+  "author" (dict "@id" "https://www.pulumi.com/#organization")
+) }}
+
+{{/* Add publisher reference */}}
+{{ $schema = merge $schema (dict
+  "publisher" (dict "@id" "https://www.pulumi.com/#organization")
+) }}
+
+{{/* Add speakable for voice search */}}
+{{ $schema = merge $schema (dict "speakable" (dict
+  "@type" "SpeakableSpecification"
+  "cssSelector" (slice "h1" "h2" "p:first-of-type")
+)) }}
+
+{{/* Add about field */}}
+{{ $schema = merge $schema (dict
+  "about" (dict
+    "@type" "SoftwareApplication"
+    "@id" "https://www.pulumi.com/#pulumi-cli"
+  )
+) }}
+
+{{/* Add article body (truncated for schema) */}}
+{{ $articleBody := $content | truncate 5000 }}
+{{ $schema = merge $schema (dict "articleBody" $articleBody) }}
+
+{{/* Add mainEntityOfPage reference */}}
+{{ $schema = merge $schema (dict
+  "mainEntityOfPage" (dict "@id" (printf "%s#webpage" .Permalink))
+) }}
+
+{{/* Add citation for official documentation */}}
+{{ $schema = merge $schema (dict
+  "citation" (dict
+    "@type" "CreativeWork"
+    "name" "Pulumi Official Documentation"
+    "publisher" (dict "@id" "https://www.pulumi.com/#organization")
+    "url" "https://www.pulumi.com/docs/"
+  )
+) }}
+
+{{ return $schema }}
\ No newline at end of file
diff --git a/layouts/partials/schema/collectors/blog-entity.html b/layouts/partials/schema/collectors/blog-entity.html
new file mode 100644
index 000000000000..f68792da9180
--- /dev/null
+++ b/layouts/partials/schema/collectors/blog-entity.html
@@ -0,0 +1,130 @@
+{{/* Returns BlogPosting entity for @graph */}}
+
+{{/* Get content for analysis */}}
+{{ $content := .Content | plainify }}
+{{ $wordCount := $content | countwords }}
+{{ if not $wordCount }}
+  {{ $wordCount = 500 }}
+{{ end }}
+
+{{/* Build BlogPosting entity */}}
+{{ $schema := dict
+  "@type" "BlogPosting"
+  "@id" "#main-content"
+  "headline" .Title
+  "url" .Permalink
+  "wordCount" $wordCount
+  "inLanguage" "en-US"
+  "articleSection" "Engineering Blog"
+}}
+
+{{/* Add dates with proper fallback handling */}}
+{{ $publishDate := .PublishDate }}
+{{ $modifiedDate := .Lastmod }}
+
+{{/* Fix invalid dates */}}
+{{ if or (not $publishDate) (eq ($publishDate.Format "2006-01-02") "0001-01-01") }}
+  {{ if and .GitInfo .GitInfo.AuthorDate }}
+    {{ $publishDate = .GitInfo.AuthorDate }}
+  {{ else }}
+    {{ $publishDate = now }}
+  {{ end }}
+{{ end }}
+
+{{ if or (not $modifiedDate) (eq ($modifiedDate.Format "2006-01-02") "0001-01-01") }}
+  {{ if and .GitInfo .GitInfo.AuthorDate }}
+    {{ $modifiedDate = .GitInfo.AuthorDate }}
+  {{ else }}
+    {{ $modifiedDate = $publishDate }}
+  {{ end }}
+{{ end }}
+
+{{ $schema = merge $schema (dict
+  "datePublished" ($publishDate.Format "2006-01-02T15:04:05Z07:00")
+  "dateModified" ($modifiedDate.Format "2006-01-02T15:04:05Z07:00")
+) }}
+
+{{/* Add description */}}
+{{ with (or .Params.meta_desc .Summary) }}
+  {{ $schema = merge $schema (dict "description" .) }}
+{{ end }}
+
+{{/* Add image */}}
+{{ $image := "" }}
+{{ if .Params.meta_image }}
+  {{/* Fix URL concatenation to avoid double slashes */}}
+  {{ $baseURL := .Permalink }}
+  {{ if not (strings.HasSuffix $baseURL "/") }}
+    {{ $baseURL = printf "%s/" $baseURL }}
+  {{ end }}
+  {{ $imagePath := .Params.meta_image }}
+  {{ if strings.HasPrefix $imagePath "/" }}
+    {{ $imagePath = strings.TrimPrefix "/" $imagePath }}
+  {{ end }}
+  {{ $image = printf "%s%s" $baseURL $imagePath }}
+{{ else }}
+  {{ $image = "https://www.pulumi.com/images/docs/meta-images/docs-meta.png" }}
+{{ end }}
+{{ $schema = merge $schema (dict "image" $image) }}
+
+{{/* Add keywords from tags */}}
+{{ with .Params.tags }}
+  {{ $keywords := delimit . ", " }}
+  {{ $schema = merge $schema (dict "keywords" $keywords) }}
+{{ end }}
+
+{{/* Add author */}}
+{{ $authors := slice }}
+{{ with .Params.authors }}
+  {{ range . }}
+    {{ $authorName := . }}
+    {{ $authorEntity := dict
+      "@type" "Person"
+      "@id" (printf "https://www.pulumi.com/authors/%s/#person" (. | urlize))
+      "name" $authorName
+      "url" (printf "https://www.pulumi.com/authors/%s/" (. | urlize))
+      "worksFor" (dict "@id" "https://www.pulumi.com/#organization")
+    }}
+    {{ $authors = $authors | append $authorEntity }}
+  {{ end }}
+{{ else }}
+  {{ $authors = $authors | append (dict
+    "@type" "Person"
+    "name" "Pulumi Team"
+    "worksFor" (dict "@id" "https://www.pulumi.com/#organization")
+  ) }}
+{{ end }}
+{{ if $authors }}
+  {{ $schema = merge $schema (dict "author" $authors) }}
+{{ end }}
+
+{{/* Add publisher reference */}}
+{{ $schema = merge $schema (dict
+  "publisher" (dict "@id" "https://www.pulumi.com/#organization")
+) }}
+
+{{/* Add speakable for voice search */}}
+{{ $schema = merge $schema (dict "speakable" (dict
+  "@type" "SpeakableSpecification"
+  "cssSelector" (slice "article h1" "article h2" "article p:first-of-type")
+)) }}
+
+{{/* Add about field for main topic */}}
+{{ $schema = merge $schema (dict
+  "about" (dict
+    "@type" "Thing"
+    "@id" "https://www.pulumi.com/#pulumi-cli"
+    "name" "Infrastructure as Code"
+  )
+) }}
+
+{{/* Add article body (truncated for schema) */}}
+{{ $articleBody := $content | truncate 5000 }}
+{{ $schema = merge $schema (dict "articleBody" $articleBody) }}
+
+{{/* Add mainEntityOfPage reference */}}
+{{ $schema = merge $schema (dict
+  "mainEntityOfPage" (dict "@id" (printf "%s#webpage" .Permalink))
+) }}
+
+{{ return $schema }}
\ No newline at end of file
diff --git a/layouts/partials/schema/collectors/breadcrumb-entity.html b/layouts/partials/schema/collectors/breadcrumb-entity.html
new file mode 100644
index 000000000000..90beea106d21
--- /dev/null
+++ b/layouts/partials/schema/collectors/breadcrumb-entity.html
@@ -0,0 +1,111 @@
+{{/* Returns breadcrumb entity for @graph (not full JSON-LD) */}}
+
+{{ $breadcrumbs := slice }}
+{{ $position := 0 }}
+
+{{/* Home is always the first item */}}
+{{ $position = add $position 1 }}
+{{ $breadcrumbs = $breadcrumbs | append (dict
+  "@type" "ListItem"
+  "position" $position
+  "name" "Home"
+  "item" "https://www.pulumi.com"
+) }}
+
+{{/* Process parent sections */}}
+{{ if eq .Type "blog" }}
+  {{ $position = add $position 1 }}
+  {{ $breadcrumbs = $breadcrumbs | append (dict
+    "@type" "ListItem"
+    "position" $position
+    "name" "Blog"
+    "item" "https://www.pulumi.com/blog/"
+  ) }}
+
+{{ else if eq .Type "tutorials" }}
+  {{ $position = add $position 1 }}
+  {{ $breadcrumbs = $breadcrumbs | append (dict
+    "@type" "ListItem"
+    "position" $position
+    "name" "Pulumi Tutorials"
+    "item" "https://www.pulumi.com/tutorials/"
+  ) }}
+
+{{ else if eq .Type "docs" }}
+  {{/* Build docs hierarchy */}}
+  {{ $position = add $position 1 }}
+  {{ $breadcrumbs = $breadcrumbs | append (dict
+    "@type" "ListItem"
+    "position" $position
+    "name" "Documentation"
+    "item" "https://www.pulumi.com/docs/"
+  ) }}
+
+  {{/* Add Pulumi IaC if in the docs/iac section */}}
+  {{ if in .RelPermalink "/docs/iac/" }}
+    {{ $position = add $position 1 }}
+    {{ $breadcrumbs = $breadcrumbs | append (dict
+      "@type" "ListItem"
+      "position" $position
+      "name" "Pulumi IaC"
+      "item" "https://www.pulumi.com/docs/iac/"
+    ) }}
+
+    {{/* Add Clouds if in clouds section */}}
+    {{ if in .RelPermalink "/docs/iac/clouds/" }}
+      {{ $position = add $position 1 }}
+      {{ $breadcrumbs = $breadcrumbs | append (dict
+        "@type" "ListItem"
+        "position" $position
+        "name" "Clouds"
+        "item" "https://www.pulumi.com/docs/iac/clouds/"
+      ) }}
+
+      {{/* Add specific cloud provider */}}
+      {{ if in .RelPermalink "/clouds/aws/" }}
+        {{ $position = add $position 1 }}
+        {{ $breadcrumbs = $breadcrumbs | append (dict
+          "@type" "ListItem"
+          "position" $position
+          "name" "AWS"
+          "item" "https://www.pulumi.com/docs/iac/clouds/aws/"
+        ) }}
+
+        {{/* Add Guides if in guides section */}}
+        {{ if in .RelPermalink "/guides/" }}
+          {{ $position = add $position 1 }}
+          {{ $breadcrumbs = $breadcrumbs | append (dict
+            "@type" "ListItem"
+            "position" $position
+            "name" "Guides"
+            "item" "https://www.pulumi.com/docs/iac/clouds/aws/guides/"
+          ) }}
+        {{ end }}
+      {{ end }}
+    {{ end }}
+  {{ end }}
+
+{{ else if eq .Section "product" }}
+  {{ $position = add $position 1 }}
+  {{ $breadcrumbs = $breadcrumbs | append (dict
+    "@type" "ListItem"
+    "position" $position
+    "name" "Product"
+    "item" "https://www.pulumi.com/product/"
+  ) }}
+{{ end }}
+
+{{/* Add current page (without URL for last item) */}}
+{{ $position = add $position 1 }}
+{{ $breadcrumbs = $breadcrumbs | append (dict
+  "@type" "ListItem"
+  "position" $position
+  "name" .Title
+) }}
+
+{{/* Return breadcrumb entity */}}
+{{ return dict
+  "@type" "BreadcrumbList"
+  "@id" "#breadcrumb"
+  "itemListElement" $breadcrumbs
+}}
\ No newline at end of file
diff --git a/layouts/partials/schema/collectors/course-entity.html b/layouts/partials/schema/collectors/course-entity.html
new file mode 100644
index 000000000000..8bd084e63609
--- /dev/null
+++ b/layouts/partials/schema/collectors/course-entity.html
@@ -0,0 +1,129 @@
+{{/* Returns Course entity for @graph */}}
+
+{{/* Get content for analysis */}}
+{{ $content := .Content | plainify }}
+{{ $wordCount := $content | countwords }}
+{{ if not $wordCount }}
+  {{ $wordCount = 500 }}
+{{ end }}
+
+{{/* Build Course entity */}}
+{{ $schema := dict
+  "@type" "Course"
+  "@id" "#main-content"
+  "name" .Title
+  "url" .Permalink
+  "inLanguage" "en-US"
+  "isAccessibleForFree" true
+}}
+
+{{/* Add description */}}
+{{ $description := or .Params.meta_desc .Summary (printf "Learn %s with this hands-on Pulumi tutorial" .Title) }}
+{{ $schema = merge $schema (dict "description" $description) }}
+
+{{/* Add image */}}
+{{ $image := "" }}
+{{ if .Params.meta_image }}
+  {{ $image = printf "%s%s" .Permalink .Params.meta_image }}
+{{ else }}
+  {{ $image = "https://www.pulumi.com/images/docs/meta-images/docs-meta.png" }}
+{{ end }}
+{{ $schema = merge $schema (dict "image" $image) }}
+
+{{/* Add dates */}}
+{{ $publishDate := .PublishDate }}
+{{ $modifiedDate := .Lastmod }}
+{{ if not $modifiedDate }}
+  {{ $modifiedDate = $publishDate }}
+{{ end }}
+{{ $schema = merge $schema (dict
+  "datePublished" ($publishDate.Format "2006-01-02T15:04:05Z07:00")
+  "dateModified" ($modifiedDate.Format "2006-01-02T15:04:05Z07:00")
+) }}
+
+{{/* Determine educational level */}}
+{{ $level := "Beginner" }}
+{{ if in $content "advanced" }}
+  {{ $level = "Advanced" }}
+{{ else if in $content "intermediate" }}
+  {{ $level = "Intermediate" }}
+{{ end }}
+{{ $schema = merge $schema (dict "educationalLevel" $level) }}
+
+{{/* Auto-detect prerequisites */}}
+{{ $prerequisites := slice }}
+{{ if or (in $content "Pulumi CLI") (in $content "pulumi new") }}
+  {{ $prerequisites = $prerequisites | append "Pulumi CLI installed" }}
+{{ end }}
+{{ if in $content "AWS account" }}
+  {{ $prerequisites = $prerequisites | append "AWS Account" }}
+{{ end }}
+{{ if in $content "Azure account" }}
+  {{ $prerequisites = $prerequisites | append "Azure Account" }}
+{{ end }}
+{{ if in $content "Google Cloud account" }}
+  {{ $prerequisites = $prerequisites | append "Google Cloud Account" }}
+{{ end }}
+{{ if $prerequisites }}
+  {{ $schema = merge $schema (dict "coursePrerequisites" $prerequisites) }}
+{{ end }}
+
+{{/* Determine what the course teaches */}}
+{{ $teaches := slice }}
+{{ if in .Title "AWS" }}
+  {{ $teaches = $teaches | append "AWS Infrastructure" }}
+{{ else if in .Title "Azure" }}
+  {{ $teaches = $teaches | append "Azure Infrastructure" }}
+{{ else if in .Title "GCP" }}
+  {{ $teaches = $teaches | append "Google Cloud Infrastructure" }}
+{{ else if in .Title "Kubernetes" }}
+  {{ $teaches = $teaches | append "Kubernetes" }}
+{{ else }}
+  {{ $teaches = $teaches | append "Infrastructure as Code" }}
+{{ end }}
+{{ $schema = merge $schema (dict "teaches" $teaches) }}
+
+{{/* Calculate duration based on word count */}}
+{{ $readTime := div $wordCount 150 }}
+{{ if lt $readTime 30 }}{{ $readTime = 30 }}{{ end }}
+{{ if gt $readTime 120 }}{{ $readTime = 120 }}{{ end }}
+{{ $duration := printf "PT%dM" $readTime }}
+{{ $schema = merge $schema (dict "timeRequired" $duration) }}
+
+{{/* Add course instance */}}
+{{ $schema = merge $schema (dict "hasCourseInstance" (dict
+  "@type" "CourseInstance"
+  "courseMode" "online"
+  "courseWorkload" $duration
+  "instructor" (dict
+    "@type" "Person"
+    "name" "Pulumi Team"
+    "worksFor" (dict "@id" "https://www.pulumi.com/#organization")
+  )
+)) }}
+
+{{/* Add provider */}}
+{{ $schema = merge $schema (dict "provider" (dict
+  "@type" "Organization"
+  "@id" "https://www.pulumi.com/#organization"
+  "name" "Pulumi"
+  "url" "https://www.pulumi.com"
+)) }}
+
+{{/* Add audience */}}
+{{ $schema = merge $schema (dict "audience" (dict
+  "@type" "Audience"
+  "audienceType" "Developers"
+)) }}
+
+{{/* Add about */}}
+{{ $schema = merge $schema (dict "about" (dict
+  "@type" "Thing"
+  "name" "Infrastructure as Code"
+)) }}
+
+{{/* Add keywords */}}
+{{ $keywords := printf "%s, infrastructure as code, pulumi tutorial" (delimit $teaches ", ") }}
+{{ $schema = merge $schema (dict "keywords" $keywords) }}
+
+{{ return $schema }}
\ No newline at end of file
diff --git a/layouts/partials/schema/collectors/howto-entity.html b/layouts/partials/schema/collectors/howto-entity.html
new file mode 100644
index 000000000000..ec19584e3c32
--- /dev/null
+++ b/layouts/partials/schema/collectors/howto-entity.html
@@ -0,0 +1,200 @@
+{{/* Returns HowTo entity for tutorials in @graph */}}
+
+{{/* Get content for analysis */}}
+{{ $content := .Content | plainify }}
+{{ $wordCount := $content | countwords }}
+{{ if not $wordCount }}
+  {{ $wordCount = 500 }}
+{{ end }}
+
+{{/* Build HowTo entity */}}
+{{ $schema := dict
+  "@type" "HowTo"
+  "@id" "#main-content"
+  "name" .Title
+  "url" .Permalink
+  "inLanguage" "en-US"
+}}
+
+{{/* Add description */}}
+{{ with (or .Params.meta_desc .Summary (printf "Learn how to %s with Pulumi" .Title)) }}
+  {{ $schema = merge $schema (dict "description" .) }}
+{{ end }}
+
+{{/* Generate generic steps for tutorials */}}
+{{/* Since tutorials may not have explicit numbered steps, we create high-level steps */}}
+{{ $steps := slice }}
+
+{{/* Step 1: Prerequisites */}}
+{{ $steps = $steps | append (dict
+  "@type" "HowToStep"
+  "name" "Prerequisites"
+  "text" "Install Pulumi CLI and configure your cloud provider credentials"
+  "position" 1
+) }}
+
+{{/* Step 2: Create Project */}}
+{{ if in $content "pulumi new" }}
+  {{ $steps = $steps | append (dict
+    "@type" "HowToStep"
+    "name" "Create Pulumi Project"
+    "text" "Initialize a new Pulumi project with the appropriate template"
+    "position" 2
+  ) }}
+{{ end }}
+
+{{/* Step 3: Write Infrastructure Code */}}
+{{ $steps = $steps | append (dict
+  "@type" "HowToStep"
+  "name" "Define Infrastructure"
+  "text" "Write infrastructure as code using your preferred programming language"
+  "position" 3
+) }}
+
+{{/* Step 4: Deploy */}}
+{{ if in $content "pulumi up" }}
+  {{ $steps = $steps | append (dict
+    "@type" "HowToStep"
+    "name" "Deploy Infrastructure"
+    "text" "Deploy your infrastructure using pulumi up command"
+    "position" 4
+  ) }}
+{{ end }}
+
+{{/* Step 5: Verify */}}
+{{ $steps = $steps | append (dict
+  "@type" "HowToStep"
+  "name" "Verify Deployment"
+  "text" "Verify your infrastructure was created successfully"
+  "position" 5
+) }}
+
+{{ $schema = merge $schema (dict "step" $steps) }}
+
+{{/* Calculate total time */}}
+{{ $totalTime := "" }}
+{{ with .Params.estimated_time }}
+  {{ $totalTime = printf "PT%dM" . }}
+{{ else with .Params.duration }}
+  {{ $totalTime = . }}
+{{ else }}
+  {{/* Estimate based on word count */}}
+  {{ $minutes := div $wordCount 200 }}
+  {{ if lt $minutes 10 }}{{ $minutes = 10 }}{{ end }}
+  {{ if gt $minutes 60 }}{{ $minutes = 60 }}{{ end }}
+  {{ $totalTime = printf "PT%dM" $minutes }}
+{{ end }}
+{{ $schema = merge $schema (dict "totalTime" $totalTime) }}
+
+{{/* Add tools/prerequisites */}}
+{{ $tools := slice }}
+
+{{/* Auto-detect common tools */}}
+{{ if or (in $content "Pulumi CLI") (in $content "pulumi new") }}
+  {{ $tools = $tools | append (dict
+    "@type" "HowToTool"
+    "name" "Pulumi CLI"
+  ) }}
+{{ end }}
+
+{{ if in $content "AWS account" }}
+  {{ $tools = $tools | append (dict
+    "@type" "HowToTool"
+    "name" "AWS Account"
+  ) }}
+{{ end }}
+
+{{ if in $content "Azure account" }}
+  {{ $tools = $tools | append (dict
+    "@type" "HowToTool"
+    "name" "Azure Account"
+  ) }}
+{{ end }}
+
+{{ if in $content "Google Cloud account" }}
+  {{ $tools = $tools | append (dict
+    "@type" "HowToTool"
+    "name" "Google Cloud Account"
+  ) }}
+{{ end }}
+
+{{ if or (in $content "Node.js") (in $content "npm") }}
+  {{ $tools = $tools | append (dict
+    "@type" "HowToTool"
+    "name" "Node.js"
+  ) }}
+{{ end }}
+
+{{ if in $content "Python" }}
+  {{ $tools = $tools | append (dict
+    "@type" "HowToTool"
+    "name" "Python"
+  ) }}
+{{ end }}
+
+{{ if $tools }}
+  {{ $schema = merge $schema (dict "tool" $tools) }}
+{{ end }}
+
+{{/* Add image */}}
+{{ $image := "" }}
+{{ if .Params.meta_image }}
+  {{/* Fix URL concatenation to avoid double slashes */}}
+  {{ $baseURL := .Permalink }}
+  {{ if not (strings.HasSuffix $baseURL "/") }}
+    {{ $baseURL = printf "%s/" $baseURL }}
+  {{ end }}
+  {{ $imagePath := .Params.meta_image }}
+  {{ if strings.HasPrefix $imagePath "/" }}
+    {{ $imagePath = strings.TrimPrefix "/" $imagePath }}
+  {{ end }}
+  {{ $image = printf "%s%s" $baseURL $imagePath }}
+{{ else }}
+  {{ $image = "https://www.pulumi.com/images/docs/meta-images/docs-meta.png" }}
+{{ end }}
+{{ $schema = merge $schema (dict "image" $image) }}
+
+{{/* Add dates */}}
+{{ $publishDate := .PublishDate }}
+{{ $modifiedDate := .Lastmod }}
+
+{{/* Fix invalid dates */}}
+{{ if or (not $publishDate) (eq ($publishDate.Format "2006-01-02") "0001-01-01") }}
+  {{ if and .GitInfo .GitInfo.AuthorDate }}
+    {{ $publishDate = .GitInfo.AuthorDate }}
+  {{ else }}
+    {{ $publishDate = now }}
+  {{ end }}
+{{ end }}
+
+{{ if or (not $modifiedDate) (eq ($modifiedDate.Format "2006-01-02") "0001-01-01") }}
+  {{ if and .GitInfo .GitInfo.AuthorDate }}
+    {{ $modifiedDate = .GitInfo.AuthorDate }}
+  {{ else }}
+    {{ $modifiedDate = $publishDate }}
+  {{ end }}
+{{ end }}
+
+{{ $schema = merge $schema (dict
+  "datePublished" ($publishDate.Format "2006-01-02T15:04:05Z07:00")
+  "dateModified" ($modifiedDate.Format "2006-01-02T15:04:05Z07:00")
+) }}
+
+{{/* Add keywords */}}
+{{ $keywords := "infrastructure as code, cloud, devops, tutorial, pulumi" }}
+{{ with .Params.tags }}
+  {{ $keywords = delimit . ", " }}
+{{ end }}
+{{ $schema = merge $schema (dict "keywords" $keywords) }}
+
+{{/* Add supply/yield (what the tutorial produces) */}}
+{{ $titleLower := lower .Title }}
+{{ if in $titleLower "creating resources" }}
+  {{ $schema = merge $schema (dict "yield" "Cloud infrastructure resources deployed and managed through code") }}
+{{ else if in $titleLower "import" }}
+  {{ $schema = merge $schema (dict "yield" "Existing infrastructure imported into Pulumi management") }}
+{{ else }}
+  {{ $schema = merge $schema (dict "yield" "Infrastructure deployed using Pulumi") }}
+{{ end }}
+
+{{ return $schema }}
\ No newline at end of file
diff --git a/layouts/partials/schema/collectors/main-entity.html b/layouts/partials/schema/collectors/main-entity.html
new file mode 100644
index 000000000000..1d12e1fd3238
--- /dev/null
+++ b/layouts/partials/schema/collectors/main-entity.html
@@ -0,0 +1,23 @@
+{{/* Returns main content entity based on page type */}}
+
+{{ $entity := dict }}
+
+{{/* Determine entity based on page type */}}
+{{ if and (eq .Type "blog") .IsPage }}
+  {{ $entity = partial "schema/collectors/blog-entity.html" . }}
+
+{{ else if eq .Type "tutorials" }}
+  {{ $entity = partial "schema/collectors/howto-entity.html" . }}
+
+{{ else if eq .Type "docs" }}
+  {{ $entity = partial "schema/collectors/article-entity.html" . }}
+
+{{ else if eq .Section "product" }}
+  {{ $entity = partial "schema/collectors/product-entity.html" . }}
+
+{{ else if .IsHome }}
+  {{/* Homepage doesn't have a main content entity, handled separately in graph-builder */}}
+  {{ $entity = dict }}
+{{ end }}
+
+{{ return $entity }}
\ No newline at end of file
diff --git a/layouts/partials/schema/collectors/product-entity.html b/layouts/partials/schema/collectors/product-entity.html
new file mode 100644
index 000000000000..b1cdb0c9bc2b
--- /dev/null
+++ b/layouts/partials/schema/collectors/product-entity.html
@@ -0,0 +1,101 @@
+{{/* Returns SoftwareApplication entity for product pages in @graph */}}
+
+{{/* Determine product details based on page */}}
+{{ $productName := .Title }}
+{{ $productDescription := or .Params.meta_desc .Summary }}
+{{ $applicationCategory := "DeveloperApplication" }}
+{{ $applicationSubCategory := "" }}
+
+{{/* Product-specific customization for Neo (our test page) */}}
+{{ if in .RelPermalink "/neo/" }}
+  {{ $productName = "Pulumi Neo" }}
+  {{ $productDescription = "AI-powered infrastructure assistant that generates, reviews, and debugs infrastructure code." }}
+  {{ $applicationSubCategory = "AI Assistant" }}
+  {{ $applicationCategory = "ArtificialIntelligenceApplication" }}
+{{ end }}
+
+{{/* Build SoftwareApplication entity */}}
+{{ $schema := dict
+  "@type" "SoftwareApplication"
+  "@id" "#main-content"
+  "name" $productName
+  "description" $productDescription
+  "url" .Permalink
+  "applicationCategory" $applicationCategory
+  "operatingSystem" "Web-based"
+}}
+
+{{/* Add sub-category if defined */}}
+{{ if $applicationSubCategory }}
+  {{ $schema = merge $schema (dict "applicationSubCategory" $applicationSubCategory) }}
+{{ end }}
+
+{{/* Add image */}}
+{{ $image := "" }}
+{{ if .Params.meta_image }}
+  {{/* Fix URL concatenation to avoid double slashes */}}
+  {{ $baseURL := .Permalink }}
+  {{ if not (strings.HasSuffix $baseURL "/") }}
+    {{ $baseURL = printf "%s/" $baseURL }}
+  {{ end }}
+  {{ $imagePath := .Params.meta_image }}
+  {{ if strings.HasPrefix $imagePath "/" }}
+    {{ $imagePath = strings.TrimPrefix "/" $imagePath }}
+  {{ end }}
+  {{ $image = printf "%s%s" $baseURL $imagePath }}
+{{ else }}
+  {{ $image = "https://www.pulumi.com/images/docs/meta-images/docs-meta.png" }}
+{{ end }}
+{{ $schema = merge $schema (dict "image" $image) }}
+
+{{/* Add offer/pricing information */}}
+{{ $schema = merge $schema (dict "offers" (dict
+  "@type" "Offer"
+  "price" "0"
+  "priceCurrency" "USD"
+  "availability" "https://schema.org/InStock"
+  "priceValidUntil" "2025-12-31"
+  "url" (printf "%spricing/" .Permalink)
+)) }}
+
+{{/* Add software requirements */}}
+{{ $schema = merge $schema (dict "softwareRequirements" "Pulumi CLI 3.0+") }}
+
+{{/* Add creator and maintainer */}}
+{{ $schema = merge $schema (dict
+  "creator" (dict "@id" "https://www.pulumi.com/#organization")
+  "maintainer" (dict "@id" "https://www.pulumi.com/#organization")
+  "publisher" (dict "@id" "https://www.pulumi.com/#organization")
+) }}
+
+{{/* Add features for Neo specifically */}}
+{{ if in .RelPermalink "/neo/" }}
+  {{ $features := slice
+    "Infrastructure code generation"
+    "Automated code review"
+    "Error debugging assistance"
+    "Multi-language support"
+    "Cloud provider expertise"
+  }}
+  {{ $schema = merge $schema (dict "featureList" $features) }}
+
+  {{/* Add AI-specific properties */}}
+  {{ $schema = merge $schema (dict
+    "potentialAction" (dict
+      "@type" "UseAction"
+      "name" "Try Pulumi Neo"
+      "url" "https://www.pulumi.com/product/neo/#get-started"
+    )
+  ) }}
+{{ end }}
+
+{{/* Only add aggregateRating if real data is available */}}
+{{/* Removed hardcoded fake ratings - should come from actual user reviews */}}
+
+{{/* Add software version */}}
+{{ $schema = merge $schema (dict "softwareVersion" "1.0") }}
+
+{{/* Note: Programming languages are already covered in featureList as "Multi-language support" */}}
+{{/* supportedLanguage is not a valid property for SoftwareApplication schema type */}}
+
+{{ return $schema }}
\ No newline at end of file
diff --git a/layouts/partials/schema/content/article.html b/layouts/partials/schema/content/article.html
new file mode 100644
index 000000000000..307906104346
--- /dev/null
+++ b/layouts/partials/schema/content/article.html
@@ -0,0 +1,228 @@
+{{/* TechArticle Schema for Documentation - Optimized for AI and technical content */}}
+
+{{ $image := .Params.meta_image | default "/images/docs/meta-images/docs-meta.png" }}
+{{ if not (hasPrefix $image "http") }}
+  {{ $image = printf "https://www.pulumi.com%s" $image }}
+{{ end }}
+
+{{/* Get aggregated content using the content aggregator */}}
+{{ $aggregatedContent := partial "schema/utils/content-aggregator.html" . }}
+{{ $effectiveContent := $aggregatedContent.content }}
+{{ $effectiveWordCount := $aggregatedContent.wordCount }}
+{{ $cloudServicesFromOverview := $aggregatedContent.cloudServices }}
+
+{{/* Auto-detect programming languages from content */}}
+{{ $languages := slice }}
+{{ $content := $effectiveContent | plainify }}
+{{ $rawContent := .Content }}
+{{ if or (in $rawContent "```typescript") (in $rawContent "```ts") (in $rawContent "```javascript") (in $rawContent "```js") }}
+  {{ $languages = $languages | append "TypeScript" }}
+{{ end }}
+{{ if or (in $rawContent "```python") (in $rawContent "```py") }}
+  {{ $languages = $languages | append "Python" }}
+{{ end }}
+{{ if in $rawContent "```go" }}
+  {{ $languages = $languages | append "Go" }}
+{{ end }}
+{{ if or (in $rawContent "```csharp") (in $rawContent "```cs") }}
+  {{ $languages = $languages | append "C#" }}
+{{ end }}
+{{ if in $rawContent "```java" }}
+  {{ $languages = $languages | append "Java" }}
+{{ end }}
+{{ if or (in $rawContent "```yaml") (in $rawContent "```yml") }}
+  {{ $languages = $languages | append "YAML" }}
+{{ end }}
+
+{{/* Override with frontmatter if provided */}}
+{{ with .Params.languages }}
+  {{ $languages = . }}
+{{ end }}
+
+{{/* Auto-detect proficiency level */}}
+{{ $level := "Intermediate" }}
+{{ $titleLower := lower .Title }}
+{{ if or (in $titleLower "getting started") (in $titleLower "introduction") (in $titleLower "basics") (in $titleLower "beginner") }}
+  {{ $level = "Beginner" }}
+{{ else if or (in $titleLower "advanced") (in $titleLower "expert") (in $titleLower "optimization") (in $titleLower "deep dive") }}
+  {{ $level = "Advanced" }}
+{{ end }}
+{{ with .Params.skill_level }}
+  {{ $level = . }}
+{{ end }}
+
+{{/* Get technology entities with Wikipedia/Wikidata links */}}
+{{ $mentions := partial "schema/utils/technology-entities.html" . }}
+
+{{/* Get related content relationships */}}
+{{ $relatedContent := partial "schema/utils/related-content.html" . }}
+
+{{/* Detect cloud providers */}}
+{{ $cloudProviders := partial "schema/utils/cloud-provider-detector.html" . }}
+
+{{/* Extract cloud resource types and services */}}
+{{ $cloudResources := partial "schema/utils/resource-type-extractor.html" . }}
+
+{{/* Detect infrastructure patterns */}}
+{{ $infraPatterns := partial "schema/utils/infrastructure-patterns.html" . }}
+
+{{/* Enhanced date handling with fallbacks */}}
+{{ $publishDate := .Date }}
+{{ $modifiedDate := or .Lastmod .Date }}
+
+{{/* Handle invalid/zero dates with fallbacks */}}
+{{ if or (not $publishDate) (eq ($publishDate.Format "2006-01-02") "0001-01-01") }}
+  {{ if and .GitInfo .GitInfo.AuthorDate }}
+    {{ $publishDate = .GitInfo.AuthorDate }}
+  {{ else }}
+    {{ $publishDate = now }}
+  {{ end }}
+{{ end }}
+
+{{ if or (not $modifiedDate) (eq ($modifiedDate.Format "2006-01-02") "0001-01-01") }}
+  {{ if and .GitInfo .GitInfo.AuthorDate }}
+    {{ $modifiedDate = .GitInfo.AuthorDate }}
+  {{ else }}
+    {{ $modifiedDate = $publishDate }}
+  {{ end }}
+{{ end }}
+
+{{ $schema := dict
+  "@context" "https://schema.org"
+  "@type" "TechArticle"
+  "@id" (printf "%s#article" .Permalink)
+  "headline" (or .Params.h1 .Title)
+  "description" (or .Params.meta_desc .Summary (printf "Learn about %s with Pulumi Infrastructure as Code" .Title))
+  "datePublished" ($publishDate.Format "2006-01-02T15:04:05Z07:00")
+  "dateModified" ($modifiedDate.Format "2006-01-02T15:04:05Z07:00")
+  "author" (dict "@id" "https://www.pulumi.com/#organization")
+  "publisher" (dict "@id" "https://www.pulumi.com/#organization")
+  "image" (slice $image)
+  "mainEntityOfPage" (dict
+    "@type" "WebPage"
+    "@id" .Permalink
+  )
+  "articleBody" (substr $content 0 5000)
+  "wordCount" $effectiveWordCount
+  "inLanguage" "en-US"
+  "speakable" (dict
+    "@type" "SpeakableSpecification"
+    "cssSelector" (slice "h1" "h2" "p:first-of-type")
+  )
+  "about" (dict
+    "@type" "SoftwareApplication"
+    "@id" "https://www.pulumi.com/#pulumi-cli"
+  )
+}}
+
+{{/* Add keywords based on tags or auto-generate */}}
+{{ $keywords := "infrastructure as code, cloud, devops, automation" }}
+{{ with .Params.tags }}
+  {{ $keywords = delimit . ", " }}
+{{ else }}
+  {{ if $languages }}
+    {{ $keywords = printf "infrastructure as code, %s, cloud, devops" (delimit $languages ", ") }}
+  {{ end }}
+{{ end }}
+{{ $schema = merge $schema (dict "keywords" $keywords) }}
+
+{{/* Add programming languages if detected */}}
+{{ if $languages }}
+  {{ $schema = merge $schema (dict "programmingLanguage" $languages) }}
+{{ end }}
+
+{{/* Proficiency level is not a standard schema.org property - removed for compliance */}}
+
+{{/* Add technology entity mentions with Wikipedia/Wikidata links */}}
+{{ $allMentions := $mentions }}
+{{ if $cloudResources.cloudServices }}
+  {{ $allMentions = $allMentions | append $cloudResources.cloudServices }}
+{{ end }}
+{{ if $infraPatterns }}
+  {{ $allMentions = $allMentions | append $infraPatterns }}
+{{ end }}
+
+{{/* Deduplicate mentions by @id or name */}}
+{{/* 
+  Deduplication Algorithm:
+  1. Combine mentions from multiple sources (technology entities, cloud services, infrastructure patterns)
+  2. Use @id as primary identifier (preferred for schema.org entities with Wikidata links)
+  3. Fall back to name for entities without @id
+  4. Build a seen set to track uniqueness
+  5. Only include first occurrence of each entity
+*/}}
+{{ $seenIds := slice }}
+{{ $uniqueMentions := slice }}
+
+{{ range $allMentions }}
+  {{/* Use @id as primary identifier, fall back to name */}}
+  {{ $identifier := or (index . "@id") .name }}
+  
+  {{/* Only add if not seen before */}}
+  {{ if not (in $seenIds $identifier) }}
+    {{ $seenIds = $seenIds | append $identifier }}
+    {{ $uniqueMentions = $uniqueMentions | append . }}
+  {{ end }}
+{{ end }}
+
+{{/* Add mentions/about if there are any unique mentions */}}
+{{ if $uniqueMentions }}
+  {{ $schema = merge $schema (dict "mentions" $uniqueMentions) }}
+{{ end }}
+
+{{/* Add infrastructure patterns as keywords */}}
+{{/* Infrastructure patterns now handled in mentions section for semantic accuracy */}}
+
+{{/* Cloud provider information moved to mentions for semantic accuracy */}}
+
+{{/* Add learning resource schema for tutorials/guides */}}
+{{ if or (in .Section "tutorials") (in .Section "guides") (in .Params.tags "tutorial") }}
+  {{ $schema = merge $schema (dict
+    "@type" (slice "TechArticle" "LearningResource")
+    "learningResourceType" "Tutorial"
+    "educationalLevel" $level
+  ) }}
+{{ end }}
+
+{{/* Add related content (prerequisites, next steps) */}}
+{{ if $relatedContent }}
+  {{ $schema = merge $schema (dict "citation" $relatedContent) }}
+{{ end }}
+
+{{/* Add citation for documentation authority */}}
+{{ $schema = merge $schema (dict "citation" (dict
+  "@type" "CreativeWork"
+  "name" "Pulumi Official Documentation"
+  "url" "https://www.pulumi.com/docs/"
+  "publisher" (dict "@id" "https://www.pulumi.com/#organization")
+)) }}
+
+{{/* Add time to complete for tutorials */}}
+{{ with .Params.estimated_time }}
+  {{ $schema = merge $schema (dict "timeRequired" (printf "PT%dM" .)) }}
+{{ else }}
+  {{/* Auto-estimate based on word count */}}
+  {{ $minutes := div $effectiveWordCount 200 }}
+  {{ if lt $minutes 1 }}{{ $minutes = 1 }}{{ end }}
+  {{ $schema = merge $schema (dict "timeRequired" (printf "PT%dM" $minutes)) }}
+{{ end }}
+
+{{/* Add Pulumi Resources if detected */}}
+{{ if $cloudResources.pulumiResources }}
+  {{ $pulumiServices := slice }}
+  {{ range $cloudResources.pulumiResources }}
+    {{ $pulumiServices = $pulumiServices | append (dict
+      "@type" "SoftwareSourceCode"
+      "name" (printf "pulumi.%s.%s" .provider .resource)
+      "programmingLanguage" $languages
+      "codeRepository" .repository
+    ) }}
+  {{ end }}
+  {{ if $pulumiServices }}
+    {{ $schema = merge $schema (dict "hasPart" $pulumiServices) }}
+  {{ end }}
+{{ end }}
+
+<script type="application/ld+json">
+{{ $schema | jsonify (dict "prefix" "" "indent" "  ") | safeJS }}
+</script>
diff --git a/layouts/partials/schema/content/blog.html b/layouts/partials/schema/content/blog.html
new file mode 100644
index 000000000000..3ff0372cdc9c
--- /dev/null
+++ b/layouts/partials/schema/content/blog.html
@@ -0,0 +1,224 @@
+{{/* Enhanced BlogPosting Schema - Migrated from head.html with AI optimizations */}}
+
+{{ if and (eq .Type "blog") .IsPage }}
+  {{/* Get aggregated content using the content aggregator */}}
+  {{ $aggregatedContent := partial "schema/utils/content-aggregator.html" . }}
+  {{ $effectiveContent := $aggregatedContent.content }}
+  {{ $effectiveWordCount := $aggregatedContent.wordCount }}
+
+  {{/* Enhanced date handling with fallbacks */}}
+  {{ $publishDate := .Date }}
+  {{ $modifiedDate := or .Lastmod .Date }}
+
+  {{/* Handle invalid/zero dates with fallbacks */}}
+  {{ if or (not $publishDate) (eq ($publishDate.Format "2006-01-02") "0001-01-01") }}
+    {{ if and .GitInfo .GitInfo.AuthorDate }}
+      {{ $publishDate = .GitInfo.AuthorDate }}
+    {{ else }}
+      {{ $publishDate = now }}
+    {{ end }}
+  {{ end }}
+
+  {{ if or (not $modifiedDate) (eq ($modifiedDate.Format "2006-01-02") "0001-01-01") }}
+    {{ if and .GitInfo .GitInfo.AuthorDate }}
+      {{ $modifiedDate = .GitInfo.AuthorDate }}
+    {{ else }}
+      {{ $modifiedDate = $publishDate }}
+    {{ end }}
+  {{ end }}
+
+  {{/* Handle image */}}
+  {{ $image := .Params.meta_image | default "/logos/brand/og-default.png" }}
+  {{ if not (hasPrefix $image "http") }}
+    {{ if in "blog templates" .Section }}
+      {{ with .Resources.GetMatch .Params.meta_image }}
+        {{ $image = .Permalink }}
+      {{ end }}
+    {{ else }}
+      {{ $image = printf "https://www.pulumi.com%s" $image }}
+    {{ end }}
+  {{ end }}
+
+  {{/* Build schema */}}
+  {{ $schema := dict
+    "@context" "https://schema.org"
+    "@type" "BlogPosting"
+    "@id" (printf "%s#article" .Permalink)
+    "headline" (or .Params.h1 .Title)
+    "description" (or .Params.meta_desc .Summary)
+    "datePublished" ($publishDate.Format "2006-01-02T15:04:05Z07:00")
+    "dateModified" ($modifiedDate.Format "2006-01-02T15:04:05Z07:00")
+    "mainEntityOfPage" (dict
+      "@type" "WebPage"
+      "@id" .Permalink
+    )
+    "image" $image
+    "url" .Permalink
+    "wordCount" $effectiveWordCount
+    "articleSection" "Engineering Blog"
+    "inLanguage" "en-US"
+    "publisher" (dict
+      "@type" "Organization"
+      "@id" "https://www.pulumi.com/#organization"
+      "name" "Pulumi"
+      "logo" (dict
+        "@type" "ImageObject"
+        "url" "https://www.pulumi.com/logos/brand/logo.png"
+      )
+    )
+  }}
+
+  {{/* Get enhanced author entities with knowledge graph properties */}}
+  {{ $authors := partial "schema/utils/author-entities.html" . }}
+  
+  {{ if $authors }}
+    {{ $schema = merge $schema (dict "author" $authors) }}
+  {{ else }}
+    {{ $schema = merge $schema (dict "author" (dict
+      "@type" "Organization"
+      "@id" "https://www.pulumi.com/#organization"
+    )) }}
+  {{ end }}
+
+  {{/* Add tags as keywords */}}
+  {{ with .Params.tags }}
+    {{ $schema = merge $schema (dict "keywords" (delimit . ", ")) }}
+  {{ end }}
+
+  {{/* AI Enhancement: Add speakable specification */}}
+  {{ $schema = merge $schema (dict "speakable" (dict
+    "@type" "SpeakableSpecification"
+    "cssSelector" (slice "article h1" "article h2" "article p:first-of-type")
+  )) }}
+
+  {{/* AI Enhancement: Add articleBody for context */}}
+  {{ $content := $effectiveContent | plainify | truncate 5000 }}
+  {{ $schema = merge $schema (dict "articleBody" $content) }}
+
+  {{/* AI Enhancement: Add about and mentions */}}
+  {{ $schema = merge $schema (dict "about" (dict
+    "@type" "Thing"
+    "name" "Infrastructure as Code"
+    "@id" "https://www.pulumi.com/#pulumi-cli"
+  )) }}
+
+  {{/* Get technology entities with Wikipedia/Wikidata links */}}
+  {{ $mentions := partial "schema/utils/technology-entities.html" . }}
+  
+  {{/* Detect cloud providers */}}
+  {{ $cloudProviders := partial "schema/utils/cloud-provider-detector.html" . }}
+  
+  {{/* Extract cloud resource types and services */}}
+  {{ $cloudResources := partial "schema/utils/resource-type-extractor.html" . }}
+  
+  {{/* Detect infrastructure patterns */}}
+  {{ $infraPatterns := partial "schema/utils/infrastructure-patterns.html" . }}
+  
+  {{/* Combine all mentions and deduplicate */}}
+  {{ $allMentions := $mentions }}
+  {{ if $cloudResources.cloudServices }}
+    {{ $allMentions = $allMentions | append $cloudResources.cloudServices }}
+  {{ end }}
+  {{ if $infraPatterns }}
+    {{ $allMentions = $allMentions | append $infraPatterns }}
+  {{ end }}
+  
+  {{/* Deduplicate mentions by @id or name */}}
+  {{ if $allMentions }}
+    {{ $mentionIds := slice }}
+    {{ $uniqueMentions := slice }}
+    {{ range $allMentions }}
+      {{ $identifier := or (index . "@id") .name }}
+      {{ if not (in $mentionIds $identifier) }}
+        {{ $uniqueMentions = $uniqueMentions | append . }}
+        {{ $mentionIds = $mentionIds | append $identifier }}
+      {{ end }}
+    {{ end }}
+    {{ if $uniqueMentions }}
+      {{ $schema = merge $schema (dict "mentions" $uniqueMentions) }}
+    {{ end }}
+  {{ end }}
+
+  {{/* Get related content relationships */}}
+  {{ $relatedContent := partial "schema/utils/related-content.html" . }}
+  {{ if $relatedContent }}
+    {{ $schema = merge $schema (dict "citation" $relatedContent) }}
+  {{ end }}
+  
+  {{/* Cloud provider information now handled in mentions for semantic accuracy */}}
+  
+  {{/* Infrastructure patterns now handled in mentions section for semantic accuracy */}}
+
+  {{/* Note: softwareRequirements is not a valid property for BlogPosting schema type */}}
+  {{/* Package dependencies are better represented through mentions and citations */}}
+
+  {{/* Phase 4: Advanced Semantic Layer */}}
+  
+  {{/* Add discussionUrl if comments are enabled */}}
+  {{ if .Params.comments }}
+    {{ $schema = merge $schema (dict "discussionUrl" (printf "%s#comments" .Permalink)) }}
+  {{ end }}
+  
+  {{/* Add potential actions for blog posts */}}
+  {{ $actions := slice (dict
+    "@type" "ReadAction"
+    "target" .Permalink
+    "name" "Read Article"
+  ) }}
+  
+  {{ if .Params.github_url }}
+    {{ $actions = $actions | append (dict
+      "@type" "ViewAction"
+      "target" .Params.github_url
+      "name" "View Code on GitHub"
+    ) }}
+  {{ end }}
+  
+  {{ $schema = merge $schema (dict "potentialAction" $actions) }}
+  
+  {{/* Add work examples for technical blog posts */}}
+  {{ if in .Content "```" }}
+    {{ $examples := slice }}
+    {{ if in .Content "pulumi new" }}
+      {{ $examples = $examples | append (dict
+        "@type" "HowToStep"
+        "name" "Create Pulumi Project"
+        "text" "Initialize a new Pulumi project"
+        "tool" (dict "@id" "https://www.pulumi.com/#pulumi-cli")
+      ) }}
+    {{ end }}
+    {{ if in .Content "pulumi up" }}
+      {{ $examples = $examples | append (dict
+        "@type" "HowToStep"
+        "name" "Deploy Infrastructure"
+        "text" "Deploy infrastructure using Pulumi"
+        "tool" (dict "@id" "https://www.pulumi.com/#pulumi-cli")
+      ) }}
+    {{ end }}
+    {{ if $examples }}
+      {{ $schema = merge $schema (dict "step" $examples) }}
+    {{ end }}
+  {{ end }}
+  
+  {{/* Add isPartOf for blog series */}}
+  {{ with .Params.series }}
+    {{ $schema = merge $schema (dict "isPartOf" (dict
+      "@type" "BlogPosting"
+      "name" .
+      "url" (printf "https://www.pulumi.com/blog/series/%s/" (urlize .))
+    )) }}
+  {{ end }}
+  
+  {{/* Add backstory/context for announcement posts */}}
+  {{ if or (in .Title "Announcing") (in .Title "Introducing") }}
+    {{ $schema = merge $schema (dict "backstory" (dict
+      "@type" "CreativeWork"
+      "name" "Product Development"
+      "creator" (dict "@id" "https://www.pulumi.com/#organization")
+    )) }}
+  {{ end }}
+
+  <script type="application/ld+json">
+  {{ $schema | jsonify | safeJS }}
+  </script>
+{{ end }}
\ No newline at end of file
diff --git a/layouts/partials/schema/content/code.html b/layouts/partials/schema/content/code.html
new file mode 100644
index 000000000000..66b370fb3304
--- /dev/null
+++ b/layouts/partials/schema/content/code.html
@@ -0,0 +1,184 @@
+{{/* SoftwareSourceCode Schema for Code Examples */}}
+
+{{/* Detect code blocks in content */}}
+{{ $hasCode := false }}
+{{ $codeLanguages := slice }}
+
+{{/* Check for fenced code blocks */}}
+{{ if in .Content "```" }}
+  {{ $hasCode = true }}
+
+  {{/* Extract programming languages from code blocks */}}
+  {{ $codeBlocks := findRE "```([a-zA-Z0-9#+_-]+)" .Content }}
+  {{ range $codeBlocks }}
+    {{ $lang := replaceRE "```([a-zA-Z0-9#+_-]+)" "$1" . }}
+    {{ if and $lang (not (in $codeLanguages $lang)) }}
+      {{ $codeLanguages = $codeLanguages | append $lang }}
+    {{ end }}
+  {{ end }}
+{{ end }}
+
+{{/* Generate SoftwareSourceCode schema if code exists */}}
+{{ if $hasCode }}
+  {{ $schemas := slice }}
+
+  {{/* Map language identifiers to proper names */}}
+  {{ $languageMap := dict
+    "typescript" "TypeScript"
+    "ts" "TypeScript"
+    "javascript" "JavaScript"
+    "js" "JavaScript"
+    "python" "Python"
+    "py" "Python"
+    "go" "Go"
+    "golang" "Go"
+    "csharp" "C#"
+    "cs" "C#"
+    "java" "Java"
+    "yaml" "YAML"
+    "yml" "YAML"
+    "json" "JSON"
+    "bash" "Bash"
+    "sh" "Shell"
+    "shell" "Shell"
+    "hcl" "HCL"
+    "terraform" "HCL"
+    "dockerfile" "Dockerfile"
+    "docker" "Dockerfile"
+    "makefile" "Makefile"
+    "make" "Makefile"
+    "pulumi" "Pulumi"
+  }}
+
+  {{/* Create primary code schema */}}
+  {{ $primaryLang := "" }}
+  {{ $primaryLangName := "" }}
+
+  {{/* Determine primary language */}}
+  {{ if gt (len $codeLanguages) 0 }}
+    {{ $primaryLang = index $codeLanguages 0 }}
+    {{ $primaryLangName = index $languageMap (lower $primaryLang) | default $primaryLang }}
+  {{ else }}
+    {{/* Try to detect from content */}}
+    {{ if in .Content "new pulumi." }}
+      {{ $primaryLangName = "TypeScript" }}
+    {{ else if in .Content "pulumi." }}
+      {{ $primaryLangName = "Pulumi" }}
+    {{ else if in .Content "import " }}
+      {{ $primaryLangName = "Python" }}
+    {{ else if in .Content "const " }}
+      {{ $primaryLangName = "JavaScript" }}
+    {{ end }}
+  {{ end }}
+
+  {{/* Build schema */}}
+  {{ if $primaryLangName }}
+    {{ $schema := dict
+      "@context" "https://schema.org"
+      "@type" "SoftwareSourceCode"
+      "@id" (printf "%s#code" .Permalink)
+      "name" (printf "%s Code Example" .Title)
+      "description" (or .Params.meta_desc .Summary (printf "Code example for %s" .Title))
+      "programmingLanguage" (dict
+        "@type" "ComputerLanguage"
+        "name" $primaryLangName
+      )
+      "codeSampleType" "code snippet"
+      "isBasedOn" (dict "@id" "https://www.pulumi.com/#software")
+      "targetProduct" (dict
+        "@type" "SoftwareApplication"
+        "name" "Pulumi"
+      )
+    }}
+
+    {{/* Add code repository if it's an example */}}
+    {{ if or (in .RelPermalink "/examples/") (in .RelPermalink "/templates/") }}
+      {{ $repoPath := "" }}
+
+      {{/* Try to detect GitHub repo */}}
+      {{ if .Params.github_repo }}
+        {{ $repoPath = .Params.github_repo }}
+      {{ else if in .Content "github.com/pulumi/examples" }}
+        {{ $repoPath = "https://github.com/pulumi/examples" }}
+      {{ else if in .Content "github.com/pulumi/templates" }}
+        {{ $repoPath = "https://github.com/pulumi/templates" }}
+      {{ end }}
+
+      {{ if $repoPath }}
+        {{ $schema = merge $schema (dict "codeRepository" $repoPath) }}
+      {{ end }}
+    {{ end }}
+
+    {{/* Add runtime platform based on language */}}
+    {{ $runtime := "" }}
+    {{ if or (eq $primaryLangName "TypeScript") (eq $primaryLangName "JavaScript") }}
+      {{ $runtime = "Node.js" }}
+    {{ else if eq $primaryLangName "Python" }}
+      {{ $runtime = "Python Runtime" }}
+    {{ else if eq $primaryLangName "C#" }}
+      {{ $runtime = ".NET" }}
+    {{ else if eq $primaryLangName "Java" }}
+      {{ $runtime = "JVM" }}
+    {{ else if eq $primaryLangName "Go" }}
+      {{ $runtime = "Go Runtime" }}
+    {{ end }}
+
+    {{ if $runtime }}
+      {{ $schema = merge $schema (dict "runtimePlatform" $runtime) }}
+    {{ end }}
+
+    {{/* Add operating system compatibility */}}
+    {{ $schema = merge $schema (dict "operatingSystem" (slice "Windows" "macOS" "Linux")) }}
+
+    {{/* Add software requirements if Pulumi code */}}
+    {{ if or (in .Content "pulumi") (in .Content "Pulumi") }}
+      {{ $requirements := slice "Pulumi CLI" }}
+
+      {{/* Add cloud provider SDKs if detected */}}
+      {{ if in .Content "@pulumi/aws" }}
+        {{ $requirements = $requirements | append "AWS SDK" }}
+      {{ end }}
+      {{ if in .Content "@pulumi/azure" }}
+        {{ $requirements = $requirements | append "Azure SDK" }}
+      {{ end }}
+      {{ if in .Content "@pulumi/gcp" }}
+        {{ $requirements = $requirements | append "Google Cloud SDK" }}
+      {{ end }}
+      {{ if in .Content "@pulumi/kubernetes" }}
+        {{ $requirements = $requirements | append "Kubernetes Client" }}
+      {{ end }}
+
+      {{ $schema = merge $schema (dict "softwareRequirements" (delimit $requirements ", ")) }}
+    {{ end }}
+
+    <script type="application/ld+json">
+    {{ $schema | jsonify | safeJS }}
+    </script>
+
+    {{/* If multiple languages, create additional schemas */}}
+    {{ if gt (len $codeLanguages) 1 }}
+      {{ range $index, $lang := (after 1 $codeLanguages) }}
+        {{ $langName := index $languageMap (lower $lang) | default $lang }}
+        {{ if $langName }}
+          {{ $additionalSchema := dict
+            "@context" "https://schema.org"
+            "@type" "SoftwareSourceCode"
+            "@id" (printf "%s#code%d" $.Permalink (add $index 2))
+            "name" (printf "%s %s Code Example" $.Title $langName)
+            "description" (or $.Params.meta_desc $.Summary)
+            "programmingLanguage" (dict
+              "@type" "ComputerLanguage"
+              "name" $langName
+            )
+            "codeSampleType" "code snippet"
+            "isBasedOn" (dict "@id" "https://www.pulumi.com/#software")
+          }}
+
+          <script type="application/ld+json">
+          {{ $additionalSchema | jsonify | safeJS }}
+          </script>
+        {{ end }}
+      {{ end }}
+    {{ end }}
+  {{ end }}
+{{ end }}
\ No newline at end of file
diff --git a/layouts/partials/schema/content/course-list.html b/layouts/partials/schema/content/course-list.html
new file mode 100644
index 000000000000..c12794a405cd
--- /dev/null
+++ b/layouts/partials/schema/content/course-list.html
@@ -0,0 +1,90 @@
+{{/* Course List Schema - Generates ItemList for tutorial index and collection pages */}}
+
+{{ if eq .Type "tutorials" }}
+  {{/* Get all tutorial pages that should be listed */}}
+  {{ $courses := where .Pages ".Params.listed" "ne" false }}
+  
+  {{/* Only generate course list if we have at least 3 courses (Google requirement) */}}
+  {{ if ge (len $courses) 3 }}
+    {{ $courseItems := slice }}
+    
+    {{/* Build course list items */}}
+    {{ range $index, $course := $courses }}
+      {{ $courseItem := dict
+        "@type" "ListItem"
+        "position" (add $index 1)
+        "item" (dict
+          "@type" "Course"
+          "name" $course.Title
+          "description" (or $course.Params.meta_desc $course.Summary (printf "Learn %s with this hands-on Pulumi tutorial" $course.Title))
+          "url" $course.Permalink
+          "provider" (dict
+            "@type" "Organization"
+            "@id" "https://www.pulumi.com/#organization"
+            "name" "Pulumi"
+            "url" "https://www.pulumi.com"
+          )
+          "inLanguage" "en-US"
+          "isAccessibleForFree" true
+        )
+      }}
+      
+      {{/* Add image if available */}}
+      {{ with or $course.Params.meta_image "/images/docs/meta-images/docs-meta.png" }}
+        {{ $image := . }}
+        {{ if not (hasPrefix $image "http") }}
+          {{ $image = printf "https://www.pulumi.com%s" $image }}
+        {{ end }}
+        {{ $courseItem = merge $courseItem (dict "item" (merge (index $courseItem "item") (dict "image" $image))) }}
+      {{ end }}
+      
+      {{/* Add educational level if detected */}}
+      {{ $level := "Intermediate" }}
+      {{ $titleLower := lower $course.Title }}
+      {{ if or (in $titleLower "getting started") (in $titleLower "creating resources") }}
+        {{ $level = "Beginner" }}
+      {{ else if or (in $titleLower "advanced") (in $titleLower "drift") (in $titleLower "compliance") }}
+        {{ $level = "Advanced" }}
+      {{ end }}
+      {{ with $course.Params.skill_level }}
+        {{ $level = . }}
+      {{ else }}
+        {{ with $course.Params.educational_level }}
+          {{ $level = . }}
+        {{ end }}
+      {{ end }}
+      {{ $courseItem = merge $courseItem (dict "item" (merge (index $courseItem "item") (dict "educationalLevel" $level))) }}
+      
+      {{/* Add estimated duration */}}
+      {{ $duration := "PT1H" }}
+      {{ if $course.Params.duration }}
+        {{ $duration = $course.Params.duration }}
+      {{ else if $course.WordCount }}
+        {{/* Estimate based on word count */}}
+        {{ $readTime := div $course.WordCount 150 }}
+        {{ if lt $readTime 30 }}{{ $readTime = 30 }}{{ end }}
+        {{ if gt $readTime 120 }}{{ $readTime = 120 }}{{ end }}
+        {{ $duration = printf "PT%dM" $readTime }}
+      {{ end }}
+      {{ $courseItem = merge $courseItem (dict "item" (merge (index $courseItem "item") (dict "timeRequired" $duration))) }}
+      
+      {{ $courseItems = $courseItems | append $courseItem }}
+    {{ end }}
+    
+    {{/* Generate the ItemList schema */}}
+    {{ $schema := dict
+      "@context" "https://schema.org"
+      "@type" "ItemList"
+      "@id" (printf "%s#courselist" .Permalink)
+      "name" (printf "%s - Pulumi Tutorials" .Title)
+      "description" (or .Params.meta_desc .Summary "Hands-on guides to help you get the most out of Pulumi Infrastructure as Code")
+      "url" .Permalink
+      "numberOfItems" (len $courseItems)
+      "itemListElement" $courseItems
+    }}
+    
+    <script type="application/ld+json">
+    {{ $schema | jsonify | safeJS }}
+    </script>
+  {{ end }}
+{{ end }}
\ No newline at end of file
diff --git a/layouts/partials/schema/content/course.html b/layouts/partials/schema/content/course.html
new file mode 100644
index 000000000000..faa609f29a5a
--- /dev/null
+++ b/layouts/partials/schema/content/course.html
@@ -0,0 +1,265 @@
+{{/* Course Schema for Tutorials - Required for Course rich results */}}
+
+{{ if eq .Type "tutorials" }}
+  {{/* Get aggregated content using the content aggregator */}}
+  {{ $aggregatedContent := partial "schema/utils/content-aggregator.html" . }}
+  {{ $effectiveContent := $aggregatedContent.content }}
+  {{ $effectiveWordCount := $aggregatedContent.wordCount }}
+
+  {{/* Enhanced date handling with fallbacks */}}
+  {{ $publishDate := .Date }}
+  {{ $modifiedDate := or .Lastmod .Date }}
+
+  {{/* Handle invalid/zero dates with fallbacks */}}
+  {{ if or (not $publishDate) (eq ($publishDate.Format "2006-01-02") "0001-01-01") }}
+    {{ if and .GitInfo .GitInfo.AuthorDate }}
+      {{ $publishDate = .GitInfo.AuthorDate }}
+    {{ else }}
+      {{ $publishDate = now }}
+    {{ end }}
+  {{ end }}
+
+  {{ if or (not $modifiedDate) (eq ($modifiedDate.Format "2006-01-02") "0001-01-01") }}
+    {{ if and .GitInfo .GitInfo.AuthorDate }}
+      {{ $modifiedDate = .GitInfo.AuthorDate }}
+    {{ else }}
+      {{ $modifiedDate = $publishDate }}
+    {{ end }}
+  {{ end }}
+
+  {{/* Get technology entities with Wikipedia/Wikidata links */}}
+  {{ $techEntities := partial "schema/utils/technology-entities.html" . }}
+  
+  {{/* Get related content relationships */}}
+  {{ $relatedContent := partial "schema/utils/related-content.html" . }}
+  
+  {{/* Detect cloud providers */}}
+  {{ $cloudProviders := partial "schema/utils/cloud-provider-detector.html" . }}
+  
+  {{/* Extract cloud resource types and services */}}
+  {{ $cloudResources := partial "schema/utils/resource-type-extractor.html" . }}
+  
+  {{/* Detect infrastructure patterns */}}
+  {{ $infraPatterns := partial "schema/utils/infrastructure-patterns.html" . }}
+  
+  {{ $image := .Params.meta_image | default "/images/docs/meta-images/docs-meta.png" }}
+  {{ if not (hasPrefix $image "http") }}
+    {{ $image = printf "https://www.pulumi.com%s" $image }}
+  {{ end }}
+
+  {{/* Auto-detect what this tutorial teaches */}}
+  {{ $teaches := slice }}
+  {{ $titleLower := lower .Title }}
+  {{ $content := $effectiveContent | plainify }}
+  
+  {{ if in $titleLower "aws" }}
+    {{ $teaches = $teaches | append "AWS Infrastructure" }}
+  {{ end }}
+  {{ if in $titleLower "azure" }}
+    {{ $teaches = $teaches | append "Azure Infrastructure" }}
+  {{ end }}
+  {{ if in $titleLower "gcp" }}
+    {{ $teaches = $teaches | append "Google Cloud Infrastructure" }}
+  {{ end }}
+  {{ if in $titleLower "kubernetes" }}
+    {{ $teaches = $teaches | append "Kubernetes Management" }}
+  {{ end }}
+  {{ if in $titleLower "import" }}
+    {{ $teaches = $teaches | append "Infrastructure Import" }}
+  {{ end }}
+  {{ if in $titleLower "secret" }}
+    {{ $teaches = $teaches | append "Secrets Management" }}
+  {{ end }}
+  {{ if in $titleLower "deployment" }}
+    {{ $teaches = $teaches | append "Automated Deployments" }}
+  {{ end }}
+  {{ if in $titleLower "esc" }}
+    {{ $teaches = $teaches | append "Pulumi ESC" }}
+  {{ end }}
+  
+  {{/* Default if no specific topic detected */}}
+  {{ if not $teaches }}
+    {{ $teaches = slice "Infrastructure as Code" "Cloud Engineering" }}
+  {{ end }}
+  
+  {{/* Override with frontmatter if provided */}}
+  {{ with .Params.skills }}
+    {{ $teaches = . }}
+  {{ else }}
+    {{ with .Params.teaches }}
+      {{ $teaches = . }}
+    {{ end }}
+  {{ end }}
+
+  {{/* Auto-detect prerequisites */}}
+  {{ $prerequisites := slice }}
+  {{ if or (in $content "Pulumi CLI") (in $content "pulumi new") }}
+    {{ $prerequisites = $prerequisites | append "Pulumi CLI installed" }}
+  {{ end }}
+  {{ if in $content "AWS account" }}
+    {{ $prerequisites = $prerequisites | append "AWS Account" }}
+  {{ end }}
+  {{ if in $content "Azure account" }}
+    {{ $prerequisites = $prerequisites | append "Azure Account" }}
+  {{ end }}
+  {{ if in $content "Google Cloud account" }}
+    {{ $prerequisites = $prerequisites | append "Google Cloud Account" }}
+  {{ end }}
+  
+  {{/* Override with frontmatter if provided */}}
+  {{ with .Params.prerequisites }}
+    {{ $prerequisites = . }}
+  {{ end }}
+
+  {{/* Determine educational level */}}
+  {{ $level := "Intermediate" }}
+  {{ if or (in $titleLower "getting started") (in $titleLower "creating resources") }}
+    {{ $level = "Beginner" }}
+  {{ else if or (in $titleLower "advanced") (in $titleLower "drift") (in $titleLower "compliance") }}
+    {{ $level = "Advanced" }}
+  {{ end }}
+  {{ with .Params.skill_level }}
+    {{ $level = . }}
+  {{ else }}
+    {{ with .Params.educational_level }}
+      {{ $level = . }}
+    {{ end }}
+  {{ end }}
+
+  {{/* Estimate duration */}}
+  {{ $duration := "PT1H" }}
+  {{ with .Params.duration }}
+    {{ $duration = . }}
+  {{ else }}
+    {{/* Estimate based on word count */}}
+    {{ $readTime := div $effectiveWordCount 150 }}
+    {{ if lt $readTime 30 }}{{ $readTime = 30 }}{{ end }}
+    {{ if gt $readTime 120 }}{{ $readTime = 120 }}{{ end }}
+    {{ $duration = printf "PT%dM" $readTime }}
+  {{ end }}
+
+  {{ $schema := dict
+    "@context" "https://schema.org"
+    "@type" "Course"
+    "@id" (printf "%s#course" .Permalink)
+    "name" .Title
+    "description" (or .Params.meta_desc .Summary (printf "Learn %s with this hands-on Pulumi tutorial" .Title))
+    "url" .Permalink
+    "image" $image
+    "datePublished" ($publishDate.Format "2006-01-02T15:04:05Z07:00")
+    "dateModified" ($modifiedDate.Format "2006-01-02T15:04:05Z07:00")
+    "provider" (dict
+      "@type" "Organization"
+      "@id" "https://www.pulumi.com/#organization"
+      "name" "Pulumi"
+      "url" "https://www.pulumi.com"
+    )
+    "hasCourseInstance" (dict
+      "@type" "CourseInstance"
+      "courseMode" "online"
+      "courseWorkload" $duration
+      "instructor" (dict
+        "@type" "Person"
+        "name" "Pulumi Team"
+        "worksFor" (dict "@id" "https://www.pulumi.com/#organization")
+      )
+    )
+    "educationalLevel" $level
+    "inLanguage" "en-US"
+    "teaches" $teaches
+    "about" (dict
+      "@type" "Thing"
+      "name" "Infrastructure as Code"
+    )
+    "timeRequired" $duration
+    "isAccessibleForFree" true
+    "audience" (dict
+      "@type" "Audience"
+      "audienceType" "Developers"
+    )
+  }}
+
+  {{/* Add prerequisites if any */}}
+  {{ if $prerequisites }}
+    {{ $schema = merge $schema (dict "coursePrerequisites" $prerequisites) }}
+  {{ end }}
+
+  {{/* Add keywords */}}
+  {{ $keywords := printf "%s, infrastructure as code, pulumi tutorial" (delimit $teaches ", ") }}
+  {{ with .Params.tags }}
+    {{ $keywords = delimit . ", " }}
+  {{ end }}
+  {{ $schema = merge $schema (dict "keywords" $keywords) }}
+
+  {{/* Add programming languages if detected */}}
+  {{ $languages := slice }}
+  {{ if or (in .Content "```typescript") (in .Content "```ts") }}
+    {{ $languages = $languages | append "TypeScript" }}
+  {{ end }}
+  {{ if or (in .Content "```python") (in .Content "```py") }}
+    {{ $languages = $languages | append "Python" }}
+  {{ end }}
+  {{ if in .Content "```go" }}
+    {{ $languages = $languages | append "Go" }}
+  {{ end }}
+  {{ if in .Content "```csharp" }}
+    {{ $languages = $languages | append "C#" }}
+  {{ end }}
+  {{ if in .Content "```yaml" }}
+    {{ $languages = $languages | append "YAML" }}
+  {{ end }}
+  {{ if $languages }}
+    {{ $schema = merge $schema (dict "programmingLanguage" $languages) }}
+  {{ end }}
+
+  {{/* Combine and deduplicate technology entity mentions */}}
+  {{ $allMentions := $techEntities }}
+  {{ if $cloudResources.cloudServices }}
+    {{ $allMentions = $allMentions | append $cloudResources.cloudServices }}
+  {{ end }}
+  {{ if $infraPatterns }}
+    {{ $allMentions = $allMentions | append $infraPatterns }}
+  {{ end }}
+  
+  {{/* Deduplicate mentions by @id or name */}}
+  {{ if $allMentions }}
+    {{ $mentionIds := slice }}
+    {{ $uniqueMentions := slice }}
+    {{ range $allMentions }}
+      {{ $identifier := or (index . "@id") .name }}
+      {{ if not (in $mentionIds $identifier) }}
+        {{ $uniqueMentions = $uniqueMentions | append . }}
+        {{ $mentionIds = $mentionIds | append $identifier }}
+      {{ end }}
+    {{ end }}
+    {{ if $uniqueMentions }}
+      {{ $schema = merge $schema (dict "mentions" $uniqueMentions) }}
+    {{ end }}
+  {{ end }}
+
+  {{/* Add related content for knowledge graph connections */}}
+  {{ if $relatedContent }}
+    {{ $schema = merge $schema (dict "citation" $relatedContent) }}
+  {{ end }}
+  
+  {{/* Cloud provider information now handled in mentions for semantic accuracy */}}
+  
+  {{/* Infrastructure patterns now handled in mentions section for semantic accuracy */}}
+  
+  {{/* Add software requirements based on detected packages */}}
+  {{/* Software requirements are not valid for Course type - removed to fix validation warning */}}
+  {{/* Previously detected packages like @pulumi/aws are now included as part of the course description */}}
+  
+  {{/* Add Pulumi resource types if detected */}}
+  {{ if $cloudResources.pulumiTypes }}
+    {{ $schema = merge $schema (dict "additionalProperty" (dict
+      "@type" "PropertyValue"
+      "name" "pulumiResourceTypes"
+      "value" $cloudResources.pulumiTypes
+    )) }}
+  {{ end }}
+
+  <script type="application/ld+json">
+  {{ $schema | jsonify | safeJS }}
+  </script>
+{{ end }}
\ No newline at end of file
diff --git a/layouts/partials/schema/content/event.html b/layouts/partials/schema/content/event.html
new file mode 100644
index 000000000000..1d410cb0c456
--- /dev/null
+++ b/layouts/partials/schema/content/event.html
@@ -0,0 +1,184 @@
+{{/* Consolidated Event Schema - Handles workshops, webinars, and exhibitions */}}
+
+{{/* Only process if not external and has physical location (Google requires physical events) */}}
+{{ if and (not .Params.external) .Params.main .Params.main.location (ne .Params.main.location "virtual") }}
+  {{/* Get event data from various possible locations */}}
+  {{ $eventData := or .Params.event_data .Params.exhibition_data .Params.main }}
+  
+  {{ if $eventData }}
+    {{/* Determine event type */}}
+    {{ $eventType := "Event" }}
+    {{ if .Params.exhibition_data }}
+      {{ $eventType = "ExhibitionEvent" }}
+    {{ else if eq $eventData.event_type "workshop" }}
+      {{ $eventType = "EducationalEvent" }}
+    {{ end }}
+    
+    {{/* Build base schema */}}
+    {{ $schema := dict
+      "@context" "https://schema.org"
+      "@type" $eventType
+      "@id" (printf "%s#event" .Permalink)
+      "name" (or $eventData.name $eventData.title .Title)
+      "description" (or $eventData.description .Params.meta_desc .Summary)
+      "url" .Permalink
+      "eventStatus" "https://schema.org/EventScheduled"
+      "organizer" (dict "@id" "https://www.pulumi.com/#organization")
+      "performer" (dict "@id" "https://www.pulumi.com/#organization")
+      "inLanguage" "en-US"
+    }}
+    
+    {{/* Add start date */}}
+    {{ with or $eventData.start_date $eventData.sortable_date }}
+      {{ $startDate := . }}
+      {{/* Ensure ISO-8601 format with timezone */}}
+      {{ if $startDate }}
+        {{ $timeObj := time.AsTime $startDate }}
+        {{ if $timeObj }}
+          {{ $schema = merge $schema (dict "startDate" ($timeObj.Format "2006-01-02T15:04:05Z07:00")) }}
+        {{ else }}
+          {{ $schema = merge $schema (dict "startDate" $startDate) }}
+        {{ end }}
+      {{ end }}
+    {{ end }}
+    
+    {{/* Add end date */}}
+    {{ with $eventData.end_date }}
+      {{ $endDate := . }}
+      {{/* Ensure ISO-8601 format with timezone */}}
+      {{ if $endDate }}
+        {{ $timeObj := time.AsTime $endDate }}
+        {{ if $timeObj }}
+          {{ $schema = merge $schema (dict "endDate" ($timeObj.Format "2006-01-02T15:04:05Z07:00")) }}
+        {{ else }}
+          {{ $schema = merge $schema (dict "endDate" $endDate) }}
+        {{ end }}
+      {{ end }}
+    {{ end }}
+    
+    {{/* Process duration */}}
+    {{ with $eventData.duration }}
+      {{ $isoDuration := . }}
+      {{/* Convert common formats to ISO 8601 */}}
+      {{ if eq . "30 minutes" }}{{ $isoDuration = "PT30M" }}
+      {{ else if eq . "45 minutes" }}{{ $isoDuration = "PT45M" }}
+      {{ else if eq . "60 minutes" }}{{ $isoDuration = "PT60M" }}
+      {{ else if eq . "90 minutes" }}{{ $isoDuration = "PT90M" }}
+      {{ else if eq . "1 hour" }}{{ $isoDuration = "PT1H" }}
+      {{ else if eq . "2 hours" }}{{ $isoDuration = "PT2H" }}
+      {{ else if eq . "1 day" }}{{ $isoDuration = "P1D" }}
+      {{ else if eq . "2 days" }}{{ $isoDuration = "P2D" }}
+      {{ else if eq . "3 days" }}{{ $isoDuration = "P3D" }}
+      {{ else if eq . "4 days" }}{{ $isoDuration = "P4D" }}
+      {{ end }}
+      {{ $schema = merge $schema (dict "duration" $isoDuration) }}
+    {{ end }}
+    
+    {{/* Handle location */}}
+    {{ if and .Params.exhibition_data $eventData.location }}
+      {{/* Physical exhibition with full address */}}
+      {{ $schema = merge $schema (dict
+        "eventAttendanceMode" "https://schema.org/OfflineEventAttendanceMode"
+        "location" (dict
+          "@type" "Place"
+          "name" $eventData.location.name
+          "address" (dict
+            "@type" "PostalAddress"
+            "streetAddress" $eventData.location.address.street
+            "addressLocality" $eventData.location.address.locality
+            "addressRegion" $eventData.location.address.region
+            "postalCode" $eventData.location.address.postal_code
+            "addressCountry" $eventData.location.address.country
+          )
+        )
+      ) }}
+      
+      {{/* Add booth number if exhibition */}}
+      {{ with $eventData.booth }}
+        {{ $schema = merge $schema (dict "boothNumber" .) }}
+      {{ end }}
+      
+    {{ else if eq $eventData.location "virtual" }}
+      {{/* Virtual event */}}
+      {{ $schema = merge $schema (dict
+        "eventAttendanceMode" "https://schema.org/OnlineEventAttendanceMode"
+        "location" (dict
+          "@type" "VirtualLocation"
+          "url" (or $eventData.url .Permalink)
+        )
+      ) }}
+      
+    {{ else if $eventData.location }}
+      {{/* Physical event with simple location (e.g., "Las Vegas, NV") */}}
+      {{ $locationParts := split $eventData.location ", " }}
+      {{ $schema = merge $schema (dict
+        "eventAttendanceMode" "https://schema.org/OfflineEventAttendanceMode"
+        "location" (dict
+          "@type" "Place"
+          "name" $eventData.location
+          "address" (dict
+            "@type" "PostalAddress"
+            "addressLocality" (index $locationParts 0)
+            "addressRegion" (or (index $locationParts 1) "")
+          )
+        )
+      ) }}
+    {{ else }}
+      {{/* Default to virtual if no location specified */}}
+      {{ $schema = merge $schema (dict
+        "eventAttendanceMode" "https://schema.org/OnlineEventAttendanceMode"
+        "location" (dict
+          "@type" "VirtualLocation"
+          "url" .Permalink
+        )
+      ) }}
+    {{ end }}
+    
+    {{/* Add offers for gated/ticketed events */}}
+    {{ if or .Params.gated (eq $eventType "ExhibitionEvent") }}
+      {{ $validDate := .Date }}
+      {{ if not $validDate }}{{ $validDate = now }}{{ end }}
+      {{ $schema = merge $schema (dict "offers" (dict
+        "@type" "Offer"
+        "price" "0"
+        "priceCurrency" "USD"
+        "availability" "https://schema.org/InStock"
+        "url" .Permalink
+        "validFrom" ($validDate.Format "2006-01-02T15:04:05Z07:00")
+      )) }}
+    {{ end }}
+    
+    {{/* Add image */}}
+    {{ with or .Params.meta_image $eventData.image }}
+      {{ $image := . }}
+      {{ if not (hasPrefix $image "http") }}
+        {{ $image = printf "https://www.pulumi.com%s" $image }}
+      {{ end }}
+      {{ $schema = merge $schema (dict "image" $image) }}
+    {{ end }}
+    
+    {{/* Add keywords for better discovery */}}
+    {{ $keywords := slice }}
+    {{ if eq $eventType "EducationalEvent" }}
+      {{ $keywords = slice "workshop" "tutorial" "infrastructure as code" "cloud computing" }}
+    {{ else if eq $eventType "ExhibitionEvent" }}
+      {{ $keywords = slice "conference" "exhibition" "cloud computing" "devops" }}
+    {{ else }}
+      {{ $keywords = slice "webinar" "online event" "infrastructure as code" }}
+    {{ end }}
+    {{ with .Params.tags }}
+      {{ $keywords = . }}
+    {{ end }}
+    {{ $schema = merge $schema (dict "keywords" (delimit $keywords ", ")) }}
+    
+    {{/* Add about property for context */}}
+    {{ $schema = merge $schema (dict "about" (dict
+      "@type" "Thing"
+      "name" "Infrastructure as Code"
+    )) }}
+    
+    <script type="application/ld+json">
+    {{ $schema | jsonify | safeJS }}
+    </script>
+  {{ end }}
+{{ end }}
\ No newline at end of file
diff --git a/layouts/partials/schema/content/howto.html b/layouts/partials/schema/content/howto.html
new file mode 100644
index 000000000000..d497407099e9
--- /dev/null
+++ b/layouts/partials/schema/content/howto.html
@@ -0,0 +1,175 @@
+{{/* HowTo Schema for Step-by-Step Tutorials */}}
+
+{{/* Only process if content has numbered steps */}}
+{{ $hasNumberedSteps := false }}
+{{ $steps := slice }}
+
+{{/* Check for numbered list patterns (1. 2. 3. etc.) */}}
+{{ $numberedSteps := findRE `(?m)^\d+\.\s+(.+)` .Content }}
+{{ if ge (len $numberedSteps) 2 }}
+  {{ $hasNumberedSteps = true }}
+
+  {{/* Extract step content */}}
+  {{ $contentLines := split .Content "\n" }}
+  {{ $currentStep := dict }}
+  {{ $stepText := "" }}
+  {{ $stepNumber := 0 }}
+
+  {{ range $contentLines }}
+    {{ $line := . }}
+    {{/* Check if this is a numbered step */}}
+    {{ if findRE `^\d+\.\s+` $line }}
+      {{/* Save previous step if exists */}}
+      {{ if and $currentStep.name (ne $stepText "") }}
+        {{ $currentStep = merge $currentStep (dict "text" ($stepText | plainify | chomp)) }}
+        {{ $steps = $steps | append $currentStep }}
+      {{ end }}
+
+      {{/* Start new step */}}
+      {{ $stepNumber = add $stepNumber 1 }}
+      {{ $stepName := replaceRE `^\d+\.\s+(.+)` "$1" $line }}
+      {{ $currentStep = dict "name" ($stepName | plainify | chomp) }}
+      {{ $stepText = "" }}
+    {{ else if $currentStep.name }}
+      {{/* Accumulate text for current step */}}
+      {{ if ne $line "" }}
+        {{ $stepText = printf "%s %s" $stepText $line }}
+      {{ end }}
+    {{ end }}
+  {{ end }}
+
+  {{/* Add final step */}}
+  {{ if and $currentStep.name (ne $stepText "") }}
+    {{ $currentStep = merge $currentStep (dict "text" ($stepText | plainify | chomp)) }}
+    {{ $steps = $steps | append $currentStep }}
+  {{ end }}
+{{ end }}
+
+{{/* Alternative: Check for "Step 1", "Step 2" pattern */}}
+{{ if not $hasNumberedSteps }}
+  {{ $stepHeaders := findRE `(?i)(?:^|\n)(?:###?\s+)?Step\s+\d+[:\s]+(.+)` .Content }}
+  {{ if ge (len $stepHeaders) 2 }}
+    {{ $hasNumberedSteps = true }}
+
+    {{/* Extract steps with this pattern */}}
+    {{ range $stepHeaders }}
+      {{ $stepName := replaceRE `(?i)(?:^|\n)(?:###?\s+)?Step\s+\d+[:\s]+(.+)` "$1" . }}
+      {{ $steps = $steps | append (dict
+        "name" ($stepName | plainify | chomp)
+        "text" "Follow the instructions for this step"
+      ) }}
+    {{ end }}
+  {{ end }}
+{{ end }}
+
+{{/* Generate HowTo schema if we have valid steps */}}
+{{ if and $hasNumberedSteps (ge (len $steps) 2) }}
+  {{/* Build HowToStep array */}}
+  {{ $howToSteps := slice }}
+  {{ range $index, $step := $steps }}
+    {{ $howToStep := dict
+      "@type" "HowToStep"
+      "name" $step.name
+      "text" (or $step.text $step.name)
+      "position" (add $index 1)
+    }}
+
+    {{/* Add URL if this is a link to another page */}}
+    {{ if in $step.text "href=" }}
+      {{ $url := replaceRE `.*href="([^"]+)".*` "$1" $step.text }}
+      {{ if $url }}
+        {{ $howToStep = merge $howToStep (dict "url" $url) }}
+      {{ end }}
+    {{ end }}
+
+    {{ $howToSteps = $howToSteps | append $howToStep }}
+  {{ end }}
+
+  {{/* Determine total time based on content */}}
+  {{ $totalTime := "" }}
+  {{ if .Params.estimated_time }}
+    {{ $totalTime = printf "PT%dM" .Params.estimated_time }}
+  {{ else if .Params.duration }}
+    {{ $totalTime = .Params.duration }}
+  {{ else }}
+    {{/* Estimate based on word count */}}
+    {{ $words := .WordCount | default 500 }}
+    {{ $minutes := div $words 200 }}
+    {{ if lt $minutes 5 }}{{ $minutes = 5 }}{{ end }}
+    {{ $totalTime = printf "PT%dM" $minutes }}
+  {{ end }}
+
+  {{/* Build main HowTo schema */}}
+  {{ $schema := dict
+    "@context" "https://schema.org"
+    "@type" "HowTo"
+    "@id" (printf "%s#howto" .Permalink)
+    "name" (or .Params.howto_title .Title)
+    "description" (or .Params.meta_desc .Summary (printf "How to %s" .Title))
+    "step" $howToSteps
+    "totalTime" $totalTime
+    "tool" (slice)
+  }}
+
+  {{/* Add prerequisites/tools if specified */}}
+  {{ $tools := slice }}
+
+  {{/* Auto-detect common tools */}}
+  {{ if in .Content "Pulumi CLI" }}
+    {{ $tools = $tools | append (dict
+      "@type" "HowToTool"
+      "name" "Pulumi CLI"
+    ) }}
+  {{ end }}
+
+  {{ if in .Content "AWS CLI" }}
+    {{ $tools = $tools | append (dict
+      "@type" "HowToTool"
+      "name" "AWS CLI"
+    ) }}
+  {{ end }}
+
+  {{ if or (in .Content "Node.js") (in .Content "npm") }}
+    {{ $tools = $tools | append (dict
+      "@type" "HowToTool"
+      "name" "Node.js"
+    ) }}
+  {{ end }}
+
+  {{ if in .Content "Python" }}
+    {{ $tools = $tools | append (dict
+      "@type" "HowToTool"
+      "name" "Python"
+    ) }}
+  {{ end }}
+
+  {{ if in .Content "Docker" }}
+    {{ $tools = $tools | append (dict
+      "@type" "HowToTool"
+      "name" "Docker"
+    ) }}
+  {{ end }}
+
+  {{/* Add tools if any detected */}}
+  {{ if gt (len $tools) 0 }}
+    {{ $schema = merge $schema (dict "tool" $tools) }}
+  {{ end }}
+
+  {{/* Add yield/result if specified */}}
+  {{ with .Params.howto_result }}
+    {{ $schema = merge $schema (dict "yield" .) }}
+  {{ end }}
+
+  {{/* Add image if available */}}
+  {{ with or .Params.meta_image .Params.howto_image }}
+    {{ $image := . }}
+    {{ if not (hasPrefix $image "http") }}
+      {{ $image = printf "https://www.pulumi.com%s" $image }}
+    {{ end }}
+    {{ $schema = merge $schema (dict "image" $image) }}
+  {{ end }}
+
+  <script type="application/ld+json">
+  {{ $schema | jsonify | safeJS }}
+  </script>
+{{ end }}
\ No newline at end of file
diff --git a/layouts/partials/schema/content/product-software.html b/layouts/partials/schema/content/product-software.html
new file mode 100644
index 000000000000..1b9542d48f32
--- /dev/null
+++ b/layouts/partials/schema/content/product-software.html
@@ -0,0 +1,133 @@
+{{/* SoftwareApplication Schema for Product Pages */}}
+
+{{ if eq .Section "product" }}
+  {{/* Get product entities with relationships */}}
+  {{ $productEntities := partial "schema/utils/product-entities.html" . }}
+  {{ $mainProduct := $productEntities.mainProduct }}
+  {{ $relatedProducts := $productEntities.relatedProducts }}
+  
+  {{/* Determine product name and details based on page */}}
+  {{ $productName := .Title }}
+  {{ $productDescription := or .Params.meta_desc .Summary }}
+  {{ $applicationCategory := "DeveloperApplication" }}
+  {{ $applicationSubCategory := "" }}
+  
+  {{/* Product-specific customization */}}
+  {{ if in .RelPermalink "/pulumi-cloud/" }}
+    {{ $productName = "Pulumi Cloud" }}
+    {{ $productDescription = "Enterprise-grade infrastructure management platform with state storage, secrets management, and team collaboration features." }}
+    {{ $applicationSubCategory = "Cloud Management Platform" }}
+    
+  {{ else if in .RelPermalink "/pulumi-deployments/" }}
+    {{ $productName = "Pulumi Deployments" }}
+    {{ $productDescription = "Automated infrastructure deployment service with git-based workflows and CI/CD integration." }}
+    {{ $applicationSubCategory = "Deployment Automation" }}
+    
+  {{ else if in .RelPermalink "/pulumi-insights/" }}
+    {{ $productName = "Pulumi Insights" }}
+    {{ $productDescription = "Search and analytics across your entire cloud infrastructure with AI-powered insights." }}
+    {{ $applicationSubCategory = "Cloud Analytics" }}
+    
+  {{ else if in .RelPermalink "/infrastructure-as-code/" }}
+    {{ $productName = "Pulumi IaC" }}
+    {{ $productDescription = "Core infrastructure as code engine supporting TypeScript, Python, Go, C#, Java, and YAML." }}
+    {{ $applicationSubCategory = "Infrastructure as Code" }}
+    
+  {{ else if in .RelPermalink "/secrets-management/" }}
+    {{ $productName = "Pulumi ESC" }}
+    {{ $productDescription = "Centralized secrets and configuration management across clouds and environments." }}
+    {{ $applicationSubCategory = "Secrets Management" }}
+    
+  {{ else if in .RelPermalink "/neo/" }}
+    {{ $productName = "Pulumi Neo" }}
+    {{ $productDescription = "AI-powered infrastructure assistant that generates, reviews, and debugs infrastructure code." }}
+    {{ $applicationSubCategory = "AI Assistant" }}
+    {{ $applicationCategory = "ArtificialIntelligenceApplication" }}
+  {{ end }}
+  
+  {{ $schema := dict
+    "@context" "https://schema.org"
+    "@type" "SoftwareApplication"
+    "@id" (printf "%s#software" .Permalink)
+    "name" $productName
+    "description" $productDescription
+    "url" .Permalink
+    "applicationCategory" $applicationCategory
+    "operatingSystem" (slice "Windows" "macOS" "Linux" "Web")
+    "creator" (dict "@id" "https://www.pulumi.com/#organization")
+    "maintainer" (dict "@id" "https://www.pulumi.com/#organization")
+    "offers" (dict
+      "@type" "Offer"
+      "seller" (dict "@id" "https://www.pulumi.com/#organization")
+      "url" "https://www.pulumi.com/pricing/"
+    )
+    "softwareRequirements" "Modern web browser or Pulumi CLI"
+    "inLanguage" "en-US"
+    "isAccessibleForFree" false
+    "audience" (dict
+      "@type" "Audience"
+      "audienceType" "Developers, DevOps Engineers, Platform Engineers"
+    )
+  }}
+  
+  {{/* Add sub-category if defined */}}
+  {{ if $applicationSubCategory }}
+    {{ $schema = merge $schema (dict "applicationSubCategory" $applicationSubCategory) }}
+  {{ end }}
+  
+  
+  {{/* Add software version if applicable */}}
+  {{ if in .RelPermalink "/infrastructure-as-code/" }}
+    {{ $schema = merge $schema (dict
+      "softwareVersion" (or .Site.Params.latest_version "3.198.0")
+      "downloadUrl" "https://get.pulumi.com/"
+      "installUrl" "https://www.pulumi.com/docs/iac/download-install/"
+      "releaseNotes" "https://www.pulumi.com/docs/reference/changelog/"
+      "license" "Apache-2.0"
+    ) }}
+  {{ end }}
+  
+  {{/* Add features as keywords */}}
+  {{ $features := slice }}
+  {{ if in .RelPermalink "/pulumi-cloud/" }}
+    {{ $features = slice "state management" "team collaboration" "RBAC" "audit logs" "webhooks" }}
+  {{ else if in .RelPermalink "/pulumi-deployments/" }}
+    {{ $features = slice "git integration" "automated deployments" "CI/CD" "preview environments" }}
+  {{ else if in .RelPermalink "/pulumi-insights/" }}
+    {{ $features = slice "resource search" "cost analysis" "compliance" "analytics" }}
+  {{ else if in .RelPermalink "/neo/" }}
+    {{ $features = slice "AI code generation" "infrastructure debugging" "automated reviews" }}
+  {{ end }}
+  {{ if $features }}
+    {{ $schema = merge $schema (dict "featureList" $features) }}
+    {{ $schema = merge $schema (dict "keywords" (delimit $features ", ")) }}
+  {{ end }}
+  
+  {{/* Add screenshots/images if available */}}
+  {{ with .Params.meta_image }}
+    {{ $image := . }}
+    {{ if not (hasPrefix $image "http") }}
+      {{ $image = printf "https://www.pulumi.com%s" $image }}
+    {{ end }}
+    {{ $schema = merge $schema (dict "screenshot" $image) }}
+  {{ end }}
+  
+  {{/* Use product entity if available for rich relationships */}}
+  {{ if $mainProduct }}
+    {{/* Merge in the full product entity with relationships */}}
+    {{ $schema = merge $schema $mainProduct }}
+  {{ else }}
+    {{/* Add isPartOf relationship to main Pulumi platform */}}
+    {{ $schema = merge $schema (dict "isPartOf" (dict
+      "@type" "SoftwareApplication"
+      "@id" "https://www.pulumi.com/#pulumi-cli"
+      "name" "Pulumi"
+    )) }}
+  {{ end }}
+  
+  {{/* Related products are now handled through isPartOf relationship for semantic accuracy */}}
+  
+  <script type="application/ld+json">
+  {{ $schema | jsonify | safeJS }}
+  </script>
+{{ end }}
\ No newline at end of file
diff --git a/layouts/partials/schema/content/qa.html b/layouts/partials/schema/content/qa.html
new file mode 100644
index 000000000000..021f836d8bde
--- /dev/null
+++ b/layouts/partials/schema/content/qa.html
@@ -0,0 +1,115 @@
+{{/* Q&A Schema for FAQ sections - Using Q&A instead of restricted FAQPage */}}
+
+{{ if .Params.faq }}
+  {{/* Build Q&A items from FAQ data */}}
+  {{ $mainEntity := slice }}
+  
+  {{/* Handle different FAQ structures */}}
+  {{ if reflect.IsSlice .Params.faq }}
+    {{/* FAQ is array of categories */}}
+    {{ range .Params.faq }}
+      {{ if .items }}
+        {{ range .items }}
+          {{ $mainEntity = $mainEntity | append (dict
+            "@type" "Question"
+            "name" .question
+            "acceptedAnswer" (dict
+              "@type" "Answer"
+              "text" (.answer | plainify)
+            )
+          ) }}
+        {{ end }}
+      {{ end }}
+    {{ end }}
+  {{ else if .Params.faq.items }}
+    {{/* FAQ has single items array */}}
+    {{ range .Params.faq.items }}
+      {{ $mainEntity = $mainEntity | append (dict
+        "@type" "Question"
+        "name" .question
+        "acceptedAnswer" (dict
+          "@type" "Answer"
+          "text" (.answer | plainify)
+        )
+      ) }}
+    {{ end }}
+  {{ end }}
+  
+  {{/* Only output if we have questions */}}
+  {{ if $mainEntity }}
+    {{/* For pricing page, wrap in Product schema */}}
+    {{ if eq .RelPermalink "/pricing/" }}
+      <script type="application/ld+json">
+      {
+        "@context": "https://schema.org",
+        "@type": "WebPage",
+        "@id": "{{ .Permalink }}#webpage",
+        "name": "{{ .Title }}",
+        "description": "{{ or .Params.meta_desc .Summary }}",
+        "url": "{{ .Permalink }}",
+        "mainEntity": [
+          {
+            "@type": "Product",
+            "@id": "https://www.pulumi.com/pricing/#team",
+            "name": "Pulumi Team",
+            "description": "Everything you need to get started with team collaboration",
+            "brand": {"@id": "https://www.pulumi.com/#organization"},
+            "offers": {
+              "@type": "Offer",
+              "price": "40",
+              "priceCurrency": "USD",
+              "priceValidUntil": "2025-12-31",
+              "availability": "https://schema.org/InStock",
+              "url": "https://www.pulumi.com/pricing/",
+              "priceSpecification": {
+                "@type": "UnitPriceSpecification",
+                "price": "40",
+                "priceCurrency": "USD",
+                "unitText": "per month",
+                "unitCode": "MON"
+              }
+            }
+          },
+          {
+            "@type": "Product",
+            "@id": "https://www.pulumi.com/pricing/#enterprise",
+            "name": "Pulumi Enterprise",
+            "description": "Security and collaboration for large teams",
+            "brand": {"@id": "https://www.pulumi.com/#organization"},
+            "offers": {
+              "@type": "Offer",
+              "price": "400",
+              "priceCurrency": "USD",
+              "priceValidUntil": "2025-12-31",
+              "availability": "https://schema.org/InStock",
+              "url": "https://www.pulumi.com/pricing/",
+              "priceSpecification": {
+                "@type": "UnitPriceSpecification",
+                "price": "400",
+                "priceCurrency": "USD",
+                "unitText": "per month",
+                "unitCode": "MON"
+              }
+            }
+          },
+          {{ range $index, $item := $mainEntity }}
+            {{ $item | jsonify }}{{ if lt $index (sub (len $mainEntity) 1) }},{{ end }}
+          {{ end }}
+        ]
+      }
+      </script>
+    {{ else }}
+      {{/* Regular Q&A page */}}
+      <script type="application/ld+json">
+      {
+        "@context": "https://schema.org",
+        "@type": "QAPage",
+        "name": "{{ .Title }}",
+        "description": "{{ or .Params.meta_desc .Summary }}",
+        "url": "{{ .Permalink }}",
+        "mainEntity": {{ $mainEntity | jsonify }}
+      }
+      </script>
+    {{ end }}
+  {{ end }}
+{{ end }}
\ No newline at end of file
diff --git a/layouts/partials/schema/content/video.html b/layouts/partials/schema/content/video.html
new file mode 100644
index 000000000000..264c70dfeb32
--- /dev/null
+++ b/layouts/partials/schema/content/video.html
@@ -0,0 +1,107 @@
+{{/* VideoObject Schema for Embedded YouTube Videos */}}
+
+{{/* Detect YouTube embeds in content */}}
+{{ $hasYouTube := false }}
+{{ $videoIds := slice }}
+
+{{/* Check for YouTube shortcode usage */}}
+{{ if in .RawContent "{{< youtube" }}
+  {{ $hasYouTube = true }}
+  {{/* Extract video ID from shortcode */}}
+  {{ $shortcodes := findRE `\{\{< youtube\s+"?([^"\s>]+)"?\s*>\}\}` .RawContent }}
+  {{ range $shortcodes }}
+    {{ $id := replaceRE `\{\{< youtube\s+"?([^"\s>]+)"?\s*>\}\}` "$1" . }}
+    {{ $videoIds = $videoIds | append $id }}
+  {{ end }}
+{{ end }}
+
+{{/* Check for YouTube iframe embeds */}}
+{{ if in .Content "youtube.com/embed" }}
+  {{ $hasYouTube = true }}
+  {{/* Extract video IDs from iframe embeds */}}
+  {{ $iframes := findRE `youtube\.com/embed/([^"?\s]+)` .Content }}
+  {{ range $iframes }}
+    {{ $id := replaceRE `youtube\.com/embed/([^"?\s]+)` "$1" . }}
+    {{ $videoIds = $videoIds | append $id }}
+  {{ end }}
+{{ end }}
+
+{{/* Generate VideoObject schema for each video */}}
+{{ if and $hasYouTube (gt (len $videoIds) 0) }}
+  {{/* Get publish date with fallback */}}
+  {{ $publishDate := .Date }}
+  {{ if or (not $publishDate) (eq ($publishDate.Format "2006-01-02") "0001-01-01") }}
+    {{ if and .GitInfo .GitInfo.AuthorDate }}
+      {{ $publishDate = .GitInfo.AuthorDate }}
+    {{ else }}
+      {{ $publishDate = now }}
+    {{ end }}
+  {{ end }}
+
+  {{/* Generate schema for first video (primary video) */}}
+  {{ $primaryVideoId := index $videoIds 0 }}
+  {{ $videoTitle := .Title }}
+  {{ $videoDescription := or .Params.meta_desc .Summary (printf "Video tutorial: %s" .Title) }}
+
+  {{/* Generate thumbnail URL using YouTube's standard pattern */}}
+  {{ $thumbnailUrl := printf "https://img.youtube.com/vi/%s/maxresdefault.jpg" $primaryVideoId }}
+  {{ $embedUrl := printf "https://www.youtube.com/embed/%s" $primaryVideoId }}
+
+  {{ $schema := dict
+    "@context" "https://schema.org"
+    "@type" "VideoObject"
+    "@id" (printf "%s#video" .Permalink)
+    "name" $videoTitle
+    "description" $videoDescription
+    "uploadDate" ($publishDate.Format "2006-01-02")
+    "thumbnailUrl" $thumbnailUrl
+    "embedUrl" $embedUrl
+    "contentUrl" (printf "https://www.youtube.com/watch?v=%s" $primaryVideoId)
+    "publisher" (dict "@id" "https://www.pulumi.com/#organization")
+  }}
+
+  {{/* Add duration if specified in frontmatter */}}
+  {{ with .Params.video_duration }}
+    {{ $schema = merge $schema (dict "duration" .) }}
+  {{ end }}
+
+  {{/* Add transcript if available */}}
+  {{ with .Params.video_transcript }}
+    {{ $schema = merge $schema (dict "transcript" .) }}
+  {{ end }}
+
+  {{/* Add interactionStatistic if view count is known */}}
+  {{ with .Params.video_views }}
+    {{ $schema = merge $schema (dict "interactionStatistic" (dict
+      "@type" "InteractionCounter"
+      "interactionType" "https://schema.org/WatchAction"
+      "userInteractionCount" .
+    )) }}
+  {{ end }}
+
+  <script type="application/ld+json">
+  {{ $schema | jsonify | safeJS }}
+  </script>
+
+  {{/* Generate additional schemas for other videos if multiple exist */}}
+  {{ if gt (len $videoIds) 1 }}
+    {{ range $index, $videoId := (after 1 $videoIds) }}
+      {{ $additionalSchema := dict
+        "@context" "https://schema.org"
+        "@type" "VideoObject"
+        "@id" (printf "%s#video%d" $.Permalink (add $index 2))
+        "name" (printf "%s - Video %d" $videoTitle (add $index 2))
+        "description" $videoDescription
+        "uploadDate" ($publishDate.Format "2006-01-02")
+        "thumbnailUrl" (printf "https://img.youtube.com/vi/%s/maxresdefault.jpg" $videoId)
+        "embedUrl" (printf "https://www.youtube.com/embed/%s" $videoId)
+        "contentUrl" (printf "https://www.youtube.com/watch?v=%s" $videoId)
+        "publisher" (dict "@id" "https://www.pulumi.com/#organization")
+      }}
+
+      <script type="application/ld+json">
+      {{ $additionalSchema | jsonify | safeJS }}
+      </script>
+    {{ end }}
+  {{ end }}
+{{ end }}
\ No newline at end of file
diff --git a/layouts/partials/schema/graph-builder.html b/layouts/partials/schema/graph-builder.html
new file mode 100644
index 000000000000..f4f1600daca0
--- /dev/null
+++ b/layouts/partials/schema/graph-builder.html
@@ -0,0 +1,93 @@
+{{/* Graph builder for @graph implementation for all pages */}}
+
+{{ $graph := slice }}
+
+{{/* Create WebPage entity as the main container */}}
+{{ $webpage := dict
+  "@type" "WebPage"
+  "@id" (printf "%s#webpage" .Permalink)
+  "url" .Permalink
+  "name" .Title
+}}
+
+{{/* Add description if available */}}
+{{ with (or .Params.meta_desc .Summary) }}
+  {{ $webpage = merge $webpage (dict "description" .) }}
+{{ end }}
+
+{{/* Collect breadcrumb for non-home pages */}}
+{{ if not .IsHome }}
+  {{ $breadcrumb := partial "schema/collectors/breadcrumb-entity.html" . }}
+  {{ $graph = $graph | append $breadcrumb }}
+  {{ $webpage = merge $webpage (dict "breadcrumb" (dict "@id" "#breadcrumb")) }}
+{{ end }}
+
+{{/* Collect main content entity based on page type */}}
+{{ $mainEntity := partial "schema/collectors/main-entity.html" . }}
+{{ if $mainEntity }}
+  {{ $graph = $graph | append $mainEntity }}
+  {{ $webpage = merge $webpage (dict "mainEntity" (dict "@id" "#main-content")) }}
+{{ end }}
+
+{{/* Add WebPage to graph */}}
+{{ $graph = $graph | append $webpage }}
+
+{{/* For homepage, add Organization, Website and SoftwareApplication schemas */}}
+{{ if .IsHome }}
+  {{/* Add Organization entity - only on homepage per Google best practices */}}
+  {{ $org := dict
+    "@type" "Organization"
+    "@id" "https://www.pulumi.com/#organization"
+    "name" "Pulumi"
+    "url" "https://www.pulumi.com"
+    "logo" (dict
+      "@type" "ImageObject"
+      "url" "https://www.pulumi.com/logos/brand/logo.png"
+    )
+    "sameAs" (slice
+      "https://twitter.com/PulumiCorp"
+      "https://github.com/pulumi"
+      "https://www.linkedin.com/company/pulumi"
+      "https://www.youtube.com/c/PulumiTV"
+    )
+  }}
+  {{ $graph = $graph | append $org }}
+  {{/* Website schema */}}
+  {{ $website := dict
+    "@type" "WebSite"
+    "@id" "https://www.pulumi.com/#website"
+    "url" "https://www.pulumi.com"
+    "name" "Pulumi"
+    "description" "Infrastructure as Code in any programming language. Build, deploy, and manage modern cloud applications and infrastructure using familiar languages."
+    "publisher" (dict "@id" "https://www.pulumi.com/#organization")
+  }}
+  {{ $graph = $graph | append $website }}
+
+  {{/* SoftwareApplication schema for Pulumi CLI */}}
+  {{ $software := dict
+    "@type" "SoftwareApplication"
+    "@id" "https://www.pulumi.com/#pulumi-cli"
+    "name" "Pulumi"
+    "applicationCategory" "DeveloperApplication"
+    "operatingSystem" "Windows, macOS, Linux"
+    "offers" (dict
+      "@type" "Offer"
+      "price" "0"
+      "priceCurrency" "USD"
+    )
+    "creator" (dict "@id" "https://www.pulumi.com/#organization")
+    "maintainer" (dict "@id" "https://www.pulumi.com/#organization")
+  }}
+  {{ $graph = $graph | append $software }}
+{{ end }}
+
+{{/* Note: Additional special schemas (video, code, QA, etc.) can be added here in future */}}
+{{/* Currently focusing on main content schemas which cover 90% of use cases */}}
+
+{{/* Output single JSON-LD block with @graph */}}
+<script type="application/ld+json">
+{
+  "@context": "https://schema.org",
+  "@graph": {{ $graph | jsonify | safeJS }}
+}
+</script>
\ No newline at end of file
diff --git a/layouts/partials/schema/loader.html b/layouts/partials/schema/loader.html
new file mode 100644
index 000000000000..65a5e025bbe7
--- /dev/null
+++ b/layouts/partials/schema/loader.html
@@ -0,0 +1,7 @@
+{{/* Main Schema Loader - Uses @graph structure for all pages */}}
+
+{{/* Skip schemas for external content */}}
+{{ if not .Params.external }}
+  {{/* Use @graph structure for all pages */}}
+  {{ partial "schema/graph-builder.html" . }}
+{{ end }}
\ No newline at end of file
diff --git a/layouts/partials/schema/utils/author-entities.html b/layouts/partials/schema/utils/author-entities.html
new file mode 100644
index 000000000000..ca0450fdae84
--- /dev/null
+++ b/layouts/partials/schema/utils/author-entities.html
@@ -0,0 +1,109 @@
+{{/* Generate enhanced author entities with knowledge graph properties */}}
+{{ $authors := slice }}
+
+{{ with .Params.authors }}
+  {{ range . }}
+    {{ with index $.Site.Data.team.team . }}
+      {{/* Build author entity with comprehensive knowledge graph properties */}}
+      {{ $author := dict "@type" "Person" }}
+      {{ $author = merge $author (dict "@id" (printf "https://www.pulumi.com/authors/%s/#person" .id)) }}
+      {{ $author = merge $author (dict "name" .name) }}
+      
+      {{/* Add job title and organization */}}
+      {{ with .title }}
+        {{ $author = merge $author (dict "jobTitle" .) }}
+      {{ end }}
+      
+      {{ $author = merge $author (dict "worksFor" (dict
+        "@type" "Organization"
+        "@id" "https://www.pulumi.com/#organization"
+        "name" "Pulumi"
+      )) }}
+      
+      {{/* Add social profiles for entity disambiguation */}}
+      {{ $sameAs := slice }}
+      {{ with .social }}
+        {{ with .github }}
+          {{ $sameAs = $sameAs | append (printf "https://github.com/%s" .) }}
+        {{ end }}
+        {{ with .twitter }}
+          {{ $sameAs = $sameAs | append (printf "https://twitter.com/%s" .) }}
+        {{ end }}
+        {{ with .x }}
+          {{ $sameAs = $sameAs | append (printf "https://x.com/%s" .) }}
+        {{ end }}
+        {{ with .linkedin }}
+          {{ $sameAs = $sameAs | append (printf "https://linkedin.com/in/%s" .) }}
+        {{ end }}
+      {{ end }}
+      
+      {{ if $sameAs }}
+        {{ $author = merge $author (dict "sameAs" $sameAs) }}
+      {{ end }}
+      
+      {{/* Add URL to author page */}}
+      {{ $author = merge $author (dict "url" (printf "https://www.pulumi.com/authors/%s/" .id)) }}
+      
+      {{/* Add image if available */}}
+      {{ with .image }}
+        {{ $author = merge $author (dict "image" (printf "https://www.pulumi.com%s" .)) }}
+      {{ end }}
+      
+      {{/* Add expertise based on title */}}
+      {{ $knowsAbout := slice "Infrastructure as Code" "Cloud Computing" "DevOps" }}
+      {{ $titleLower := lower (or .title "") }}
+      
+      {{ if in $titleLower "engineer" }}
+        {{ $knowsAbout = $knowsAbout | append "Software Engineering" }}
+      {{ end }}
+      {{ if in $titleLower "manager" }}
+        {{ $knowsAbout = $knowsAbout | append "Engineering Management" }}
+      {{ end }}
+      {{ if in $titleLower "product" }}
+        {{ $knowsAbout = $knowsAbout | append "Product Management" }}
+      {{ end }}
+      {{ if in $titleLower "design" }}
+        {{ $knowsAbout = $knowsAbout | append "Design" "User Experience" }}
+      {{ end }}
+      {{ if in $titleLower "marketing" }}
+        {{ $knowsAbout = $knowsAbout | append "Marketing" "Content Marketing" }}
+      {{ end }}
+      {{ if in $titleLower "sales" }}
+        {{ $knowsAbout = $knowsAbout | append "Sales" "Enterprise Sales" }}
+      {{ end }}
+      {{ if in $titleLower "developer advocate" }}
+        {{ $knowsAbout = $knowsAbout | append "Developer Relations" "Technical Writing" }}
+      {{ end }}
+      {{ if in $titleLower "sre" }}
+        {{ $knowsAbout = $knowsAbout | append "Site Reliability Engineering" "Platform Engineering" }}
+      {{ end }}
+      {{ if in $titleLower "security" }}
+        {{ $knowsAbout = $knowsAbout | append "Security" "Cloud Security" }}
+      {{ end }}
+      {{ if or (in $titleLower "ceo") (in $titleLower "cto") (in $titleLower "vp") }}
+        {{ $knowsAbout = $knowsAbout | append "Leadership" "Strategy" }}
+      {{ end }}
+      
+      {{ $author = merge $author (dict "knowsAbout" $knowsAbout) }}
+      
+      {{/* Mark as founder if applicable */}}
+      {{ if or (eq .id "joe-duffy") (eq .id "eric-rudder") (eq .id "luke-hoban") }}
+        {{ $author = merge $author (dict "founder" (dict
+          "@type" "Organization"
+          "@id" "https://www.pulumi.com/#organization"
+        )) }}
+      {{ end }}
+      
+      {{/* Add affiliation */}}
+      {{ $author = merge $author (dict "affiliation" (dict
+        "@type" "Organization"
+        "@id" "https://www.pulumi.com/#organization"
+        "name" "Pulumi"
+      )) }}
+      
+      {{ $authors = $authors | append $author }}
+    {{ end }}
+  {{ end }}
+{{ end }}
+
+{{ return $authors }}
diff --git a/layouts/partials/schema/utils/cloud-provider-detector.html b/layouts/partials/schema/utils/cloud-provider-detector.html
new file mode 100644
index 000000000000..24d0b5db9914
--- /dev/null
+++ b/layouts/partials/schema/utils/cloud-provider-detector.html
@@ -0,0 +1,155 @@
+{{/* Detect cloud provider from URL path and frontmatter */}}
+{{/* Performance optimization: limit content scanning to improve build times */}}
+{{ $provider := dict }}
+{{ $url := .RelPermalink }}
+
+{{/* Get aggregated content using the content aggregator */}}
+{{ $aggregatedContent := partial "schema/utils/content-aggregator.html" . }}
+{{ $effectiveContent := $aggregatedContent.content }}
+
+{{ $maxLength := .Site.Params.schema.max_content_scan_length | default 5000 }}
+{{ $content := substr $effectiveContent 0 $maxLength | lower }}
+
+{{/* Check frontmatter first */}}
+{{ with .Params.cloud }}
+  {{ if or (eq .slug "aws") (in (lower .name) "amazon") (in (lower .name) "aws") }}
+    {{ $provider = dict
+      "@type" "Organization"
+      "@id" "https://www.wikidata.org/wiki/Q456157"
+      "name" "Amazon Web Services"
+      "alternateName" "AWS"
+      "url" "https://aws.amazon.com"
+      "sameAs" (slice "https://en.wikipedia.org/wiki/Amazon_Web_Services" "https://www.wikidata.org/wiki/Q456157")
+    }}
+  {{ else if or (eq .slug "azure") (in (lower .name) "azure") (in (lower .name) "microsoft") }}
+    {{ $provider = dict
+      "@type" "Organization"
+      "@id" "https://www.wikidata.org/wiki/Q1063364"
+      "name" "Microsoft Azure"
+      "alternateName" "Azure"
+      "url" "https://azure.microsoft.com"
+      "sameAs" (slice "https://en.wikipedia.org/wiki/Microsoft_Azure" "https://www.wikidata.org/wiki/Q1063364")
+    }}
+  {{ else if or (eq .slug "gcp") (eq .slug "google-cloud") (in (lower .name) "google") (in (lower .name) "gcp") }}
+    {{ $provider = dict
+      "@type" "Organization"
+      "@id" "https://www.wikidata.org/wiki/Q14055576"
+      "name" "Google Cloud Platform"
+      "alternateName" "GCP"
+      "url" "https://cloud.google.com"
+      "sameAs" (slice "https://en.wikipedia.org/wiki/Google_Cloud_Platform" "https://www.wikidata.org/wiki/Q14055576")
+    }}
+  {{ end }}
+{{ end }}
+
+{{/* If not in frontmatter, detect from URL */}}
+{{ if not $provider }}
+  {{ if or (in $url "/aws/") (in $url "/clouds/aws/") (in $url "/get-started/aws/") }}
+    {{ $provider = dict
+      "@type" "Organization"
+      "@id" "https://www.wikidata.org/wiki/Q456157"
+      "name" "Amazon Web Services"
+      "alternateName" "AWS"
+      "url" "https://aws.amazon.com"
+      "sameAs" (slice "https://en.wikipedia.org/wiki/Amazon_Web_Services" "https://www.wikidata.org/wiki/Q456157")
+    }}
+  {{ else if or (in $url "/azure/") (in $url "/clouds/azure/") (in $url "/get-started/azure/") }}
+    {{ $provider = dict
+      "@type" "Organization"
+      "@id" "https://www.wikidata.org/wiki/Q1063364"
+      "name" "Microsoft Azure"
+      "alternateName" "Azure"
+      "url" "https://azure.microsoft.com"
+      "sameAs" (slice "https://en.wikipedia.org/wiki/Microsoft_Azure" "https://www.wikidata.org/wiki/Q1063364")
+    }}
+  {{ else if or (in $url "/gcp/") (in $url "/clouds/gcp/") (in $url "/get-started/gcp/") (in $url "/google-cloud/") }}
+    {{ $provider = dict
+      "@type" "Organization"
+      "@id" "https://www.wikidata.org/wiki/Q14055576"
+      "name" "Google Cloud Platform"
+      "alternateName" "GCP"
+      "url" "https://cloud.google.com"
+      "sameAs" (slice "https://en.wikipedia.org/wiki/Google_Cloud_Platform" "https://www.wikidata.org/wiki/Q14055576")
+    }}
+  {{ else if or (in $url "/kubernetes/") (in $url "/k8s/") }}
+    {{ $provider = dict
+      "@type" "SoftwareApplication"
+      "@id" "https://www.wikidata.org/wiki/Q22661306"
+      "name" "Kubernetes"
+      "alternateName" "K8s"
+      "url" "https://kubernetes.io"
+      "applicationCategory" "Container Orchestration"
+      "sameAs" (slice "https://en.wikipedia.org/wiki/Kubernetes" "https://www.wikidata.org/wiki/Q22661306")
+    }}
+  {{ else if in $url "/digitalocean/" }}
+    {{ $provider = dict
+      "@type" "Organization"
+      "@id" "https://www.wikidata.org/wiki/Q14080290"
+      "name" "DigitalOcean"
+      "url" "https://www.digitalocean.com"
+      "sameAs" (slice "https://en.wikipedia.org/wiki/DigitalOcean" "https://www.wikidata.org/wiki/Q14080290")
+    }}
+  {{ else if in $url "/linode/" }}
+    {{ $provider = dict
+      "@type" "Organization"
+      "@id" "https://www.wikidata.org/wiki/Q1825436"
+      "name" "Linode"
+      "url" "https://www.linode.com"
+      "sameAs" (slice "https://en.wikipedia.org/wiki/Linode" "https://www.wikidata.org/wiki/Q1825436")
+    }}
+  {{ else if or (in $url "/cloudflare/") (in $content "cloudflare") }}
+    {{ $provider = dict
+      "@type" "Organization"
+      "@id" "https://www.wikidata.org/wiki/Q16832215"
+      "name" "Cloudflare"
+      "url" "https://www.cloudflare.com"
+      "sameAs" (slice "https://en.wikipedia.org/wiki/Cloudflare" "https://www.wikidata.org/wiki/Q16832215")
+    }}
+  {{ end }}
+{{ end }}
+
+{{/* Multi-cloud Detection Strategy */}}
+{{/* 
+  Multi-cloud scenario detection:
+  1. If a primary provider is already identified (from URL/frontmatter)
+  2. Scan content for references to OTHER cloud providers
+  3. Use specific patterns to avoid false positives:
+     - " aws " (with spaces to avoid partial matches)
+     - "@pulumi/aws" (package references)
+     - "aws:" (Pulumi resource type prefixes)
+  4. Only add providers that are different from the primary provider
+  5. This helps identify content that covers multiple cloud platforms
+*/}}
+{{ $additionalProviders := slice }}
+{{ if $provider }}
+  {{ if and $provider.name (not (in $provider.name "Amazon")) }}
+    {{ if or (in $content " aws ") (in $content "@pulumi/aws") (in $content "aws:") }}
+      {{ $additionalProviders = $additionalProviders | append (dict
+        "@type" "Organization"
+        "@id" "https://www.wikidata.org/wiki/Q456157"
+        "name" "Amazon Web Services"
+      ) }}
+    {{ end }}
+  {{ end }}
+  {{ if and $provider.name (not (in $provider.name "Azure")) }}
+    {{ if or (in $content " azure ") (in $content "@pulumi/azure") (in $content "azure:") }}
+      {{ $additionalProviders = $additionalProviders | append (dict
+        "@type" "Organization"
+        "@id" "https://www.wikidata.org/wiki/Q1063364"
+        "name" "Microsoft Azure"
+      ) }}
+    {{ end }}
+  {{ end }}
+  {{ if and $provider.name (not (in $provider.name "Google")) }}
+    {{ if or (in $content " gcp ") (in $content "google cloud") (in $content "@pulumi/gcp") (in $content "gcp:") }}
+      {{ $additionalProviders = $additionalProviders | append (dict
+        "@type" "Organization"
+        "@id" "https://www.wikidata.org/wiki/Q14055576"
+        "name" "Google Cloud Platform"
+      ) }}
+    {{ end }}
+  {{ end }}
+{{ end }}
+
+{{ $result := dict "primary" $provider "additional" $additionalProviders }}
+{{ return $result }}
diff --git a/layouts/partials/schema/utils/content-aggregator.html b/layouts/partials/schema/utils/content-aggregator.html
new file mode 100644
index 000000000000..24acc66d3b32
--- /dev/null
+++ b/layouts/partials/schema/utils/content-aggregator.html
@@ -0,0 +1,165 @@
+{{/* Content Aggregator Utility - Extracts effective content from various page types */}}
+{{/* Returns a dict with 'content' (string), 'wordCount' (int), and 'cloudServices' (slice) */}}
+
+{{ $result := dict "content" "" "wordCount" 0 "cloudServices" slice }}
+
+{{/* Strategy 1: Traditional markdown content */}}
+{{ if .Content }}
+  {{ $result = dict 
+    "content" .Content 
+    "wordCount" .WordCount 
+    "cloudServices" slice 
+  }}
+
+{{/* Strategy 2: Cloud overview pages - aggregate from structured data */}}
+{{ else if .Params.cloud_overview }}
+  {{ $aggregated := slice }}
+  
+  {{/* Add description */}}
+  {{ with .Params.description }}
+    {{ $aggregated = $aggregated | append . }}
+  {{ end }}
+  
+  {{/* Extract provider information */}}
+  {{ with .Params.providers }}
+    {{ with .description }}
+      {{ $aggregated = $aggregated | append . }}
+    {{ end }}
+    {{ range .provider_list }}
+      {{ $aggregated = $aggregated | append .display_name }}
+    {{ end }}
+  {{ end }}
+  
+  {{/* Extract component names and descriptions */}}
+  {{ $cloudServicesList := slice }}
+  {{ range .Params.components }}
+    {{ $aggregated = $aggregated | append .display_name }}
+    {{ with .description }}
+      {{ $aggregated = $aggregated | append . }}
+    {{ end }}
+    {{/* Track cloud services for schema */}}
+    {{ $cloudServicesList = $cloudServicesList | append .display_name }}
+  {{ end }}
+  
+  {{/* Extract templates */}}
+  {{ range .Params.templates }}
+    {{ $aggregated = $aggregated | append .display_name }}
+  {{ end }}
+  
+  {{/* Extract guides */}}
+  {{ with .Params.guides }}
+    {{ with .description }}
+      {{ $aggregated = $aggregated | append . }}
+    {{ end }}
+    {{ range .guides_list }}
+      {{ $aggregated = $aggregated | append .display_name }}
+    {{ end }}
+  {{ end }}
+  
+  {{/* Extract AWS Native section if present */}}
+  {{ with .Params.aws_native }}
+    {{ $aggregated = $aggregated | append .heading }}
+    {{ with .description }}
+      {{ $aggregated = $aggregated | append . }}
+    {{ end }}
+  {{ end }}
+  
+  {{/* Extract convert tools */}}
+  {{ range .Params.convert }}
+    {{ $aggregated = $aggregated | append .heading }}
+    {{ with .description }}
+      {{ $aggregated = $aggregated | append . }}
+    {{ end }}
+  {{ end }}
+  
+  {{/* Extract policy information */}}
+  {{ with .Params.policy }}
+    {{ with .description }}
+      {{ $aggregated = $aggregated | append . }}
+    {{ end }}
+  {{ end }}
+  
+  {{ $combinedContent := delimit $aggregated " " }}
+  {{ $wordCount := len (split $combinedContent " ") }}
+  
+  {{ $result = dict 
+    "content" $combinedContent 
+    "wordCount" $wordCount 
+    "cloudServices" $cloudServicesList 
+  }}
+
+{{/* Strategy 3: Docs home pages */}}
+{{ else if .Params.sections }}
+  {{ $aggregated := slice }}
+  
+  {{/* Add h1 and description */}}
+  {{ with .Params.h1 }}
+    {{ $aggregated = $aggregated | append . }}
+  {{ end }}
+  {{ with .Params.description }}
+    {{ $aggregated = $aggregated | append . }}
+  {{ end }}
+  
+  {{/* Extract section content */}}
+  {{ range .Params.sections }}
+    {{ with .heading }}
+      {{ $aggregated = $aggregated | append . }}
+    {{ end }}
+    {{ with .description }}
+      {{ $aggregated = $aggregated | append . }}
+    {{ end }}
+    {{ with .description_md }}
+      {{ $aggregated = $aggregated | append . }}
+    {{ end }}
+    
+    {{/* Extract card content */}}
+    {{ range .cards }}
+      {{ with .heading }}
+        {{ $aggregated = $aggregated | append . }}
+      {{ end }}
+      {{ with .label }}
+        {{ $aggregated = $aggregated | append . }}
+      {{ end }}
+      {{ with .description }}
+        {{ $aggregated = $aggregated | append . }}
+      {{ end }}
+    {{ end }}
+  {{ end }}
+  
+  {{ $combinedContent := delimit $aggregated " " }}
+  {{ $wordCount := len (split $combinedContent " ") }}
+  
+  {{ $result = dict 
+    "content" $combinedContent 
+    "wordCount" $wordCount 
+    "cloudServices" slice 
+  }}
+
+{{/* Strategy 4: Minimal pages - use title and description */}}
+{{ else }}
+  {{ $aggregated := slice }}
+  
+  {{ with .Title }}
+    {{ $aggregated = $aggregated | append . }}
+  {{ end }}
+  {{ with .Params.meta_desc }}
+    {{ $aggregated = $aggregated | append . }}
+  {{ end }}
+  {{ with .Params.description }}
+    {{ $aggregated = $aggregated | append . }}
+  {{ end }}
+  {{ with .Summary }}
+    {{ $aggregated = $aggregated | append . }}
+  {{ end }}
+  
+  {{ $combinedContent := delimit $aggregated " " }}
+  {{ $wordCount := len (split $combinedContent " ") }}
+  
+  {{ $result = dict 
+    "content" $combinedContent 
+    "wordCount" $wordCount 
+    "cloudServices" slice 
+  }}
+{{ end }}
+
+{{ return $result }}
diff --git a/layouts/partials/schema/utils/infrastructure-patterns.html b/layouts/partials/schema/utils/infrastructure-patterns.html
new file mode 100644
index 000000000000..f274f8dc7013
--- /dev/null
+++ b/layouts/partials/schema/utils/infrastructure-patterns.html
@@ -0,0 +1,123 @@
+{{/* Detect infrastructure patterns and architectural styles from content */}}
+
+{{/* Get aggregated content using the content aggregator */}}
+{{ $aggregatedContent := partial "schema/utils/content-aggregator.html" . }}
+{{ $effectiveContent := $aggregatedContent.content }}
+
+{{/* Performance optimization: limit content scanning to improve build times */}}
+{{ $patterns := slice }}
+{{ $maxLength := .Site.Params.schema.max_content_scan_length | default 5000 }}
+{{ $content := substr $effectiveContent 0 $maxLength | lower }}
+{{ $title := lower .Title }}
+{{ $url := .RelPermalink }}
+
+{{/* Serverless Patterns */}}
+{{ if or (in $content "serverless ") (in $content " serverless") (in $content "aws lambda") (in $content "azure functions") (in $content "cloud functions") (in $content "function-as-a-service") (in $content " faas ") (in $title "serverless") (in $url "/serverless/") }}
+  {{ $patterns = $patterns | append (dict
+    "@type" "DefinedTerm"
+    "@id" "https://en.wikipedia.org/wiki/Serverless_computing"
+    "name" "Serverless Computing"
+    "description" "Cloud computing execution model where cloud provider manages server infrastructure"
+    "sameAs" "https://www.wikidata.org/wiki/Q22908627"
+  ) }}
+{{ end }}
+
+{{/* Container Patterns */}}
+{{ if or (in $content "container ") (in $content " containers") (in $content "docker ") (in $content " docker") (in $content "kubernetes") (in $content " k8s ") (in $url "/kubernetes/") (in $url "/k8s/") (in $title "container") (in $title "docker") }}
+  {{ $patterns = $patterns | append (dict
+    "@type" "DefinedTerm"
+    "@id" "https://en.wikipedia.org/wiki/OS-level_virtualization"
+    "name" "Containerization"
+    "description" "Operating-system-level virtualization for deploying and running applications"
+    "sameAs" "https://www.wikidata.org/wiki/Q1143001"
+  ) }}
+{{ end }}
+
+{{/* Microservices */}}
+{{ if or (in $content "microservice") (in $content "micro-service") (in $content "service mesh") (in $title "microservice") }}
+  {{ $patterns = $patterns | append (dict
+    "@type" "DefinedTerm"
+    "@id" "https://en.wikipedia.org/wiki/Microservices"
+    "name" "Microservices Architecture"
+    "description" "Architectural style that structures applications as a collection of loosely coupled services"
+    "sameAs" "https://www.wikidata.org/wiki/Q18344624"
+  ) }}
+{{ end }}
+
+{{/* Infrastructure as Code */}}
+{{ if or (in $content "infrastructure as code") (in $content "infrastructure-as-code") (in $content " iac ") (in $content "pulumi") (in $content "terraform") (in $title "iac") (in $title "infrastructure as code") }}
+  {{ $patterns = $patterns | append (dict
+    "@type" "DefinedTerm"
+    "@id" "https://en.wikipedia.org/wiki/Infrastructure_as_code"
+    "name" "Infrastructure as Code"
+    "alternateName" "IaC"
+    "description" "Managing and provisioning computing infrastructure through machine-readable definition files"
+    "sameAs" "https://www.wikidata.org/wiki/Q6036587"
+  ) }}
+{{ end }}
+
+{{/* CI/CD */}}
+{{ if or (in $content "continuous integration") (in $content "continuous deployment") (in $content "continuous delivery") (in $content " ci/cd") (in $content "cicd") (in $content "github actions") (in $content "jenkins") (in $content "gitlab ci") (in $title "ci/cd") (in $title "cicd") }}
+  {{ $patterns = $patterns | append (dict
+    "@type" "DefinedTerm"
+    "@id" "https://en.wikipedia.org/wiki/CI/CD"
+    "name" "CI/CD"
+    "description" "Continuous Integration and Continuous Delivery/Deployment practices"
+    "sameAs" "https://www.wikidata.org/wiki/Q7562215"
+  ) }}
+{{ end }}
+
+{{/* Event-Driven Architecture */}}
+{{ if or (in $content "event-driven") (in $content "event driven") (in $content "message queue") (in $content "event bus") (in $content "pub/sub") (in $content "publish-subscribe") (in $title "event-driven") }}
+  {{ $patterns = $patterns | append (dict
+    "@type" "DefinedTerm"
+    "@id" "https://en.wikipedia.org/wiki/Event-driven_architecture"
+    "name" "Event-Driven Architecture"
+    "description" "Software architecture pattern promoting the production, detection, and reaction to events"
+    "sameAs" "https://www.wikidata.org/wiki/Q1384209"
+  ) }}
+{{ end }}
+
+{{/* API Gateway Pattern - More specific to avoid false positives */}}
+{{ if or (in $content "api gateway pattern") (in $content "implements api gateway") (in $content "api gateway as a pattern") (in $content "api management") (and (in $content "api gateway") (or (in $content "pattern") (in $content "microservice") (in $content "architecture"))) }}
+  {{ $patterns = $patterns | append (dict
+    "@type" "DefinedTerm"
+    "@id" "https://microservices.io/patterns/apigateway.html"
+    "name" "API Gateway Pattern"
+    "description" "Single entry point for all clients in microservices architecture"
+  ) }}
+{{ end }}
+
+{{/* DevOps Practices */}}
+{{ if or (in $content "devops") (in $content "dev ops") (in $content "devsecops") (in $title "devops") }}
+  {{ $patterns = $patterns | append (dict
+    "@type" "DefinedTerm"
+    "@id" "https://en.wikipedia.org/wiki/DevOps"
+    "name" "DevOps"
+    "description" "Set of practices combining software development and IT operations"
+    "sameAs" "https://www.wikidata.org/wiki/Q548486"
+  ) }}
+{{ end }}
+
+{{/* GitOps */}}
+{{ if or (in $content "gitops") (in $content "git ops") (in $content "git-ops") (in $title "gitops") }}
+  {{ $patterns = $patterns | append (dict
+    "@type" "DefinedTerm"
+    "@id" "https://www.weave.works/technologies/gitops/"
+    "name" "GitOps"
+    "description" "Operational framework using Git as a single source of truth for declarative infrastructure"
+  ) }}
+{{ end }}
+
+{{/* Service Mesh */}}
+{{ if or (in $content "service mesh") (in $content "istio") (in $content "linkerd") (in $content "consul connect") (in $title "service mesh") }}
+  {{ $patterns = $patterns | append (dict
+    "@type" "DefinedTerm"
+    "@id" "https://en.wikipedia.org/wiki/Service_mesh"
+    "name" "Service Mesh"
+    "description" "Infrastructure layer for service-to-service communication in microservices"
+    "sameAs" "https://www.wikidata.org/wiki/Q85759716"
+  ) }}
+{{ end }}
+
+{{ return $patterns }}
diff --git a/layouts/partials/schema/utils/product-entities.html b/layouts/partials/schema/utils/product-entities.html
new file mode 100644
index 000000000000..cf97569df135
--- /dev/null
+++ b/layouts/partials/schema/utils/product-entities.html
@@ -0,0 +1,127 @@
+{{/* Generate product entities with comprehensive relationships for knowledge graphs */}}
+
+{{/* Get aggregated content using the content aggregator */}}
+{{ $aggregatedContent := partial "schema/utils/content-aggregator.html" . }}
+{{ $effectiveContent := $aggregatedContent.content }}
+
+{{/* Define all Pulumi products with their relationships */}}
+{{ $pulumiCLI := dict
+  "@type" "SoftwareApplication"
+  "@id" "https://www.pulumi.com/#pulumi-cli"
+  "name" "Pulumi CLI"
+  "applicationCategory" "Infrastructure as Code"
+  "operatingSystem" (slice "macOS" "Windows" "Linux")
+  "url" "https://www.pulumi.com/product/infrastructure-as-code/"
+  "sameAs" (slice 
+    "https://github.com/pulumi/pulumi"
+    "https://en.wikipedia.org/wiki/Pulumi_(software)"
+    "https://www.wikidata.org/wiki/Q85792810"
+  )
+  "isPartOf" (dict
+    "@type" "SoftwareApplication"
+    "@id" "https://www.pulumi.com/product/#pulumi-platform"
+    "name" "Pulumi Platform"
+  )
+}}
+
+{{ $pulumiCloud := dict
+  "@type" "SoftwareApplication"
+  "@id" "https://www.pulumi.com/product/pulumi-cloud/#software"
+  "name" "Pulumi Cloud"
+  "applicationCategory" "Cloud Management Platform"
+  "url" "https://www.pulumi.com/product/pulumi-cloud/"
+  "isPartOf" (dict
+    "@type" "SoftwareApplication"
+    "@id" "https://www.pulumi.com/product/#pulumi-platform"
+    "name" "Pulumi Platform"
+  )
+}}
+
+{{ $pulumiESC := dict
+  "@type" "SoftwareApplication"
+  "@id" "https://www.pulumi.com/product/esc/#software"
+  "name" "Pulumi ESC"
+  "alternateName" "Pulumi Environments, Secrets, and Configuration"
+  "applicationCategory" "Secrets Management"
+  "url" "https://www.pulumi.com/product/esc/"
+  "isPartOf" (dict
+    "@type" "SoftwareApplication"
+    "@id" "https://www.pulumi.com/product/#pulumi-platform"
+    "name" "Pulumi Platform"
+  )
+}}
+
+{{ $pulumiInsights := dict
+  "@type" "SoftwareApplication"
+  "@id" "https://www.pulumi.com/product/pulumi-insights/#software"
+  "name" "Pulumi Insights"
+  "applicationCategory" "Cloud Intelligence Platform"
+  "url" "https://www.pulumi.com/product/pulumi-insights/"
+  "isPartOf" (dict
+    "@type" "SoftwareApplication"
+    "@id" "https://www.pulumi.com/product/#pulumi-platform"
+    "name" "Pulumi Platform"
+  )
+}}
+
+{{/* Determine which product is being discussed */}}
+{{ $mainProduct := false }}
+{{ $relatedProducts := slice }}
+{{ $url := .Permalink }}
+
+{{/* Check URL patterns for product detection */}}
+{{ if in $url "/docs/iac/" }}
+  {{ $mainProduct = $pulumiCLI }}
+  {{ $relatedProducts = slice $pulumiCloud $pulumiESC $pulumiInsights }}
+{{ else if in $url "/docs/esc/" }}
+  {{ $mainProduct = $pulumiESC }}
+  {{ $relatedProducts = slice $pulumiCLI $pulumiCloud $pulumiInsights }}
+{{ else if in $url "/docs/insights/" }}
+  {{ $mainProduct = $pulumiInsights }}
+  {{ $relatedProducts = slice $pulumiCLI $pulumiCloud $pulumiESC }}
+{{ else if in $url "/docs/pulumi-cloud/" }}
+  {{ $mainProduct = $pulumiCloud }}
+  {{ $relatedProducts = slice $pulumiCLI $pulumiESC $pulumiInsights }}
+{{ else if in $url "/product/" }}
+  {{/* For product pages, determine based on URL */}}
+  {{ if in $url "/infrastructure-as-code/" }}
+    {{ $mainProduct = $pulumiCLI }}
+    {{ $relatedProducts = slice $pulumiCloud $pulumiESC $pulumiInsights }}
+  {{ else if in $url "/pulumi-cloud/" }}
+    {{ $mainProduct = $pulumiCloud }}
+    {{ $relatedProducts = slice $pulumiCLI $pulumiESC $pulumiInsights }}
+  {{ else if in $url "/esc/" }}
+    {{ $mainProduct = $pulumiESC }}
+    {{ $relatedProducts = slice $pulumiCLI $pulumiCloud $pulumiInsights }}
+  {{ else if in $url "/insights/" }}
+    {{ $mainProduct = $pulumiInsights }}
+    {{ $relatedProducts = slice $pulumiCLI $pulumiCloud $pulumiESC }}
+  {{ else }}
+    {{/* Default to CLI for general product pages */}}
+    {{ $mainProduct = $pulumiCLI }}
+    {{ $relatedProducts = slice $pulumiCloud $pulumiESC $pulumiInsights }}
+  {{ end }}
+{{ end }}
+
+{{/* If no product matched by URL, check content using aggregated content */}}
+{{ if and (not $mainProduct) $effectiveContent }}
+  {{ $content := lower $effectiveContent }}
+  {{ $title := lower .Title }}
+  
+  {{ if or (in $content "pulumi cloud") (in $title "pulumi cloud") }}
+    {{ $mainProduct = $pulumiCloud }}
+    {{ $relatedProducts = slice $pulumiCLI $pulumiESC $pulumiInsights }}
+  {{ else if or (in $content "pulumi esc") (in $content "environments secrets configuration") (in $title "esc") }}
+    {{ $mainProduct = $pulumiESC }}
+    {{ $relatedProducts = slice $pulumiCLI $pulumiCloud $pulumiInsights }}
+  {{ else if or (in $content "pulumi insights") (in $title "insights") }}
+    {{ $mainProduct = $pulumiInsights }}
+    {{ $relatedProducts = slice $pulumiCLI $pulumiCloud $pulumiESC }}
+  {{ else if or (in $content "pulumi cli") (in $content "pulumi command") (in $title "cli") }}
+    {{ $mainProduct = $pulumiCLI }}
+    {{ $relatedProducts = slice $pulumiCloud $pulumiESC $pulumiInsights }}
+  {{ end }}
+{{ end }}
+
+{{/* Return structured result with mainProduct and relatedProducts */}}
+{{ return (dict "mainProduct" $mainProduct "relatedProducts" $relatedProducts) }}
diff --git a/layouts/partials/schema/utils/related-content.html b/layouts/partials/schema/utils/related-content.html
new file mode 100644
index 000000000000..8ef9fbe6499b
--- /dev/null
+++ b/layouts/partials/schema/utils/related-content.html
@@ -0,0 +1,110 @@
+{{/* Generate related content links based on tags/categories/content */}}
+{{ $relatedContent := slice }}
+
+{{/* Link tutorials to related documentation */}}
+{{ if eq .Type "tutorials" }}
+  {{/* Try to find related docs based on title/content */}}
+  {{ $tutorialTitle := lower .Title }}
+  {{ if in $tutorialTitle "aws" }}
+    {{ $relatedContent = $relatedContent | append (dict
+      "@type" "Article"
+      "@id" "https://www.pulumi.com/docs/clouds/aws/get-started/#article"
+      "name" "AWS Documentation"
+    ) }}
+  {{ else if in $tutorialTitle "azure" }}
+    {{ $relatedContent = $relatedContent | append (dict
+      "@type" "Article"
+      "@id" "https://www.pulumi.com/docs/clouds/azure/get-started/#article"
+      "name" "Azure Documentation"
+    ) }}
+  {{ else if in $tutorialTitle "gcp" }}
+    {{ $relatedContent = $relatedContent | append (dict
+      "@type" "Article"
+      "@id" "https://www.pulumi.com/docs/clouds/gcp/get-started/#article"
+      "name" "Google Cloud Documentation"
+    ) }}
+  {{ else if in $tutorialTitle "kubernetes" }}
+    {{ $relatedContent = $relatedContent | append (dict
+      "@type" "Article"
+      "@id" "https://www.pulumi.com/docs/clouds/kubernetes/#article"
+      "name" "Kubernetes Documentation"
+    ) }}
+  {{ end }}
+  
+  {{/* Link to main getting started */}}
+  {{ $relatedContent = $relatedContent | append (dict
+    "@type" "Article"
+    "@id" "https://www.pulumi.com/docs/get-started/#article"
+    "name" "Getting Started with Pulumi"
+  ) }}
+{{ end }}
+
+{{/* Link blog posts to related products */}}
+{{ if eq .Type "blog" }}
+  {{ $content := .Content }}
+  
+  {{ if in $content "Pulumi Cloud" }}
+    {{ $relatedContent = $relatedContent | append (dict
+      "@type" "SoftwareApplication"
+      "@id" "https://www.pulumi.com/product/pulumi-cloud/#software"
+      "name" "Pulumi Cloud"
+    ) }}
+  {{ end }}
+  
+  {{ if in $content "Pulumi Deployments" }}
+    {{ $relatedContent = $relatedContent | append (dict
+      "@type" "SoftwareApplication"
+      "@id" "https://www.pulumi.com/product/pulumi-deployments/#software"
+      "name" "Pulumi Deployments"
+    ) }}
+  {{ end }}
+  
+  {{ if in $content "Pulumi ESC" }}
+    {{ $relatedContent = $relatedContent | append (dict
+      "@type" "SoftwareApplication"
+      "@id" "https://www.pulumi.com/product/secrets-management/#software"
+      "name" "Pulumi ESC"
+    ) }}
+  {{ end }}
+  
+  {{ if in $content "Pulumi Neo" }}
+    {{ $relatedContent = $relatedContent | append (dict
+      "@type" "SoftwareApplication"
+      "@id" "https://www.pulumi.com/product/neo/#software"
+      "name" "Pulumi Neo"
+    ) }}
+  {{ end }}
+{{ end }}
+
+{{/* Link documentation to related tutorials */}}
+{{ if eq .Type "docs" }}
+  {{ $docPath := .RelPermalink }}
+  
+  {{ if in $docPath "/aws/" }}
+    {{ $relatedContent = $relatedContent | append (dict
+      "@type" "Course"
+      "@id" "https://www.pulumi.com/tutorials/creating-resources-aws/#course"
+      "name" "Creating AWS Resources Tutorial"
+    ) }}
+  {{ else if in $docPath "/azure/" }}
+    {{ $relatedContent = $relatedContent | append (dict
+      "@type" "Course"
+      "@id" "https://www.pulumi.com/tutorials/creating-resources-azure/#course"
+      "name" "Creating Azure Resources Tutorial"
+    ) }}
+  {{ else if in $docPath "/gcp/" }}
+    {{ $relatedContent = $relatedContent | append (dict
+      "@type" "Course"
+      "@id" "https://www.pulumi.com/tutorials/creating-resources-gcp/#course"
+      "name" "Creating GCP Resources Tutorial"
+    ) }}
+  {{ else if in $docPath "/kubernetes/" }}
+    {{ $relatedContent = $relatedContent | append (dict
+      "@type" "Course"
+      "@id" "https://www.pulumi.com/tutorials/creating-resources-kubernetes/#course"
+      "name" "Creating Kubernetes Resources Tutorial"
+    ) }}
+  {{ end }}
+{{ end }}
+
+{{ return $relatedContent }}
diff --git a/layouts/partials/schema/utils/resource-type-extractor.html b/layouts/partials/schema/utils/resource-type-extractor.html
new file mode 100644
index 000000000000..19c91b79116f
--- /dev/null
+++ b/layouts/partials/schema/utils/resource-type-extractor.html
@@ -0,0 +1,107 @@
+{{/* Cloud Resource Type Extractor - Data-driven approach for maintainability */}}
+{{/* Detects cloud services and Pulumi resource types mentioned in content */}}
+
+{{/* Get aggregated content using the content aggregator */}}
+{{ $aggregatedContent := partial "schema/utils/content-aggregator.html" . }}
+{{ $effectiveContent := $aggregatedContent.content }}
+{{ $cloudServicesFromAggregator := $aggregatedContent.cloudServices }}
+
+{{/* Load cloud resources configuration from data file */}}
+{{ $cloudResources := .Site.Data.cloud_resources.resources }}
+
+{{/* Performance optimization: limit content scanning */}}
+{{ $maxLength := .Site.Params.schema.max_content_scan_length | default 5000 }}
+{{ $content := substr $effectiveContent 0 $maxLength | lower }}
+{{ $url := .Permalink | lower }}
+{{ $title := .Title | lower }}
+
+{{/* Initialize result arrays */}}
+{{ $resources := slice }}
+{{ $pulumiResources := slice }}
+
+{{/* Add cloud services from cloud overview pages */}}
+{{ range $cloudServicesFromAggregator }}
+  {{ $serviceName := . | lower }}
+  {{/* Map component names to cloud resources - flexible matching */}}
+  {{ range $cloudResources }}
+    {{ $resourceName := .schema.name | lower }}
+    {{ $resourceId := .id | lower }}
+    {{/* Match by name (partial) or by ID keywords */}}
+    {{ if or (in $resourceName $serviceName) (in $serviceName $resourceName) (in $resourceId $serviceName) }}
+      {{ $resources = $resources | append .schema }}
+    {{ end }}
+  {{ end }}
+{{ end }}
+
+{{/* Loop through all defined cloud resources */}}
+{{ range $cloudResources }}
+  {{ $matched := false }}
+  
+  {{/* Check content patterns */}}
+  {{ range .patterns }}
+    {{ if in $content . }}
+      {{ $matched = true }}
+    {{ end }}
+  {{ end }}
+  
+  {{/* Check URL pattern if provided and not already matched */}}
+  {{ if and (not $matched) .url_pattern (ne .url_pattern "") }}
+    {{ if in $url .url_pattern }}
+      {{ $matched = true }}
+    {{ end }}
+  {{ end }}
+  
+  {{/* Check title pattern if provided and not already matched */}}
+  {{ if and (not $matched) .title_pattern (ne .title_pattern "") }}
+    {{ if in $title .title_pattern }}
+      {{ $matched = true }}
+    {{ end }}
+  {{ end }}
+  
+  {{/* If matched, add to appropriate array based on type */}}
+  {{ if $matched }}
+    {{ if eq .type "pulumi-resource" }}
+      {{ $pulumiResources = $pulumiResources | append . }}
+    {{ else }}
+      {{ $resources = $resources | append .schema }}
+    {{ end }}
+  {{ end }}
+{{ end }}
+
+{{/* Special handling for Registry pages */}}
+{{ if in $url "/registry/packages/" }}
+  {{ $packageName := replaceRE ".*?/registry/packages/([^/]+).*" "$1" $url }}
+  
+  {{/* Try to find a matching package in our data */}}
+  {{ range $cloudResources }}
+    {{ if and (eq .type "pulumi-resource") (eq .provider $packageName) }}
+      {{ $pulumiResources = $pulumiResources | append . }}
+    {{ end }}
+  {{ end }}
+{{ end }}
+
+{{/* Remove duplicates and prepare final schema entities */}}
+{{ $seenIds := slice }}
+{{ $cloudServices := slice }}
+
+{{ range $resources }}
+  {{ $resourceId := .id | default .name }}
+  {{ if not (in $seenIds $resourceId) }}
+    {{ $seenIds = $seenIds | append $resourceId }}
+    {{ $cloudServices = $cloudServices | append . }}
+  {{ end }}
+{{ end }}
+
+{{ $seenIds = slice }}
+{{ $pulumiResourceList := slice }}
+
+{{ range $pulumiResources }}
+  {{ $identifier := printf "%s-%s" .provider .resource }}
+  {{ if not (in $seenIds $identifier) }}
+    {{ $seenIds = $seenIds | append $identifier }}
+    {{ $pulumiResourceList = $pulumiResourceList | append . }}
+  {{ end }}
+{{ end }}
+
+{{/* Return results */}}
+{{ return (dict "cloudServices" $cloudServices "pulumiResources" $pulumiResourceList) }}
diff --git a/layouts/partials/schema/utils/technology-entities.html b/layouts/partials/schema/utils/technology-entities.html
new file mode 100644
index 000000000000..f6b3e1ae0c7a
--- /dev/null
+++ b/layouts/partials/schema/utils/technology-entities.html
@@ -0,0 +1,183 @@
+{{/* Map technology terms to their Wikipedia/Wikidata URIs for entity disambiguation */}}
+{{ $entities := slice }}
+
+{{/* Get aggregated content using the content aggregator */}}
+{{ $aggregatedContent := partial "schema/utils/content-aggregator.html" . }}
+{{ $effectiveContent := $aggregatedContent.content }}
+
+{{ $content := lower $effectiveContent }}
+{{ $title := lower .Title }}
+
+
+{{/* Container & Orchestration */}}
+{{ if or (in $content "kubernetes") (in $content "k8s") (in $title "kubernetes") }}
+  {{ $entities = $entities | append (dict
+    "@type" "SoftwareApplication"
+    "@id" "https://en.wikipedia.org/wiki/Kubernetes"
+    "name" "Kubernetes"
+    "alternateName" "K8s"
+    "sameAs" "https://www.wikidata.org/wiki/Q22661306"
+  ) }}
+{{ end }}
+
+{{ if or (in $content "docker") (in $title "docker") }}
+  {{ $entities = $entities | append (dict
+    "@type" "SoftwareApplication"
+    "@id" "https://en.wikipedia.org/wiki/Docker_(software)"
+    "name" "Docker"
+    "sameAs" "https://www.wikidata.org/wiki/Q15206305"
+  ) }}
+{{ end }}
+
+{{ if or (in $content "terraform") (in $title "terraform") }}
+  {{ $entities = $entities | append (dict
+    "@type" "SoftwareApplication"
+    "@id" "https://en.wikipedia.org/wiki/Terraform_(software)"
+    "name" "Terraform"
+    "sameAs" "https://www.wikidata.org/wiki/Q30273653"
+  ) }}
+{{ end }}
+
+{{/* Programming Languages */}}
+{{ if or (in $content "typescript") (in $title "typescript") }}
+  {{ $entities = $entities | append (dict
+    "@type" "ComputerLanguage"
+    "@id" "https://en.wikipedia.org/wiki/TypeScript"
+    "name" "TypeScript"
+    "sameAs" "https://www.wikidata.org/wiki/Q978185"
+  ) }}
+{{ end }}
+
+{{ if or (in $content "python") (in $title "python") }}
+  {{ $entities = $entities | append (dict
+    "@type" "ComputerLanguage"
+    "@id" "https://en.wikipedia.org/wiki/Python_(programming_language)"
+    "name" "Python"
+    "sameAs" "https://www.wikidata.org/wiki/Q28865"
+  ) }}
+{{ end }}
+
+{{ if or (in $content "javascript") (in $title "javascript") }}
+  {{ $entities = $entities | append (dict
+    "@type" "ComputerLanguage"
+    "@id" "https://en.wikipedia.org/wiki/JavaScript"
+    "name" "JavaScript"
+    "sameAs" "https://www.wikidata.org/wiki/Q2005"
+  ) }}
+{{ end }}
+
+{{ if or (in $content "golang") (in $content "go programming") (in $title "go ") }}
+  {{ $entities = $entities | append (dict
+    "@type" "ComputerLanguage"
+    "@id" "https://en.wikipedia.org/wiki/Go_(programming_language)"
+    "name" "Go"
+    "alternateName" "Golang"
+    "sameAs" "https://www.wikidata.org/wiki/Q37227"
+  ) }}
+{{ end }}
+
+{{ if or (in $content "java ") (in $content "java.") (in $title "java") }}
+  {{ $entities = $entities | append (dict
+    "@type" "ComputerLanguage"
+    "@id" "https://en.wikipedia.org/wiki/Java_(programming_language)"
+    "name" "Java"
+    "sameAs" "https://www.wikidata.org/wiki/Q251"
+  ) }}
+{{ end }}
+
+{{ if or (in $content "csharp") (in $content "c#") (in $title "c#") }}
+  {{ $entities = $entities | append (dict
+    "@type" "ComputerLanguage"
+    "@id" "https://en.wikipedia.org/wiki/C_Sharp_(programming_language)"
+    "name" "C#"
+    "alternateName" "CSharp"
+    "sameAs" "https://www.wikidata.org/wiki/Q2370"
+  ) }}
+{{ end }}
+
+{{ if or (in $content "yaml") (in $title "yaml") }}
+  {{ $entities = $entities | append (dict
+    "@type" "ComputerLanguage"
+    "@id" "https://en.wikipedia.org/wiki/YAML"
+    "name" "YAML"
+    "sameAs" "https://www.wikidata.org/wiki/Q281876"
+  ) }}
+{{ end }}
+
+{{/* DevOps & CI/CD */}}
+{{ if or (in $content "github actions") (in $title "github actions") }}
+  {{ $entities = $entities | append (dict
+    "@type" "SoftwareApplication"
+    "@id" "https://en.wikipedia.org/wiki/GitHub#GitHub_Actions"
+    "name" "GitHub Actions"
+    "sameAs" "https://www.wikidata.org/wiki/Q95990850"
+  ) }}
+{{ end }}
+
+{{ if or (in $content "gitlab") (in $title "gitlab") }}
+  {{ $entities = $entities | append (dict
+    "@type" "SoftwareApplication"
+    "@id" "https://en.wikipedia.org/wiki/GitLab"
+    "name" "GitLab"
+    "sameAs" "https://www.wikidata.org/wiki/Q16639197"
+  ) }}
+{{ end }}
+
+{{ if or (in $content "jenkins") (in $title "jenkins") }}
+  {{ $entities = $entities | append (dict
+    "@type" "SoftwareApplication"
+    "@id" "https://en.wikipedia.org/wiki/Jenkins_(software)"
+    "name" "Jenkins"
+    "sameAs" "https://www.wikidata.org/wiki/Q7491312"
+  ) }}
+{{ end }}
+
+{{ if or (in $content "circleci") (in $title "circleci") }}
+  {{ $entities = $entities | append (dict
+    "@type" "SoftwareApplication"
+    "name" "CircleCI"
+    "sameAs" "https://www.wikidata.org/wiki/Q64110864"
+  ) }}
+{{ end }}
+
+{{/* Databases */}}
+{{ if or (in $content "postgresql") (in $content "postgres") (in $title "postgres") }}
+  {{ $entities = $entities | append (dict
+    "@type" "SoftwareApplication"
+    "@id" "https://en.wikipedia.org/wiki/PostgreSQL"
+    "name" "PostgreSQL"
+    "alternateName" "Postgres"
+    "sameAs" "https://www.wikidata.org/wiki/Q192490"
+  ) }}
+{{ end }}
+
+{{ if or (in $content "mysql") (in $title "mysql") }}
+  {{ $entities = $entities | append (dict
+    "@type" "SoftwareApplication"
+    "@id" "https://en.wikipedia.org/wiki/MySQL"
+    "name" "MySQL"
+    "sameAs" "https://www.wikidata.org/wiki/Q850"
+  ) }}
+{{ end }}
+
+{{ if or (in $content "mongodb") (in $title "mongodb") }}
+  {{ $entities = $entities | append (dict
+    "@type" "SoftwareApplication"
+    "@id" "https://en.wikipedia.org/wiki/MongoDB"
+    "name" "MongoDB"
+    "sameAs" "https://www.wikidata.org/wiki/Q1165204"
+  ) }}
+{{ end }}
+
+{{ if or (in $content "redis") (in $title "redis") }}
+  {{ $entities = $entities | append (dict
+    "@type" "SoftwareApplication"
+    "@id" "https://en.wikipedia.org/wiki/Redis"
+    "name" "Redis"
+    "sameAs" "https://www.wikidata.org/wiki/Q2136322"
+  ) }}
+{{ end }}
+
+
+
+{{ return $entities }}
diff --git a/layouts/tutorials/section.html b/layouts/tutorials/section.html
index 395eb7502259..38b24db0494e 100644
--- a/layouts/tutorials/section.html
+++ b/layouts/tutorials/section.html
@@ -133,5 +133,6 @@ <h3 class="no-anchor font-normal text-xl flex items-center">
 {{ end }}
 
 {{ define "footer" }}
-
+    {{/* Include Course List Schema for SEO */}}
+    {{ partial "schema/content/course-list.html" . }}
 {{ end }}