diff --git a/src/main/java/stirling/software/SPDF/controller/api/misc/AutoSplitPdfController.java b/src/main/java/stirling/software/SPDF/controller/api/misc/AutoSplitPdfController.java
index e32e325ed4..9b447fcb35 100644
--- a/src/main/java/stirling/software/SPDF/controller/api/misc/AutoSplitPdfController.java
+++ b/src/main/java/stirling/software/SPDF/controller/api/misc/AutoSplitPdfController.java
@@ -42,7 +42,7 @@ import stirling.software.SPDF.utils.WebResponseUtils;
 @Tag(name = "Misc", description = "Miscellaneous APIs")
 public class AutoSplitPdfController {
 
-    private static final String QR_CONTENT = "https://github.com/Frooodle/Stirling-PDF";
+    private static final String QR_CONTENT = "https://github.com/Stirling-Tools/Stirling-PDF";
 
     @PostMapping(value = "/auto-split-pdf", consumes = "multipart/form-data")
     @Operation(
diff --git a/src/main/resources/static/js/githubVersion.js b/src/main/resources/static/js/githubVersion.js
index 0fddc3ef2f..6400d5cfe2 100644
--- a/src/main/resources/static/js/githubVersion.js
+++ b/src/main/resources/static/js/githubVersion.js
@@ -18,7 +18,7 @@ function compareVersions(version1, version2) {
 
 
 async function getLatestReleaseVersion() {
-    const url = "https://api.github.com/repos/Frooodle/Stirling-PDF/releases/latest";
+    const url = "https://api.github.com/repos/Stirling-Tools/Stirling-PDF/releases/latest";
     try {
         const response = await fetch(url);
         const data = await response.json();
@@ -52,4 +52,4 @@ async function checkForUpdate() {
 
 document.addEventListener('DOMContentLoaded', (event) => {
     checkForUpdate();
-});
\ No newline at end of file
+});
diff --git a/src/main/resources/templates/error.html b/src/main/resources/templates/error.html
index dff3fab479..4e6fc58529 100644
--- a/src/main/resources/templates/error.html
+++ b/src/main/resources/templates/error.html
@@ -115,7 +115,7 @@ margin-top: 0;
           <h2>Need help / Found a issue?</h2>
           <p>If you're still having trouble, don't hesitate to reach out to us for help. You can submit a ticket on our GitHub page or contact us through Discord:</p>
           <div id="button-group">
-            <a href="https://github.com/Frooodle/Stirling-PDF/issues" id="github-button" target="_blank">Submit a ticket on GitHub</a>
+            <a href="https://github.com/Stirling-Tools/Stirling-PDF/issues" id="github-button" target="_blank">Submit a ticket on GitHub</a>
             <a href="https://discord.gg/Cn8pWhQRxZ" id="discord-button" target="_blank">Join our Discord server</a>
           </div>
           <a href="/" id="home-button">Go back to homepage</a>
diff --git a/src/main/resources/templates/fragments/errorBanner.html b/src/main/resources/templates/fragments/errorBanner.html
index cdba311a94..1bc790318d 100644
--- a/src/main/resources/templates/fragments/errorBanner.html
+++ b/src/main/resources/templates/fragments/errorBanner.html
@@ -31,7 +31,7 @@
         <pre id="traceContent" th:text="${trace}"></pre>
       </div>
       <!-- Buttons to submit a ticket on GitHub and join Discord server -->
-      <a href="https://github.com/Frooodle/Stirling-PDF/issues" id="github-button" target="_blank">Submit a ticket on GitHub</a>
+      <a href="https://github.com/Stirling-Tools/Stirling-PDF/issues" id="github-button" target="_blank">Submit a ticket on GitHub</a>
       <a href="https://discord.gg/Cn8pWhQRxZ" id="discord-button" target="_blank">Join our Discord server</a>
     </div>
   </div>
@@ -84,4 +84,4 @@
       }
     }
   </script>
-</th:block>
\ No newline at end of file
+</th:block>
diff --git a/src/main/resources/templates/fragments/errorBannerPerPage.html b/src/main/resources/templates/fragments/errorBannerPerPage.html
index ccc2f7b40c..583d057b53 100644
--- a/src/main/resources/templates/fragments/errorBannerPerPage.html
+++ b/src/main/resources/templates/fragments/errorBannerPerPage.html
@@ -43,7 +43,7 @@
 	            <h2>Need help / Found an issue?</h2>
 	            <p>If you're still having trouble, don't hesitate to reach out to us for help. You can submit a ticket on our GitHub page or contact us through Discord:</p>
 	            <div id="button-group">
-	              <a href="https://github.com/Frooodle/Stirling-PDF/issues" id="github-button" target="_blank">GitHub - Submit a ticket</a>
+	              <a href="https://github.com/Stirling-Tools/Stirling-PDF/issues" id="github-button" target="_blank">GitHub - Submit a ticket</a>
 	              <a href="https://discord.gg/Cn8pWhQRxZ" id="discord-button" target="_blank">Discord - Submit Support post</a>
 	            </div>  
 	            <a href="/" id="home-button">Go to Homepage</a>
@@ -55,4 +55,4 @@
 	  </div>
 	</div>
   <script src="js/errorBanner.js"></script>
-</th:block>
\ No newline at end of file
+</th:block>
diff --git a/src/main/resources/templates/fragments/navbar.html b/src/main/resources/templates/fragments/navbar.html
index 2ddb36794b..8e5ce7322b 100644
--- a/src/main/resources/templates/fragments/navbar.html
+++ b/src/main/resources/templates/fragments/navbar.html
@@ -267,7 +267,7 @@
                         <a href="swagger-ui/index.html" target="_blank">
                             <button type="button" class="btn btn-sm btn-outline-primary">API</button>
                         </a>
-                        <a href="https://github.com/Frooodle/Stirling-PDF/releases" target="_blank">
+                        <a href="https://github.com/Stirling-Tools/Stirling-PDF/releases" target="_blank">
                             <button type="button" class="btn btn-sm btn-outline-primary" id="update-btn" th:utext="#{settings.update}"></button>
                         </a>
                     </div>
diff --git a/src/main/resources/templates/misc/ocr-pdf.html b/src/main/resources/templates/misc/ocr-pdf.html
index 440c42a1df..c9063a9dac 100644
--- a/src/main/resources/templates/misc/ocr-pdf.html
+++ b/src/main/resources/templates/misc/ocr-pdf.html
@@ -243,7 +243,7 @@
                         </script>
                         <p th:text="#{ocr.credit}"></p>
                         <p th:text="#{ocr.help}"></p>
-                        <a href="https://github.com/Frooodle/Stirling-PDF/blob/main/HowToUseOCR.md">https://github.com/Frooodle/Stirling-PDF/blob/main/HowToUseOCR.md</a>
+                        <a href="https://github.com/Stirling-Tools/Stirling-PDF/blob/main/HowToUseOCR.md">https://github.com/Stirling-Tools/Stirling-PDF/blob/main/HowToUseOCR.md</a>
                     </div>
                 </div>
             </div>
@@ -251,4 +251,4 @@
         <div th:insert="~{fragments/footer.html :: footer}"></div>
     </div>
 </body>
-</html>
\ No newline at end of file
+</html>