diff --git a/csharp/ql/src/Security Features/CWE-730/ReDoS.qhelp b/csharp/ql/src/Security Features/CWE-730/ReDoS.qhelp
index 114aebf146e1..fed71cf32b77 100644
--- a/csharp/ql/src/Security Features/CWE-730/ReDoS.qhelp	
+++ b/csharp/ql/src/Security Features/CWE-730/ReDoS.qhelp	
@@ -51,7 +51,7 @@ evaluation of the regular expression after 1 second.</p>
 
 <li>
 OWASP:
-<a href="https://www.owasp.org/index.php/Regular_expression_Denial_of_Service_-_ReDoS">Regular expression Denial of Service - ReDoS</a>.
+<a href="https://community.owasp.org/attacks/Regular_expression_Denial_of_Service_-_ReDoS">Regular expression Denial of Service - ReDoS</a>.
 </li>
 <li>
 Wikipedia: <a href="https://en.wikipedia.org/wiki/ReDoS">ReDoS</a>.
diff --git a/csharp/ql/src/Security Features/CWE-730/RegexInjection.qhelp b/csharp/ql/src/Security Features/CWE-730/RegexInjection.qhelp
index 195a1cdfdd95..0e39cadfc6fd 100644
--- a/csharp/ql/src/Security Features/CWE-730/RegexInjection.qhelp	
+++ b/csharp/ql/src/Security Features/CWE-730/RegexInjection.qhelp	
@@ -46,7 +46,7 @@ meaning in regular expressions.
 
 <li>
 OWASP:
-<a href="https://www.owasp.org/index.php/Regular_expression_Denial_of_Service_-_ReDoS">Regular expression Denial of Service - ReDoS</a>.
+<a href="https://community.owasp.org/attacks/Regular_expression_Denial_of_Service_-_ReDoS">Regular expression Denial of Service - ReDoS</a>.
 </li>
 <li>
 Wikipedia: <a href="https://en.wikipedia.org/wiki/ReDoS">ReDoS</a>.
diff --git a/java/ql/src/Security/CWE/CWE-730/ReDoSReferences.inc.qhelp b/java/ql/src/Security/CWE/CWE-730/ReDoSReferences.inc.qhelp
index 7aec3aa0bf08..3c0c91307cee 100644
--- a/java/ql/src/Security/CWE/CWE-730/ReDoSReferences.inc.qhelp
+++ b/java/ql/src/Security/CWE/CWE-730/ReDoSReferences.inc.qhelp
@@ -5,12 +5,12 @@
 	<references>
 		<li>
 			OWASP:
-			<a href="https://www.owasp.org/index.php/Regular_expression_Denial_of_Service_-_ReDoS">Regular expression Denial of Service - ReDoS</a>.
+			<a href="https://community.owasp.org/attacks/Regular_expression_Denial_of_Service_-_ReDoS">Regular expression Denial of Service - ReDoS</a>.
 		</li>
 		<li>Wikipedia: <a href="https://en.wikipedia.org/wiki/ReDoS">ReDoS</a>.</li>
 		<li>Wikipedia: <a href="https://en.wikipedia.org/wiki/Time_complexity">Time complexity</a>.</li>
 		<li>James Kirrage, Asiri Rathnayake, Hayo Thielecke:
-		<a href="https://arxiv.org/abs/1301.0849">Static Analysis for Regular Expression Denial-of-Service Attack</a>.
+		<a href="https://arxiv.org/abs/1301.0849">Static Analysis for Regular Expression Denial-of-Service Attacks</a>.
 		</li>
 	</references>
 </qhelp>
diff --git a/java/ql/src/Security/CWE/CWE-730/RegexInjection.qhelp b/java/ql/src/Security/CWE/CWE-730/RegexInjection.qhelp
index 3e239d07107b..437224257552 100644
--- a/java/ql/src/Security/CWE/CWE-730/RegexInjection.qhelp
+++ b/java/ql/src/Security/CWE/CWE-730/RegexInjection.qhelp
@@ -39,7 +39,7 @@ meaning in regular expressions.
 <references>
 <li>
 OWASP:
