diff --git a/.gitea/workflows/deploy.yml b/.gitea/workflows/deploy.yml
index 42b0274e..73d296b2 100644
--- a/.gitea/workflows/deploy.yml
+++ b/.gitea/workflows/deploy.yml
@@ -6,7 +6,7 @@ on:
 
 jobs:
   deploy:
-    runs-on: self-hosted
+    runs-on: infra-runner
 
     steps:
       - uses: actions/checkout@v4
diff --git a/app/[locale]/blog/[slug]/page.tsx b/app/[locale]/blog/[slug]/page.tsx
index 48912278..b6f9c647 100644
--- a/app/[locale]/blog/[slug]/page.tsx
+++ b/app/[locale]/blog/[slug]/page.tsx
@@ -336,14 +336,14 @@ export default async function BlogPost({ params: { locale, slug } }: BlogPostPro
             '@type': 'Organization',
             name: 'KLZ Cables',
             url: 'https://klz-cables.com',
-            logo: 'https://klz-cables.com/logo.png'
+            logo: 'https://klz-cables.com/logo-blue.svg'
           },
           publisher: {
             '@type': 'Organization',
             name: 'KLZ Cables',
             logo: {
               '@type': 'ImageObject',
-              url: 'https://klz-cables.com/logo.png',
+              url: 'https://klz-cables.com/logo-blue.svg',
             },
           },
           description: post.frontmatter.excerpt,
@@ -354,7 +354,7 @@ export default async function BlogPost({ params: { locale, slug } }: BlogPostPro
           articleSection: post.frontmatter.category,
           wordCount: post.content.split(/\s+/).length,
           timeRequired: `PT${getReadingTime(post.content)}M`
-        }}
+        } as any}
       />
       <JsonLd
         id={`breadcrumb-${slug}`}
@@ -375,7 +375,7 @@ export default async function BlogPost({ params: { locale, slug } }: BlogPostPro
               item: `https://klz-cables.com/${locale}/blog/${slug}`,
             },
           ],
-        }}
+        } as any}
       />
     </article>
   );
