diff --git a/api/og-image.php b/api/og-image.php
new file mode 100644
index 0000000..97c95ef
--- /dev/null
+++ b/api/og-image.php
@@ -0,0 +1,41 @@
+<?php
+  $id = $_GET['id'] ?? null;
+  $class = $_GET['class'] ?? null;
+  $extension = $_GET['extension'] ?? 'png';
+  $isValidId = is_string($id) && preg_match('/^[a-f0-9\-]{36}$/', $id);
+
+  if (!$isValidId || !$class) {
+    header("Location: /404", true, 302);
+    exit;
+  }
+
+  $cdnUrl = "https://cdn.coryd.dev/$id.$extension?class=$class";
+  $ch = curl_init($cdnUrl);
+
+  curl_setopt($ch, CURLOPT_RETURNTRANSFER, true);
+  curl_setopt($ch, CURLOPT_FOLLOWLOCATION, true);
+  curl_setopt($ch, CURLOPT_USERAGENT, $_SERVER['HTTP_USER_AGENT']);
+
+  $image = curl_exec($ch);
+  $httpCode = curl_getinfo($ch, CURLINFO_HTTP_CODE);
+  $contentType = curl_getinfo($ch, CURLINFO_CONTENT_TYPE);
+
+  curl_close($ch);
+
+  error_log("CDN response code: $httpCode, Content-Type: $contentType");
+
+  if ($httpCode !== 200 || $image === false) {
+    error_log("Failed to fetch image: $cdnUrl");
+    header("Location: /404", true, 302);
+    exit;
+  }
+
+  if (strpos($contentType, 'image/') === 0) {
+    header("Content-Type: $contentType");
+    header("Cache-Control: public, max-age=86400");
+    echo $image;
+  } else {
+    error_log("Invalid content type: $contentType");
+    header("Location: /404", true, 302);
+    exit;
+  }
diff --git a/package-lock.json b/package-lock.json
index 5500fe1..0cba166 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,12 +1,12 @@
 {
   "name": "coryd.dev",
-  "version": "3.5.0",
+  "version": "3.6.0",
   "lockfileVersion": 3,
   "requires": true,
   "packages": {
     "": {
       "name": "coryd.dev",
-      "version": "3.5.0",
+      "version": "3.6.0",
       "license": "MIT",
       "dependencies": {
         "html-minifier-terser": "7.2.0",
diff --git a/package.json b/package.json
index 9761ae8..0f907d3 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "coryd.dev",
-  "version": "3.5.0",
+  "version": "3.6.0",
   "description": "The source for my personal site. Built using 11ty (and other tools).",
   "type": "module",
   "engines": {
diff --git a/src/feeds/json.liquid b/src/feeds/json.liquid
index fc73798..05567ed 100644
--- a/src/feeds/json.liquid
+++ b/src/feeds/json.liquid
@@ -11,7 +11,7 @@ permalink: "{{ feed.permalink }}.json"
 {
   "version": "https://jsonfeed.org/version/1",
   "title": "{{ feed.title | append: " • " | append: globals.site_name }}",
-  "icon": "{{ globals.url }}/assets/icons/feed.png",
+  "icon": "{{ globals.url }}/og/w200/{% appVersion %}{{ globals.avatar }}",
   "home_page_url": "{{ globals.url }}",
   "feed_url": "{{ globals.url }}{{ feed.permalink }}.json",
   "items": [
diff --git a/src/feeds/rss.liquid b/src/feeds/rss.liquid
index 1440575..d4d0cba 100644
--- a/src/feeds/rss.liquid
+++ b/src/feeds/rss.liquid
@@ -17,7 +17,7 @@ permalink: "{{ feed.permalink }}.xml"
     <atom:link href="{{ globals.url }}{{ feed.permalink }}.xml" rel="self" type="application/rss+xml" />
     <lastBuildDate>{{ "now" | date:"%a, %d %b %Y %H:%M:%S %z" }}</lastBuildDate>
     <image>
-      <url>{{ globals.url }}/assets/icons/feed.png</url>
+      <url>{{ globals.url }}/og/w200/{% appVersion %}{{ globals.avatar }}</url>
       <title><![CDATA[{{ feed.title | append: " • " | append: globals.site_name }}]]></title>
       <link>{{ globals.url }}{{ feed.permalink }}.xml</link>
       <width>144</width>
diff --git a/src/includes/metadata/base.liquid b/src/includes/metadata/base.liquid
index f5c1030..9bacbae 100644
--- a/src/includes/metadata/base.liquid
+++ b/src/includes/metadata/base.liquid
@@ -4,10 +4,9 @@
 <meta name="theme-color" content="{{ globals.theme_color }}" />
 <meta name="fediverse:creator" content="{{ globals.mastodon }}" />
 <meta name="generator" content="{{ eleventy.generator }}" />
-<link href="{{ globals.cdn_url }}{{ globals.avatar_transparent }}?class=w50&v={% appVersion %}" rel="icon" sizes="any" />
-<link href="{{ globals.cdn_url }}{{ globals.avatar_transparent }}?class=w50&v={% appVersion %}&type=svg" rel="icon" type="image/svg+xml" />
-<link href="{{ globals.cdn_url }}{{ globals.avatar }}?class=w800&v={% appVersion %}" rel="apple-touch-icon" />
-<link rel="alternate" href="{{ globals.url }}/feeds/posts.xml" title="Posts • {{ globals.site_name }}" />
-<link rel="alternate" href="{{ globals.url }}/feeds/links.xml" title="Links • {{ globals.site_name }}" type="application/rss+xml" />
-<link rel="alternate" href="{{ globals.url }}/feeds/movies.xml" title="Movies • {{ globals.site_name }}" type="application/rss+xml" />
-<link rel="alternate" href="{{ globals.url }}/feeds/books.xml" title="Books • {{ globals.site_name }}" type="application/rss+xml" />
+<link href="/og/w50/{% appVersion %}{{ globals.avatar_transparent }}" rel="icon" sizes="any" />
+<link href="/og/w800/{% appVersion %}{{ globals.avatar }}" rel="apple-touch-icon" />
+<link rel="alternate" href="/feeds/posts.xml" title="Posts • {{ globals.site_name }}" />
+<link rel="alternate" href="/feeds/links.xml" title="Links • {{ globals.site_name }}" type="application/rss+xml" />
+<link rel="alternate" href="/feeds/movies.xml" title="Movies • {{ globals.site_name }}" type="application/rss+xml" />
+<link rel="alternate" href="/feeds/books.xml" title="Books • {{ globals.site_name }}" type="application/rss+xml" />
diff --git a/src/includes/metadata/dynamic.php.liquid b/src/includes/metadata/dynamic.php.liquid
index 3661876..517981d 100644
--- a/src/includes/metadata/dynamic.php.liquid
+++ b/src/includes/metadata/dynamic.php.liquid
@@ -2,7 +2,7 @@
 <meta name="description" content="<?= cleanMeta($pageDescription ?? '{{ pageDescription | escape }}') ?>" />
 <meta property="og:title" content="<?= cleanMeta($pageTitle ?? '{{ pageTitle }}') ?> • {{ globals.site_name }}" />
 <meta property="og:description" content="<?= cleanMeta($pageDescription ?? '{{ pageDescription | escape }}') ?>" />
-<meta property="og:image" content="<?= cleanMeta("{{ globals.cdn_url }}" . ($ogImage ?? '{{ ogImage }}')) ?>" />
+<meta property="og:image" content="<?= cleanMeta("/og/w800/{% appVersion %}" . ($ogImage ?? '{{ ogImage }}')) ?>" />
 <meta property="og:url" content="<?= cleanMeta($fullUrl ?? '{{ fullUrl }}') ?>" />
 <link rel="canonical" href="<?= cleanMeta($fullUrl ?? '{{ fullUrl }}') ?>" />
 <?php if (!empty($pagination)): ?>
diff --git a/src/includes/metadata/static.liquid b/src/includes/metadata/static.liquid
index 3949880..b0a627b 100644
--- a/src/includes/metadata/static.liquid
+++ b/src/includes/metadata/static.liquid
@@ -6,4 +6,4 @@
 <meta property="og:type" content="article" />
 <meta property="og:url" content="{{ fullUrl }}" />
 <link rel="canonical" href="{{ fullUrl }}" />
-<meta property="og:image" content="{{ ogImage }}?class=w800" />
+<meta property="og:image" content="/og/w800/{% appVersion %}{{ globals.avatar }}" />
diff --git a/src/meta/htaccess.liquid b/src/meta/htaccess.liquid
index df25c50..720bde1 100644
--- a/src/meta/htaccess.liquid
+++ b/src/meta/htaccess.liquid
@@ -47,6 +47,9 @@ RewriteRule ^music/genres/([^/]+)/?$ music/genres/index.php [L]
 ## tags
 RewriteRule ^tags/([^/]+)(?:/([0-9]+))?/?$ tags/index.php [L]
 
+## open graph assets
+RewriteRule ^og/([a-z0-9\-]+)/([\d\.]+)/([a-f0-9\-]+)\.[a-z0-9]+$ /api/og-image.php?id=$3&class=$1&v=$2 [L]
+
 {% for redirect in redirects -%}
 Redirect {{ redirect.status_code | default: "301" }} {{ redirect.source_url }} {{ redirect.destination_url }}
 {% endfor -%}