-<a href="https://www.owasp.org/index.php/Regular_expression_Denial_of_Service_-_ReDoS">Regular expression Denial of Service - ReDoS</a>.
+<a href="https://community.owasp.org/attacks/Regular_expression_Denial_of_Service_-_ReDoS">Regular expression Denial of Service - ReDoS</a>.
 </li>
 <li>
 Wikipedia: <a href="https://en.wikipedia.org/wiki/ReDoS">ReDoS</a>.
diff --git a/javascript/ql/src/Performance/ReDoSReferences.inc.qhelp b/javascript/ql/src/Performance/ReDoSReferences.inc.qhelp
index 7aec3aa0bf08..3c0c91307cee 100644
--- a/javascript/ql/src/Performance/ReDoSReferences.inc.qhelp
+++ b/javascript/ql/src/Performance/ReDoSReferences.inc.qhelp
@@ -5,12 +5,12 @@
 	<references>
 		<li>
 			OWASP:
-			<a href="https://www.owasp.org/index.php/Regular_expression_Denial_of_Service_-_ReDoS">Regular expression Denial of Service - ReDoS</a>.
+			<a href="https://community.owasp.org/attacks/Regular_expression_Denial_of_Service_-_ReDoS">Regular expression Denial of Service - ReDoS</a>.
 		</li>
 		<li>Wikipedia: <a href="https://en.wikipedia.org/wiki/ReDoS">ReDoS</a>.</li>
 		<li>Wikipedia: <a href="https://en.wikipedia.org/wiki/Time_complexity">Time complexity</a>.</li>
 		<li>James Kirrage, Asiri Rathnayake, Hayo Thielecke:
-		<a href="https://arxiv.org/abs/1301.0849">Static Analysis for Regular Expression Denial-of-Service Attack</a>.
+		<a href="https://arxiv.org/abs/1301.0849">Static Analysis for Regular Expression Denial-of-Service Attacks</a>.
 		</li>
 	</references>
 </qhelp>
diff --git a/javascript/ql/src/Security/CWE-730/RegExpInjection.inc.qhelp b/javascript/ql/src/Security/CWE-730/RegExpInjection.inc.qhelp
index 6cd1120d07bb..308fe3199dfc 100644
--- a/javascript/ql/src/Security/CWE-730/RegExpInjection.inc.qhelp
+++ b/javascript/ql/src/Security/CWE-730/RegExpInjection.inc.qhelp
@@ -36,7 +36,7 @@ characters which have a special meaning in regular expressions.
 <references>
 <li>
 OWASP:
-<a href="https://www.owasp.org/index.php/Regular_expression_Denial_of_Service_-_ReDoS">Regular expression Denial of Service - ReDoS</a>.
+<a href="https://community.owasp.org/attacks/Regular_expression_Denial_of_Service_-_ReDoS">Regular expression Denial of Service - ReDoS</a>.
 </li>
 <li>
 Wikipedia: <a href="https://en.wikipedia.org/wiki/ReDoS">ReDoS</a>.
diff --git a/python/ql/src/Security/CWE-730/ReDoSReferences.inc.qhelp b/python/ql/src/Security/CWE-730/ReDoSReferences.inc.qhelp
index 7aec3aa0bf08..3c0c91307cee 100644
--- a/python/ql/src/Security/CWE-730/ReDoSReferences.inc.qhelp
+++ b/python/ql/src/Security/CWE-730/ReDoSReferences.inc.qhelp
@@ -5,12 +5,12 @@
 	<references>
 		<li>
 			OWASP:
-			<a href="https://www.owasp.org/index.php/Regular_expression_Denial_of_Service_-_ReDoS">Regular expression Denial of Service - ReDoS</a>.
+			<a href="https://community.owasp.org/attacks/Regular_expression_Denial_of_Service_-_ReDoS">Regular expression Denial of Service - ReDoS</a>.
 		</li>
 		<li>Wikipedia: <a href="https://en.wikipedia.org/wiki/ReDoS">ReDoS</a>.</li>
 		<li>Wikipedia: <a href="https://en.wikipedia.org/wiki/Time_complexity">Time complexity</a>.</li>
 		<li>James Kirrage, Asiri Rathnayake, Hayo Thielecke:
-		<a href="https://arxiv.org/abs/1301.0849">Static Analysis for Regular Expression Denial-of-Service Attack</a>.
+		<a href="https://arxiv.org/abs/1301.0849">Static Analysis for Regular Expression Denial-of-Service Attacks</a>.
 		</li>
 	</references>
 </qhelp>
diff --git a/python/ql/src/Security/CWE-730/RegexInjection.qhelp b/python/ql/src/Security/CWE-730/RegexInjection.qhelp
index f19f07444691..eb295a75efe8 100644
--- a/python/ql/src/Security/CWE-730/RegexInjection.qhelp
+++ b/python/ql/src/Security/CWE-730/RegexInjection.qhelp
@@ -37,7 +37,7 @@ special meaning in regular expressions.
 </example>
 
 <references>
-<li>OWASP: <a href="https://www.owasp.org/index.php/Regular_expression_Denial_of_Service_-_ReDoS">Regular expression Denial of Service - ReDoS</a>.</li>
+<li>OWASP: <a href="https://community.owasp.org/attacks/Regular_expression_Denial_of_Service_-_ReDoS">Regular expression Denial of Service - ReDoS</a>.</li>
 <li>Wikipedia: <a href="https://en.wikipedia.org/wiki/ReDoS">ReDoS</a>.</li>
 <li>Python docs: <a href="https://docs.python.org/3/library/re.html">re</a>.</li>
 <li>SonarSource: <a href="https://rules.sonarsource.com/python/type/Vulnerability/RSPEC-2631">RSPEC-2631</a>.</li>
diff --git a/ruby/ql/src/queries/security/cwe-1333/ReDoSReferences.inc.qhelp b/ruby/ql/src/queries/security/cwe-1333/ReDoSReferences.inc.qhelp
index 641b1e56b7cc..90c3d34a36de 100644
--- a/ruby/ql/src/queries/security/cwe-1333/ReDoSReferences.inc.qhelp
+++ b/ruby/ql/src/queries/security/cwe-1333/ReDoSReferences.inc.qhelp
@@ -2,12 +2,12 @@
 <qhelp>
   <references>
     <li> OWASP:
-      <a href="https://www.owasp.org/index.php/Regular_expression_Denial_of_Service_-_ReDoS">Regular expression Denial of Service - ReDoS</a>.
+      <a href="https://community.owasp.org/attacks/Regular_expression_Denial_of_Service_-_ReDoS">Regular expression Denial of Service - ReDoS</a>.
     </li>
     <li>Wikipedia: <a href="https://en.wikipedia.org/wiki/ReDoS">ReDoS</a>.</li>
     <li>Wikipedia: <a href="https://en.wikipedia.org/wiki/Time_complexity">Time complexity</a>.</li>
     <li>James Kirrage, Asiri Rathnayake, Hayo Thielecke:
-      <a href="https://arxiv.org/abs/1301.0849">Static Analysis for Regular Expression Denial-of-Service Attack</a>.
+      <a href="https://arxiv.org/abs/1301.0849">Static Analysis for Regular Expression Denial-of-Service Attacks</a>.
     </li>
   </references>
 </qhelp>
diff --git a/ruby/ql/src/queries/security/cwe-1333/RegExpInjection.qhelp b/ruby/ql/src/queries/security/cwe-1333/RegExpInjection.qhelp
index 014822f35fab..aa1f0022a8a3 100644
--- a/ruby/ql/src/queries/security/cwe-1333/RegExpInjection.qhelp
+++ b/ruby/ql/src/queries/security/cwe-1333/RegExpInjection.qhelp
@@ -37,7 +37,7 @@ user cannot insert characters that have special meanings in regular expressions.
 <references>
 <li>
 OWASP:
-<a href="https://www.owasp.org/index.php/Regular_expression_Denial_of_Service_-_ReDoS">Regular expression Denial of Service - ReDoS</a>.
+<a href="https://community.owasp.org/attacks/Regular_expression_Denial_of_Service_-_ReDoS">Regular expression Denial of Service - ReDoS</a>.
 </li>
 <li>
 Wikipedia: <a href="https://en.wikipedia.org/wiki/ReDoS">ReDoS</a>.
diff --git a/rust/ql/src/queries/security/CWE-311/CleartextTransmission.qhelp b/rust/ql/src/queries/security/CWE-311/CleartextTransmission.qhelp
index 1fb29c55ca00..00f4d9ec88ed 100644
--- a/rust/ql/src/queries/security/CWE-311/CleartextTransmission.qhelp
+++ b/rust/ql/src/queries/security/CWE-311/CleartextTransmission.qhelp
@@ -40,7 +40,7 @@ encryption algorithm, and put suitable key management practices into place.
 
 <li>
   OWASP Top 10:2021:
-  <a href="https://owasp.org/Top10/A02_2021-Cryptographic_Failures/">A02:2021 - Cryptographic Failures</a>.
+  <a href="https://top10.owasp.org/2021/A02_2021-Cryptographic_Failures/index.html">A02:2021 - Cryptographic Failures</a>.
 </li>
 <li>
   OWASP:
diff --git a/rust/ql/src/queries/security/CWE-312/CleartextStorageDatabase.qhelp b/rust/ql/src/queries/security/CWE-312/CleartextStorageDatabase.qhelp
index 595de607c3e5..f5ee2bc11b1e 100644
--- a/rust/ql/src/queries/security/CWE-312/CleartextStorageDatabase.qhelp
+++ b/rust/ql/src/queries/security/CWE-312/CleartextStorageDatabase.qhelp
@@ -42,7 +42,7 @@ AES before storing it in the database:
 <references>
 <li>
   OWASP Top 10:2021:
-  <a href="https://owasp.org/Top10/A02_2021-Cryptographic_Failures/">A02:2021 - Cryptographic Failures</a>.
+  <a href="https://top10.owasp.org/2021/A02_2021-Cryptographic_Failures/index.html">A02:2021 - Cryptographic Failures</a>.
 </li>
 <li>
   OWASP:
diff --git a/swift/ql/src/queries/Security/CWE-1333/ReDoSReferences.inc.qhelp b/swift/ql/src/queries/Security/CWE-1333/ReDoSReferences.inc.qhelp
index 641b1e56b7cc..90c3d34a36de 100644
--- a/swift/ql/src/queries/Security/CWE-1333/ReDoSReferences.inc.qhelp
+++ b/swift/ql/src/queries/Security/CWE-1333/ReDoSReferences.inc.qhelp
@@ -2,12 +2,12 @@
 <qhelp>
   <references>
     <li> OWASP:
-      <a href="https://www.owasp.org/index.php/Regular_expression_Denial_of_Service_-_ReDoS">Regular expression Denial of Service - ReDoS</a>.
+      <a href="https://community.owasp.org/attacks/Regular_expression_Denial_of_Service_-_ReDoS">Regular expression Denial of Service - ReDoS</a>.
     </li>
     <li>Wikipedia: <a href="https://en.wikipedia.org/wiki/ReDoS">ReDoS</a>.</li>
     <li>Wikipedia: <a href="https://en.wikipedia.org/wiki/Time_complexity">Time complexity</a>.</li>
     <li>James Kirrage, Asiri Rathnayake, Hayo Thielecke:
-      <a href="https://arxiv.org/abs/1301.0849">Static Analysis for Regular Expression Denial-of-Service Attack</a>.
+      <a href="https://arxiv.org/abs/1301.0849">Static Analysis for Regular Expression Denial-of-Service Attacks</a>.
     </li>
   </references>
 </qhelp>
