diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml
index ac80cda..c35dc72 100644
--- a/.github/workflows/deploy.yml
+++ b/.github/workflows/deploy.yml
@@ -86,9 +86,10 @@ jobs:
           AUTHOR_AVATAR: ${{ secrets.AUTHOR_AVATAR }}
           AUTHOR_BIO: ${{ secrets.AUTHOR_BIO }}
           AUTHOR_EMAIL: ${{ secrets.AUTHOR_EMAIL }}
-          GITHUB_USERNAME: ${{ secrets.GH_USERNAME }}
+          GITHUB_USERNAME: ${{ secrets.GITHUB_USERNAME }}
           MASTODON_INSTANCE: ${{ secrets.MASTODON_INSTANCE }}
           MASTODON_USER: ${{ secrets.MASTODON_USER }}
+          BLUESKY_HANDLE: ${{ secrets.BLUESKY_HANDLE }}
           OWNYOURSWARM_FEED_URL: ${{ secrets.OWNYOURSWARM_FEED_URL }}
           OWNYOURSWARM_FEED_TOKEN: ${{ secrets.OWNYOURSWARM_FEED_TOKEN }}
           LISTENING_FETCH_CACHE_DURATION: ${{ secrets.LISTENING_FETCH_CACHE_DURATION }}
diff --git a/_data/mastodonFeed.js b/_data/mastodonFeed.js
index 0c79abf..4255b48 100644
--- a/_data/mastodonFeed.js
+++ b/_data/mastodonFeed.js
@@ -6,8 +6,23 @@
 import EleventyFetch from "@11ty/eleventy-fetch";
 
 export default async function () {
-  const instance = process.env.MASTODON_INSTANCE?.replace("https://", "") || "";
-  const username = process.env.MASTODON_USER || "";
+  const instance = (
+    process.env.MASTODON_URL ||
+    process.env.MASTODON_INSTANCE ||
+    ""
+  )
+    .replace(/^https?:\/\//, "")
+    .replace(/\/+$/, "");
+  const username = (
+    process.env.MASTODON_USER ||
+    process.env.MASTODON_USERNAME ||
+    ""
+  ).trim().replace(/^@+/, "");
+
+  if (!instance || !username) {
+    console.log("[mastodonFeed] MASTODON_URL/MASTODON_USER not set, skipping");
+    return [];
+  }
 
   try {
     // First, look up the account ID
diff --git a/theme/_data/mastodonFeed.js b/theme/_data/mastodonFeed.js
index 0c79abf..4255b48 100644
--- a/theme/_data/mastodonFeed.js
+++ b/theme/_data/mastodonFeed.js
@@ -6,8 +6,23 @@
 import EleventyFetch from "@11ty/eleventy-fetch";
 
 export default async function () {
-  const instance = process.env.MASTODON_INSTANCE?.replace("https://", "") || "";
-  const username = process.env.MASTODON_USER || "";
+  const instance = (
+    process.env.MASTODON_URL ||
+    process.env.MASTODON_INSTANCE ||
+    ""
+  )
+    .replace(/^https?:\/\//, "")
+    .replace(/\/+$/, "");
+  const username = (
+    process.env.MASTODON_USER ||
+    process.env.MASTODON_USERNAME ||
+    ""
+  ).trim().replace(/^@+/, "");
+
+  if (!instance || !username) {
+    console.log("[mastodonFeed] MASTODON_URL/MASTODON_USER not set, skipping");
+    return [];
+  }
 
   try {
     // First, look up the account ID