diff --git a/components/nav/SelectFeatureFlags.vue b/components/nav/SelectFeatureFlags.vue
index 89f232e7..57a5356b 100644
--- a/components/nav/SelectFeatureFlags.vue
+++ b/components/nav/SelectFeatureFlags.vue
@@ -18,6 +18,12 @@ const featureFlags = useFeatureFlags()
       >
         {{ $t('feature_flag.avatar_on_avatar') }}
       </CommonDropdownItem>
+      <CommonDropdownItem
+        :checked="featureFlags.experimentalAvatarOnAvatar"
+        @click="toggleFeatureFlag('experimentalGitHubCards')"
+      >
+        {{ $t('feature_flag.github_cards') }}
+      </CommonDropdownItem>
     </template>
   </CommonDropdown>
 </template>
diff --git a/components/status/StatusPreviewCard.vue b/components/status/StatusPreviewCard.vue
index 36c30b29..2603fc25 100644
--- a/components/status/StatusPreviewCard.vue
+++ b/components/status/StatusPreviewCard.vue
@@ -21,6 +21,7 @@ const isSquare = $computed(() => (
 ))
 const providerName = $computed(() => props.card.providerName ? props.card.providerName : new URL(props.card.url).hostname)
 
+const gitHubCards = $(computedEager(() => useFeatureFlags().experimentalGitHubCards))
 // TODO: handle card.type: 'photo' | 'video' | 'rich';
 </script>
 
@@ -37,8 +38,9 @@ const providerName = $computed(() => props.card.providerName ? props.card.provid
     }"
     target="_blank"
   >
+    <StatusPreviewGitHub v-if="gitHubCards && providerName === 'GitHub'" :card="card" />
     <div
-      v-if="card.image"
+      v-else-if="card.image"
       flex flex-col
       display-block of-hidden
       border="base"