diff --git a/swift/ql/src/queries/Security/CWE-311/CleartextStorageDatabase.qhelp b/swift/ql/src/queries/Security/CWE-311/CleartextStorageDatabase.qhelp
index e4ae8c9cfa83..99a65060a507 100644
--- a/swift/ql/src/queries/Security/CWE-311/CleartextStorageDatabase.qhelp
+++ b/swift/ql/src/queries/Security/CWE-311/CleartextStorageDatabase.qhelp
@@ -21,7 +21,7 @@
 
 <li>
   OWASP Top 10:2021:
-  <a href="https://owasp.org/Top10/A02_2021-Cryptographic_Failures/">A02:2021 � Cryptographic Failures</a>.
+  <a href="https://top10.owasp.org/2021/A02_2021-Cryptographic_Failures/index.html">A02:2021 - Cryptographic Failures</a>.
 </li>
 <li>
   OWASP:
diff --git a/swift/ql/src/queries/Security/CWE-311/CleartextTransmission.qhelp b/swift/ql/src/queries/Security/CWE-311/CleartextTransmission.qhelp
index 653ba33aba4c..d85df91fda10 100644
--- a/swift/ql/src/queries/Security/CWE-311/CleartextTransmission.qhelp
+++ b/swift/ql/src/queries/Security/CWE-311/CleartextTransmission.qhelp
@@ -21,7 +21,7 @@
 
 <li>
   OWASP Top 10:2021:
-  <a href="https://owasp.org/Top10/A02_2021-Cryptographic_Failures/">A02:2021 � Cryptographic Failures</a>.
+  <a href="https://owasp.org/Top10/2021/A02_2021-Cryptographic_Failures/">A02:2021 - Cryptographic Failures</a>.
 </li>
 <li>
   OWASP:
diff --git a/swift/ql/src/queries/Security/CWE-312/CleartextStoragePreferences.qhelp b/swift/ql/src/queries/Security/CWE-312/CleartextStoragePreferences.qhelp
index 4ad73ed4872b..524c744c1d7b 100644
--- a/swift/ql/src/queries/Security/CWE-312/CleartextStoragePreferences.qhelp
+++ b/swift/ql/src/queries/Security/CWE-312/CleartextStoragePreferences.qhelp
@@ -21,7 +21,7 @@
 
 <li>
   OWASP Top 10:2021:
-  <a href="https://owasp.org/Top10/A02_2021-Cryptographic_Failures/">A02:2021 &mdash; Cryptographic Failures</a>.
+  <a href="https://top10.owasp.org/2021/A02_2021-Cryptographic_Failures/index.html">A02:2021 - Cryptographic Failures</a>.
 </li>
 <li>
 Apple Developer Documentation: <a href="https://developer.apple.com/documentation/foundation/userdefaults">UserDefaults</a>, <a href="https://developer.apple.com/documentation/foundation/nsubiquitouskeyvaluestore">NSUbiquitousKeyValueStore</a>
diff --git a/swift/ql/src/queries/Security/CWE-730/RegexInjection.qhelp b/swift/ql/src/queries/Security/CWE-730/RegexInjection.qhelp
index 9b25131d65f5..0301cfb5e5ab 100644
--- a/swift/ql/src/queries/Security/CWE-730/RegexInjection.qhelp
+++ b/swift/ql/src/queries/Security/CWE-730/RegexInjection.qhelp
@@ -38,7 +38,7 @@ meanings in regular expressions.
 <references>
 <li>
 OWASP:
-<a href="https://www.owasp.org/index.php/Regular_expression_Denial_of_Service_-_ReDoS">Regular expression Denial of Service - ReDoS</a>.
+<a href="https://community.owasp.org/attacks/Regular_expression_Denial_of_Service_-_ReDoS">Regular expression Denial of Service - ReDoS</a>.
 </li>
 <li>
 Wikipedia: <a href="https://en.wikipedia.org/wiki/ReDoS">ReDoS</a>.