diff --git a/app/[locale]/products/[...slug]/page.tsx b/app/[locale]/products/[...slug]/page.tsx
index 6aee00e8..9d4e0fb0 100644
--- a/app/[locale]/products/[...slug]/page.tsx
+++ b/app/[locale]/products/[...slug]/page.tsx
@@ -356,29 +356,37 @@ export default async function ProductPage({ params }: ProductPageProps) {
               </div>
 
               {/* Structured Data */}
-              <Script
+              <JsonLd
                 id={`jsonld-${product.slug}`}
-                type="application/ld+json"
-                dangerouslySetInnerHTML={{
-                  __html: JSON.stringify({
-                    '@context': 'https://schema.org',
-                    '@type': 'Product',
-                    name: product.frontmatter.title,
-                    description: product.frontmatter.description,
-                    sku: product.frontmatter.sku,
-                    image: product.frontmatter.images?.[0] ? `https://klz-cables.com${product.frontmatter.images[0]}` : undefined,
-                    brand: {
-                      '@type': 'Brand',
-                      name: 'KLZ Cables',
-                    },
-                    offers: {
-                      '@type': 'Offer',
-                      availability: 'https://schema.org/InStock',
-                      priceCurrency: 'EUR',
-                      url: `https://klz-cables.com/${locale}/products/${slug.join('/')}`,
-                    },
-                  }),
-                }}
+                data={{
+                  '@context': 'https://schema.org',
+                  '@type': 'Product',
+                  name: product.frontmatter.title,
+                  description: product.frontmatter.description,
+                  sku: product.frontmatter.sku || product.slug.toUpperCase(),
+                  image: product.frontmatter.images?.[0] ? `https://klz-cables.com${product.frontmatter.images[0]}` : undefined,
+                  brand: {
+                    '@type': 'Brand',
+                    name: 'KLZ Cables',
+                  },
+                  offers: {
+                    '@type': 'Offer',
+                    availability: 'https://schema.org/InStock',
+                    priceCurrency: 'EUR',
+                    url: `https://klz-cables.com/${locale}/products/${slug.join('/')}`,
+                    itemCondition: 'https://schema.org/NewCondition',
+                  },
+                  additionalProperty: technicalItems.map((item: any) => ({
+                    '@type': 'PropertyValue',
+                    name: item.label,
+                    value: item.value,
+                  })),
+                  category: product.frontmatter.categories.join(', '),
+                  mainEntityOfPage: {
+                    '@type': 'WebPage',
+                    '@id': `https://klz-cables.com/${locale}/products/${slug.join('/')}`,
+                  },
+                } as any}
               />
             </div>
           </div>
diff --git a/components/JsonLd.tsx b/components/JsonLd.tsx
index 90a66770..042f4093 100644
--- a/components/JsonLd.tsx
+++ b/components/JsonLd.tsx
@@ -1,43 +1,50 @@
-import { Organization, WebSite, WithContext } from 'schema-dts';
+import { Thing, WithContext } from 'schema-dts';
 
-export default function JsonLd() {
-  const organizationJsonLd: WithContext<Organization> = {
-    '@context': 'https://schema.org',
-    '@type': 'Organization',
-    name: 'KLZ Cables',
-    url: 'https://klz-cables.com',
-    logo: 'https://klz-cables.com/logo-blue.svg',
-    sameAs: [
-      'https://www.linkedin.com/company/klz-cables',
-    ],
-    description: 'Premium Cable Solutions for Renewable Energy and Infrastructure.',
-    address: {
-      '@type': 'PostalAddress',
-      addressCountry: 'DE',
-    },
-  };
+interface JsonLdProps {
+  id?: string;
+  data?: WithContext<Thing> | WithContext<Thing>[];
+}
 
-  const websiteJsonLd: WithContext<WebSite> = {
-    '@context': 'https://schema.org',
-    '@type': 'WebSite',
-    name: 'KLZ Cables',
-    url: 'https://klz-cables.com',
-    potentialAction: {
-      '@type': 'SearchAction',
-      target: {
-        '@type': 'EntryPoint',
-        urlTemplate: 'https://klz-cables.com/search?q={search_term_string}',
+export default function JsonLd({ id, data }: JsonLdProps) {
+  // If data is provided, use it. Otherwise, use the default Organization + WebSite schema.
+  const schemaData = data || [
+    {
+      '@context': 'https://schema.org',
+      '@type': 'Organization',
+      name: 'KLZ Cables',
+      url: 'https://klz-cables.com',
+      logo: 'https://klz-cables.com/logo-blue.svg',
+      sameAs: [
+        'https://www.linkedin.com/company/klz-cables',
+      ],
+      description: 'Premium Cable Solutions for Renewable Energy and Infrastructure.',
+      address: {
+        '@type': 'PostalAddress',
+        addressCountry: 'DE',
       },
-      // @ts-ignore - schema-dts might not have this specific property but it's valid for Google
-      'query-input': 'required name=search_term_string',
-    } as any,
-  };
+    },
+    {
+      '@context': 'https://schema.org',
+      '@type': 'WebSite',
+      name: 'KLZ Cables',
+      url: 'https://klz-cables.com',
+      potentialAction: {
+        '@type': 'SearchAction',
+        target: {
+          '@type': 'EntryPoint',
+          urlTemplate: 'https://klz-cables.com/search?q={search_term_string}',
+        },
+        'query-input': 'required name=search_term_string',
+      },
+    }
+  ];
 
   return (
     <script
+      id={id}
       type="application/ld+json"
       dangerouslySetInnerHTML={{
-        __html: JSON.stringify([organizationJsonLd, websiteJsonLd]),
+        __html: JSON.stringify(schemaData),
       }}
     />
   );