diff --git a/icons/forgejo.svg b/icons/forgejo.svg
new file mode 100644
index 0000000..804b05e
--- /dev/null
+++ b/icons/forgejo.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 212 212" width="32" height="32"><style>circle,path{fill:none;stroke:#000;stroke-width:15}path{stroke-width:25}.orange{stroke:#f60}.red{stroke:#d40000}</style><g transform="translate(6 6)"><path d="M58 168V70a50 50 0 0 1 50-50h20" class="orange"/><path d="M58 168v-30a50 50 0 0 1 50-50h20" class="red"/><circle cx="142" cy="20" r="18" class="orange"/><circle cx="142" cy="88" r="18" class="red"/><circle cx="58" cy="180" r="18" class="red"/></g></svg>
\ No newline at end of file
diff --git a/index.html b/index.html
index 8c1a76f..48e4afb 100644
--- a/index.html
+++ b/index.html
@@ -22,14 +22,14 @@
             <a target="_blank" rel="noopener noreferrer" href="/team.html" class="headerbutton">
               ทีม
             </a>
-            <a target="_blank" rel="noopener noreferrer" href="https://codeberg.org/latenightdef/ttt-org" class="headerbutton">
+            <a target="_blank" rel="noopener noreferrer" href="https://forge.techtransthai.org/techtransthai/website" class="headerbutton">
               ซอร์สโคด
             </a>
             <a target="_blank" rel="noopener noreferrer" href="https://webring.wonderful.software#techtransthai.org" class="headerbutton">
               วงแหวนเว็บ
             </a>
             
-            <a target="_blank" rel="noopener noreferrer" href="https://status.techtransthai.org/status/techtransthai" class="headerbutton">
+            <a target="_blank" rel="noopener noreferrer" href="https://status.techtransthai.org" class="headerbutton">
               สถานะการให้บริการ
             </a>
           </div>
@@ -159,6 +159,18 @@
             </div>
           </div>
         </a>
+        <a class="itemcard" target="_blank" rel="noopener noreferrer" href="https://forge.techtransthai.org/">
+          <div class="listaction">
+            <img src="icons/forgejo.svg" alt="Forgejo" width="80" height="80" style="margin: 0.3cm;"> 
+            <div>
+              <h3>TechTransThai Forge</h3>
+              <p>Forgejo instance ของเรา</p>
+            </div>
+          </div>
+        </a>
+        
+      </div>
+      <div class="row">
         <a class="itemcard" target="_blank" rel="noopener noreferrer" href="https://f-social.techtransthai.org/">
           <div class="listaction">
             <img src="icons/sharkey.png" alt="Sharkey" width="80" height="80" style="margin: 0.3cm;"> 
@@ -168,8 +180,6 @@
             </div>
           </div>
         </a>
-      </div>
-      <div class="row">
         <a class="itemcard" target="_blank" rel="noopener noreferrer" href="https://home.techtransthai.org">
           <div class="listaction">
             <img src="icons/homeassistant.svg" alt="Home Assistant" width="80" height="80" style="margin: 0.3cm;"> 
@@ -179,6 +189,7 @@
             </div>
           </div>
         </a>
+        <a class="itemcard-placeholder"></a>
       </div>
           
 
diff --git a/team.html b/team.html
index 248461c..2587ae1 100644
--- a/team.html
+++ b/team.html
@@ -22,14 +22,14 @@
             <a target="_blank" rel="noopener noreferrer" href="/team.html" class="headerbutton">
               ทีม
             </a>
-            <a target="_blank" rel="noopener noreferrer" href="https://codeberg.org/latenightdef/ttt-org" class="headerbutton">
+            <a target="_blank" rel="noopener noreferrer" href="https://forge.techtransthai.org/techtransthai/website class="headerbutton">
               ซอร์สโคด
             </a>
             <a target="_blank" rel="noopener noreferrer" href="https://webring.wonderful.software#techtransthai.org" class="headerbutton">
               วงแหวนเว็บ
             </a>
             
-            <a target="_blank" rel="noopener noreferrer" href="https://status.techtransthai.org/status/techtransthai" class="headerbutton">
+            <a target="_blank" rel="noopener noreferrer" href="https://status.techtransthai.org" class="headerbutton">
               สถานะการให้บริการ
             </a>
           </div>