diff --git a/src/app/layout.tsx b/src/app/layout.tsx
index c13801b..bd5cece 100644
--- a/src/app/layout.tsx
+++ b/src/app/layout.tsx
@@ -19,20 +19,17 @@ export async function generateMetadata({ params: { locale } }: Props) {
     keywords: t('keywords'),
     title: {
       template: `%s | ${t('appTitle')}`,
-      default: t('defaultTitle'),
+      default: `${t('defaultTitle')} | ${t('appTitle')}`,
     },
     description: t('defaultDescription'),
     openGraph: {
-      title: {
-        template: `%s | ${t('appTitle')}`,
-        default: t('defaultTitle'),
-      },
-      description: t('defaultDescription'),
       locale,
       type: 'website',
     },
     twitter: {
+      card: 'summary_large_image',
       creator: appInfo.twitterId,
+      site: appInfo.twitterId,
     },
     robots: {
       index: true,
diff --git a/src/app/opengraph-image.alt.txt b/src/app/opengraph-image.alt.txt
new file mode 100644
index 0000000..b8de65b
--- /dev/null
+++ b/src/app/opengraph-image.alt.txt
@@ -0,0 +1 @@
+Skeet - TypeScript Serverless Framework
\ No newline at end of file
diff --git a/src/app/opengraph-image.tsx b/src/app/opengraph-image.tsx
deleted file mode 100644
index 0879bcc..0000000
--- a/src/app/opengraph-image.tsx
+++ /dev/null
@@ -1,5 +0,0 @@
-export const alt = 'Skeet - TypeScript Serverless Framework'
-
-export const size = { width: 1200, height: 630 }
-
-export default function Image() {}
diff --git a/src/app/twitter-image.alt.txt b/src/app/twitter-image.alt.txt
new file mode 100644
index 0000000..b8de65b
--- /dev/null
+++ b/src/app/twitter-image.alt.txt
@@ -0,0 +1 @@
+Skeet - TypeScript Serverless Framework
\ No newline at end of file
diff --git a/src/app/twitter-image.tsx b/src/app/twitter-image.tsx
deleted file mode 100644
index 0879bcc..0000000
--- a/src/app/twitter-image.tsx
+++ /dev/null
@@ -1,5 +0,0 @@
-export const alt = 'Skeet - TypeScript Serverless Framework'
-
-export const size = { width: 1200, height: 630 }
-
-export default function Image() {}