diff --git a/components/status/StatusPreviewGitHub.vue b/components/status/StatusPreviewGitHub.vue
new file mode 100644
index 00000000..071c8f4b
--- /dev/null
+++ b/components/status/StatusPreviewGitHub.vue
@@ -0,0 +1,127 @@
+<script setup lang="ts">
+import type { Card } from 'masto'
+
+const props = defineProps<{
+  card: Card
+}>()
+
+const isSquare = false
+const root = true
+
+type UrlType = 'user' | 'repo' | 'issue' | 'pull'
+interface Meta {
+  type: UrlType
+  user: string
+  avatar: string
+  details: string
+  repo?: string
+  number?: string
+  extra?: {
+    state: string
+    author?: {
+      avatar: string
+      user: string
+    }
+  }
+}
+
+const meta = $computed(() => {
+  const { url } = props.card
+  const path = url.split('https://github.com/')[1]
+  const user = path.match(/([\w-]+)\//)![1]
+  const repo = path.match(/[\w-]+\/([\w-]+)/)?.[1]
+  const repoPath = `${user}/${repo}`
+  const inRepoPath = path.split(`${repoPath}/`)?.[1]
+  let number: string | undefined
+  let type: UrlType = repo ? 'repo' : 'user'
+  if (inRepoPath) {
+    number = inRepoPath.match(/issues\/(\d+)/)?.[1]
+    if (number) {
+      type = 'issue'
+    }
+    else {
+      number = inRepoPath.match(/pull\/(\d+)/)?.[1]
+      if (number)
+        type = 'pull'
+    }
+  }
+  const avatar = `https://github.com/${user}.png`
+  const details = (props.card.title ?? '').replace('GitHub - ', '').replace(`${repoPath}: `, '').split(' · ')[0]
+  const info = $ref<Meta>({
+    type,
+    user,
+    details,
+    repo,
+    number,
+    avatar,
+  })
+  /* It is rate limited for anonymous usage, leaving this to play, but for now it is probably better to avoid the call
+     We can't show the author of the PR or issue without this info, because the handle isn't in the meta. I think we
+     could ask GitHub to add it.
+
+  if (number) {
+    fetch(`https://api.github.com/repos/${user}/${repo}/issues/${number}`).then(res => res.json()).then((data) => {
+      info.extra = {
+        state: data.state as string,
+        author: {
+          avatar: data.user.avatar_url as string,
+          user: data.user.login as string,
+        },
+      }
+    })
+  }
+  */
+  return info
+})
+</script>
+
+<template>
+  <div
+    v-if="card.image"
+    flex flex-col
+    display-block of-hidden
+    bg-code
+    relative
+    border="base"
+    :class="{
+      'sm:(min-w-32 w-32 h-32) min-w-22 w-22 h-22 border-r': isSquare,
+      'w-full aspect-[1.91] border-b': !isSquare,
+      'rounded-lg': root,
+    }"
+  >
+    <div p4 px-6 flex flex-col justify-between h-full>
+      <div flex justify-between items-center gap-6 h-full mb-2>
+        <div flex flex-col gap-2>
+          <a flex gap-1 text-3xl flex-wrap :href="card.url">
+            <template v-if="meta.repo">
+              <span>{{ meta.user }}</span><span text-secondary-light>/</span><span text-primary font-bold>{{ meta.repo }}</span>
+            </template>
+            <span v-else>{{ meta.user }}</span>
+          </a>
+          <div flex flex-col>
+            <p v-if="meta.type === 'issue'" font-bold text-xl text-primary>
+              Issue #{{ meta.number }}
+            </p>
+            <p v-if="meta.type === 'pull'" font-bold text-xl text-primary>
+              PR #{{ meta.number }}
+            </p>
+            <span text-secondary-light leading-tight>{{ meta.details }}</span>
+          </div>
+        </div>
+        <div>
+          <img w-30 aspect-square width="20" height="20" rounded-2 :src="meta.avatar">
+        </div>
+      </div>
+      <div flex justify-between>
+        <div v-if="meta.extra" flex gap-2 items-center>
+          <div>
+            <img w-6 aspect-square width="20" height="20" rounded-full :src="meta.extra?.author?.avatar">
+          </div>
+          <span text-xl text-primary font-bold>@{{ meta.extra?.author?.user }}</span>
+        </div>
+        <div v-else />
+        <div text-2xl i-ri:github-fill text-secondary />
+      </div>
+    </div>
+  </div>
+</template>
diff --git a/composables/featureFlags.ts b/composables/featureFlags.ts
index cbad089c..b4e7135d 100644
--- a/composables/featureFlags.ts
+++ b/composables/featureFlags.ts
@@ -3,6 +3,7 @@ import { STORAGE_KEY_FEATURE_FLAGS } from '~/constants'
 export interface FeatureFlags {
   experimentalVirtualScroll: boolean
   experimentalAvatarOnAvatar: boolean
+  experimentalGitHubCards: boolean
 }
 export type FeatureFlagsMap = Record<string, FeatureFlags>
 
@@ -10,6 +11,7 @@ export function getDefaultFeatureFlags(): FeatureFlags {
   return {
     experimentalVirtualScroll: false,
     experimentalAvatarOnAvatar: true,
+    experimentalGitHubCards: true,
   }
 }
 
diff --git a/locales/es-ES.json b/locales/es-ES.json
index 3c63860e..cc336549 100644
--- a/locales/es-ES.json
+++ b/locales/es-ES.json
@@ -78,6 +78,7 @@
   },
   "feature_flag": {
     "avatar_on_avatar": "Avatar en Avatar",
+    "github_cards": "GitHub Cards",
     "virtual_scroll": "Virtual Scrolling"
   },
   "help": {
diff --git a/locales/fr-FR.json b/locales/fr-FR.json
index 73b78aac..200d2cb8 100644
--- a/locales/fr-FR.json
+++ b/locales/fr-FR.json
@@ -81,6 +81,7 @@
   },
   "feature_flag": {
     "avatar_on_avatar": "Avatar sur avatar",
+    "github_cards": "GitHub Cards",
     "virtual_scroll": "Défilement virtuel"
   },
   "help": {
diff --git a/locales/zh-CN.json b/locales/zh-CN.json
index 65456a07..ef81ab27 100644
--- a/locales/zh-CN.json
+++ b/locales/zh-CN.json
@@ -80,6 +80,7 @@
   },
   "feature_flag": {
     "avatar_on_avatar": "头像堆叠",
+    "github_cards": "GitHub Cards",
     "virtual_scroll": "虚拟滚动"
   },
   "help": {