diff --git a/dietpi-software.html b/dietpi-software.html
index 52fa6819..a468c0c6 100644
--- a/dietpi-software.html
+++ b/dietpi-software.html
@@ -1104,6 +1104,24 @@ <h3>Gogs</h3>
 						</div>
 					</div>
 				</div>
+				<div id="forgejo" class="row single-project">
+					<div class="col-md-4"><a href="images/dietpi-software/forgejo-large.png" target="_blank" rel="noopener"><img src="images/dietpi-software/forgejo-small.png" alt="Forgejo frontend screenshot" loading="lazy"></a></div>
+					<div class="col-md-8">
+						<div class="project-description">
+							<div class="project-title clearfix">
+								<h3>Forgejo</h3>
+								<span class="close"></span>
+							</div>
+							<div class="project-info">
+								<div><a href="https://dietpi.com/docs/software/cloud/#forgejo" target="_blank" rel="noopener"><span>How to Setup / Details:</span><i class="fa fa-book"></i><u>View</u></a></div>
+								<br>
+								<div><span>Pros:</span>Host your own GitHub style server</div>
+								<div><span>Cons:</span>None</div>
+							</div>
+							<p>Your very own GitHub style server, with web interface.</p>
+						</div>
+					</div>
+				</div>
 				<div id="gitea" class="row single-project">
 					<div class="col-md-4"><a href="images/dietpi-software/gitea_2.jpg" target="_blank" rel="noopener"><img src="images/dietpi-software/gitea_1.jpg" alt="Gitea frontend screenshot" loading="lazy"></a></div>
 					<div class="col-md-8">
@@ -3716,6 +3734,13 @@ <h3>Gogs</h3>
 							<p>GitHub style server & web interface</p>
 						</a>
 					</div>
+					<div class="col-xl-2 col-lg-3 col-md-4 col-6 mix Cloud">
+						<a href="#softwareinfo" class="thumbnail" rel="#forgejo">
+							<img src="images/dietpi-software/forgejo-logo.svg" alt="Forgejo logo" width="8" height="5" loading="lazy">
+							<h3>Forgejo</h3>
+							<p>GitHub style server & web interface</p>
+						</a>
+					</div>
 					<div class="col-xl-2 col-lg-3 col-md-4 col-6 mix Cloud">
 						<a href="#softwareinfo" class="thumbnail" rel="#gitea">
 							<img src="images/dietpi-software/gitea_0.jpg" alt="Gitea logo" width="8" height="5" loading="lazy">
