diff --git a/Credits.html b/Credits.html
index 9fac3e2ce1..52a838c5e7 100644
--- a/Credits.html
+++ b/Credits.html
@@ -13,10 +13,10 @@
 
 	<div class="row align-items-center">
 		<h6 class="col-6 text-center">
-			<a target="_blank" href="https://wiki.idempiere.org/en/User:CarlosRuiz">Carlos Ruiz</a>
+			<a target="_blank" href="https://www.idempiere.org/founders/#carlos-founder">Carlos Ruiz</a>
 		</h6>
 		<h6 class="col-6 text-center">
-			<a target="_blank" href="http://www.adempiere.com/User:Hengsin">Heng Sin Low</a>
+			<a target="_blank" href="https://www.idempiere.org/founders/#hengsin-founder">Heng Sin Low</a>
 		</h6>
 	</div>
 
@@ -32,7 +32,7 @@
 			<img style="max-width: 100%;" src="https://www.bx-service.com/wp-content/uploads/2020/12/BXnonSquare.jpg" alt="BX Service GmbH">
 		</a>
 		<a class="text-center col-4 mt-3" target="_blank" href="https://www.globalqss.com/">
-			<img style="max-width: 100%;" src="https://www.globalqss.com/portal/templates/company/images/logo.png" alt="GlobalQSS - Quality Systems &amp; Solutions">
+			<img style="max-width: 100%;" src="https://www.globalqss.com/portal/templates/company/images/qss_vertical.jpg" alt="GlobalQSS - Quality Systems &amp; Solutions">
 		</a>
 		<a class="text-center col-4 mt-3" target="_blank" href="https://www.adaxa.com/">
 			<img style="max-width: 100%;" src="https://www.adaxa.com/wp-content/uploads/2015/07/cropped-download-1.png" alt="Adaxa Open Source ERP">
@@ -41,7 +41,7 @@
 			<img style="max-width: 100%;" src="https://www.cloudempiere.com/../../../assets/img/cloudempiere-logo-dark.svg" alt="cloudempiere">
 		</a>
 		<a class="text-center col-4 mt-3" target="_blank" href="https://www.chuckboecking.com/">
-			<img style="max-width: 100%;" src="https://www.chuckboecking.com/wp-content/uploads/2014/10/website-Logo-with-passion1.png" alt="iDempiere Training Open Source ERP Chuck Boecking">
+			<img style="max-width: 100%;" src="https://erp-academy.chuckboecking.com/wp-content/uploads/2020/12/website-Logo-with-passion-vertical.png" alt="iDempiere Training Open Source ERP Chuck Boecking">
 		</a>
 		<a class="text-center col-4 mt-3" target="_blank" href="https://logilite.com/">
 			<img style="max-width: 100%;" src="https://logilite.com/wp-content/uploads/2013/02/logo.png" alt="Logilite Technologies">