diff --git a/build.js b/build.js
index 4638f9be8f1ded0f62bb499ddcb05868cc655f89..612a6a4ab5d26fd526689650a465b501a212be23 100644
--- a/build.js
+++ b/build.js
@@ -19,7 +19,7 @@ function getPageHtml(pageName, pageMeta) {
     let html = fs.readFileSync(`${curDir}/public/index.html`, "utf-8");
     const setMeta = function (metaName, value) {
         html = html.replace(
-            html.match(new RegExp(`<meta\\s*name="${metaName}"[^>]+>`, "g")),
+            html.match(new RegExp(`<meta\\s*name="${metaName}"[^>]+>`, "g"))[0],
             `<meta name="${metaName}" content="${value}"/>`
         );
     };
@@ -135,6 +135,18 @@ function getPageHtml(pageName, pageMeta) {
         Object.entries(pageMeta).filter(kv => !build_conf.default_meta_keys.includes(kv[0]))
     );
     setOgMeta();
+    // set twitter image
+    html = html.replace(
+        html.match(new RegExp(`<meta\\s*property="twitter:image"[^>]+>`, "g"))[0],
+        `<meta property="twitter:image" content="${
+            pageMeta.image ||
+            html
+                .match(new RegExp(`<meta\\s*name="image"[^>]+>`, "g"))[0]
+                .match(new RegExp(`content=".+"`, "g"))[0]
+                .match(new RegExp(`".+"`, "g"))
+                .replace(/"/g, "")
+        }"/>`
+    );
     return html;
 }
 
diff --git a/public/education/index.html b/public/education/index.html
index e7fcc43de2708fbbeae8dc122aa40823e9f7cbba..28cbef6370c957f144dc5c28c4f6bf855269c231 100644
--- a/public/education/index.html
+++ b/public/education/index.html
@@ -13,6 +13,7 @@
         <meta property="og:type" content="website" />
         <meta property="og:url" content="https://kuadrado-software.fr/education"/>
         <meta property="og:image" content="https://kuadrado-software.fr/assets/images/brain.png"/>
+        <meta property="twitter:image" content="https://kuadrado-software.fr/assets/images/brain.png"/>
         <meta property="og:locale" content="fr_FR"/>
         <meta property="og:site_name" content="Kuadrado Software"/>
 
diff --git a/public/games/index.html b/public/games/index.html
index aa3a2edc9b46358929f54e64695f6a64333ab3a6..993989c7a23e8045938e6dd83a7a55a096bb28fa 100644
--- a/public/games/index.html
+++ b/public/games/index.html
@@ -15,6 +15,7 @@
         <meta property="og:image" content="https://kuadrado-software.fr/assets/images/game_controller.png"/>
 <meta property="og:image" content="https://kuadrado-software.fr/assets/images/game_studio_banner.png"/>
 <meta property="og:image" content="https://kuadrado-software.fr/assets/images/popularization_banner.png"/>
+        <meta property="twitter:image" content="https://kuadrado-software.fr/assets/images/game_controller.png"/>
         <meta property="og:locale" content="fr_FR"/>
         <meta property="og:site_name" content="Kuadrado Software"/>
 
diff --git a/public/index.html b/public/index.html
index 4d105384c2905c45ce96b5858978495a34ec03e4..3da3267c563d5c0cbee1738ecc5e372520c85d11 100644
--- a/public/index.html
+++ b/public/index.html
@@ -22,6 +22,10 @@
             property="og:image"
             content="https://kuadrado-software.fr/assets/images/logo_kuadrado.png"
         />
+        <meta
+            property="twitter:image"
+            content="https://kuadrado-software.fr/assets/images/logo_kuadrado.png"
+        />
         <meta property="og:locale" content="fr_FR" />
         <meta property="og:site_name" content="Kuadrado Software"/>
 
diff --git a/public/software-development/index.html b/public/software-development/index.html
index 9e5d2f7d392ec5f027b0a0f214874b6d031ee0c0..fa11c37d4ea219e645931bd9c6ffe0b52c5e82ba 100644
--- a/public/software-development/index.html
+++ b/public/software-development/index.html
@@ -13,6 +13,7 @@
         <meta property="og:type" content="website" />
         <meta property="og:url" content="https://kuadrado-software.fr/software-development"/>
         <meta property="og:image" content="https://kuadrado-software.fr/assets/images/meca_proc.png"/>
+        <meta property="twitter:image" content="https://kuadrado-software.fr/assets/images/meca_proc.png"/>
         <meta property="og:locale" content="fr_FR"/>
         <meta property="og:site_name" content="Kuadrado Software"/>