diff --git a/images/dietpi-software/forgejo-large.png b/images/dietpi-software/forgejo-large.png
new file mode 100644
index 00000000..1efbab35
Binary files /dev/null and b/images/dietpi-software/forgejo-large.png differ
diff --git a/images/dietpi-software/forgejo-logo.svg b/images/dietpi-software/forgejo-logo.svg
new file mode 100644
index 00000000..b73856da
--- /dev/null
+++ b/images/dietpi-software/forgejo-logo.svg
@@ -0,0 +1,21 @@
+<svg version="1.1" id="svg15513" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 800 300">
+  <style type="text/css" id="style15499">
+    circle,path{fill:none;stroke:#000;stroke-width:12}path{stroke-width:20}.orange{stroke:#d45500}.red{stroke:#a00}
+  </style>
+  <g transform="matrix(1.15 0 0 1.15 -34.85 11.15)" id="g15511">
+    <path d="M60 170V70a50 50 0 0 1 50-50h20" class="orange" id="path15501" style="stroke-width:23.4783;stroke-dasharray:none;stroke:#f50;stroke-opacity:1"/>
+    <path d="M60 170v-35a50 50 0 0 1 50-50h20" class="red" id="path15503" style="stroke-width:23.4783;stroke-dasharray:none;stroke:#c00;stroke-opacity:1"/>
+    <circle cx="140" cy="20" class="orange" id="circle15505" style="fill:none;stroke-width:13.913;stroke-dasharray:none;stroke:#f50;stroke-opacity:1" r="16.5217"/>
+    <circle cx="140" cy="85" class="red" id="circle15507" style="fill:none;stroke-width:13.913;stroke-dasharray:none;stroke:#c00;stroke-opacity:1" r="16.5217"/>
+    <circle cx="60" cy="180" class="red" id="circle15509" style="fill:none;stroke-width:13.913;stroke-dasharray:none;stroke:#c00;stroke-opacity:1" r="16.5217"/>
+  </g>
+  <g aria-label="orgejo" id="text15573" style="font-size:226.667px;line-height:1.25;font-family:Montserrat;-inkscape-font-specification:&quot;Montserrat, @wght=451&quot;;font-variation-settings:&quot;wght&quot;451;opacity:1;fill:#f50;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;stroke-dasharray:none;stroke-opacity:1">
+    <path d="M202.3268 241.9833q-17.68 0-31.7334-7.7066-13.8267-7.9334-21.9867-21.76-7.9333-13.8268-7.9333-31.5068 0-17.9067 7.9333-31.5067 8.16-13.8267 21.9867-21.5334 13.8267-7.9333 31.7334-7.9333 17.68 0 31.5067 7.9333 14.0533 7.7067 21.9867 21.5334 7.9333 13.6 7.9333 31.5067 0 17.68-7.9333 31.5067-7.9334 13.8267-21.9867 21.76-13.8267 7.7067-31.5067 7.7067zm0-16.5467q12.24 0 21.76-5.44 9.52-5.6666 14.96-15.64 5.6667-10.2 5.6667-23.3467 0-13.3733-5.6667-23.3467-5.44-9.9733-14.96-15.4133-9.52-5.44-21.76-5.44-12.24 0-21.76 5.44-9.52 5.44-15.1867 15.4133-5.44 9.9734-5.44 23.3467 0 13.1467 5.44 23.3467 5.6666 9.9734 15.1866 15.64 9.52 5.44 21.76 5.44z" id="path1095" style="fill:#f50;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;stroke-dasharray:none;stroke-opacity:1"/>
+    <path d="M279.8505 240.85V121.1698h18.1333v32.64l-1.8133-7.0266q4.9867-12.92 16.7733-19.72 11.7867-7.0267 29.24-7.0267v18.5867q-1.1332-.2267-2.2666-.2267-1.1333-.2266-2.2666-.2266-17.9067 0-28.3334 11.1066-10.4267 10.88-10.4267 31.28V240.85z" id="path1097" style="fill:#f50;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;stroke-dasharray:none;stroke-opacity:1"/>
+    <path d="M405.1475 285.9567c-10.88 0-21.4578-1.5866-31.7334-4.76-10.1245-3.0222-18.4356-7.4044-24.9334-13.1467l9.52-14.7333c5.5911 4.9867 12.4667 8.9156 20.6267 11.7867 8.3111 2.871 16.9245 4.3066 25.84 4.3066 14.6579 0 25.4623-3.4755 32.4134-10.4266 6.9512-6.8 9.3937-17.3399 10.4267-31.5067l2-27.4268 2.2667-22.2133-1.5867-22.2134 8.72-9.7467c11.1802 15.4761 7.4134 50.817 7.4134 79.5602 0 20.8533-5.1378 36.1156-15.4134 45.7867-10.2755 9.8222-25.4622 14.7333-45.56 14.7333zm1.28-49.8667c-11.4845 0-21.8356-2.4178-31.0534-7.2533-9.0667-4.9867-16.2445-11.8623-21.5334-20.6267-5.2889-8.7645-7.9333-18.889-7.9333-30.3734 0-11.4845 2.6444-21.5334 7.9333-30.1467 5.289-8.7645 12.4667-15.5645 21.5334-20.4 9.2178-4.8356 19.5689-7.2534 31.0534-7.2534 10.4266 0 23.7955 2.1911 32.1067 6.5733 8.4622 4.2312 15.1867 10.6534 20.1733 19.2667 5.1378 8.6134 5.7067 19.2667 5.7067 31.96 0 12.8445-4.5689 23.5734-9.7067 32.1868-4.9866 8.6133-11.7111 15.1111-20.1733 19.4934-8.3112 4.3822-17.68 6.5733-28.1067 6.5733zm-.1867-16.7734c8.4622 0 15.9422-1.7377 22.44-5.2133 6.4978-3.4756 11.56-8.3111 15.1867-14.5067 3.7778-6.3467 5.6667-13.6 5.6667-21.76 0-8.16-1.8889-15.3378-5.6667-21.5334-3.6267-6.1955-8.6889-10.9556-15.1867-14.28-6.4978-3.4756-13.9778-5.2133-22.44-5.2133-8.3111 0-15.7156 1.7377-22.2134 5.2133-6.4978 3.3244-11.6355 8.0845-15.4133 14.28-3.6267 6.1956-5.44 13.3734-5.44 21.5334s1.8133 15.4133 5.44 21.76c3.7778 6.1956 8.9155 11.0311 15.4133 14.5067s13.9023 5.2133 22.2134 5.2133z" id="path1099" style="fill:#f50;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;stroke-dasharray:none;stroke-opacity:1"/>
+    <path d="M601.862 285.9567c-4.9866 0-9.7466-.6044-14.28-1.8133-4.5333-1.2089-8.311-3.0978-11.3333-5.6667l6.3467-14.28c4.6844 3.7778 10.7289 5.6667 18.1333 5.6667 6.0445 0 10.6534-1.8134 13.8267-5.44 3.3245-3.6267 4.9867-9.0667 4.9867-16.32V141.1698h19.04v106.9335c0 11.6356-3.1733 20.8534-9.52 27.6534-6.3466 6.8-15.4133 10.2-27.2 10.2z" id="path1103" style="fill:#f50;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;stroke-dasharray:none;stroke-opacity:1"/>
+    <path d="M717.3326 241.9833q-17.68 0-31.7333-7.7066-13.8267-7.9334-21.9867-21.76-7.9334-13.8268-7.9334-31.5068 0-17.9067 7.9333-31.5067 8.16-13.8267 21.9867-21.5334 13.8267-7.9333 31.7334-7.9333 17.68 0 31.5067 7.9333 14.0534 7.7067 21.9867 21.5334 7.9334 13.6 7.9334 31.5067 0 17.68-7.9334 31.5067-7.9333 13.8267-21.9867 21.76-13.8266 7.7067-31.5067 7.7067zm0-16.5467q12.24 0 21.76-5.44 9.52-5.6666 14.96-15.64 5.6668-10.2 5.6668-23.3467 0-13.3733-5.6667-23.3467-5.44-9.9733-14.96-15.4133-9.52-5.44-21.76-5.44-12.24 0-21.7601 5.44-9.52 5.44-15.1867 15.4133-5.44 9.9734-5.44 23.3467 0 13.1467 5.44 23.3467 5.6667 9.9734 15.1867 15.64 9.52 5.44 21.76 5.44z" id="path1105" style="fill:#f50;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;stroke-dasharray:none;stroke-opacity:1"/>
+    <path d="M547.1384 242.2469q-18.8133 0-33.32-7.7067-14.28-7.9334-22.44-21.76-7.9334-13.8268-7.9334-31.5068t7.7067-31.5067q7.7066-13.8267 21.08-21.5333 13.6-7.9334 30.8267-7.9334 16.32 0 29.24 7.2534 12.92 7.2533 20.6268 20.4 7.9333 12.92 8.3866 30.3734l-101.7734 19.9466-.9067-13.8266 91.5735-17.68-7.0267 9.9733q0-11.3334-5.2134-20.4-4.9866-9.0667-14.0533-14.28-9.0667-5.44-20.8534-5.44-12.0133 0-21.5333 5.44-9.2934 5.44-14.5067 15.1866-5.2134 9.7467-5.2134 22.8934 0 13.8267 5.6667 24.2534 5.8933 10.2 16.0934 15.8666 10.4266 5.44 24.0267 5.44 10.88 0 19.9467-3.6266 9.0666-3.8534 15.64-11.56l10.4267 12.24q-7.7067 9.52-19.72 14.5067-12.0134 4.9866-26.7468 4.9867z" id="path11315" style="font-size:226.667px;line-height:1.25;font-family:Montserrat;-inkscape-font-specification:&quot;Montserrat, @wght=451&quot;;font-feature-settings:&quot;ss01&quot;;font-variation-settings:&quot;wght&quot;451;fill:#f50;fill-opacity:1;stroke:none;stroke-width:20"/>
+  </g>
+  <circle cx="628" cy="108.9" r="17.25" class="orange" id="circle15505-0" style="fill:none;stroke:#f50;stroke-width:13.8;stroke-opacity:1"/>
+</svg>
diff --git a/images/dietpi-software/forgejo-small.png b/images/dietpi-software/forgejo-small.png
new file mode 100644
index 00000000..cca33bbf
Binary files /dev/null and b/images/dietpi-software/forgejo-small.png differ