diff --git a/sonar-java-plugin/src/main/resources/org/sonar/l10n/java/rules/java/S2053.html b/sonar-java-plugin/src/main/resources/org/sonar/l10n/java/rules/java/S2053.html
index 3bab734d1cc..66dda168791 100644
--- a/sonar-java-plugin/src/main/resources/org/sonar/l10n/java/rules/java/S2053.html
+++ b/sonar-java-plugin/src/main/resources/org/sonar/l10n/java/rules/java/S2053.html
@@ -70,5 +70,7 @@ <h3>Standards</h3>
   Exposure</a> </li>
   <li> CWE - <a href="https://cwe.mitre.org/data/definitions/759">CWE-759 - Use of a One-Way Hash without a Salt</a> </li>
   <li> CWE - <a href="https://cwe.mitre.org/data/definitions/760">CWE-760 - Use of a One-Way Hash with a Predictable Salt</a> </li>
+  <li> STIG Viewer - <a href="https://stigviewer.com/stig/application_security_and_development/2023-06-08/finding/V-222542">Application Security and
+  Development: V-222542</a> - The application must only store cryptographic representations of passwords. </li>
 </ul>
 
diff --git a/sonar-java-plugin/src/main/resources/org/sonar/l10n/java/rules/java/S2053.json b/sonar-java-plugin/src/main/resources/org/sonar/l10n/java/rules/java/S2053.json
index 48635986451..6f426ba6a65 100644
--- a/sonar-java-plugin/src/main/resources/org/sonar/l10n/java/rules/java/S2053.json
+++ b/sonar-java-plugin/src/main/resources/org/sonar/l10n/java/rules/java/S2053.json
@@ -35,6 +35,9 @@
     ],
     "PCI DSS 4.0": [
       "6.2.4"
+    ],
+    "STIG ASD 2023-06-08": [
+      "V-222542"
     ]
   },
   "quickfix": "unknown"
diff --git a/sonar-java-plugin/src/main/resources/org/sonar/l10n/java/rules/java/S2092.html b/sonar-java-plugin/src/main/resources/org/sonar/l10n/java/rules/java/S2092.html
index e2fabe531c8..f40117dc49a 100644
--- a/sonar-java-plugin/src/main/resources/org/sonar/l10n/java/rules/java/S2092.html
+++ b/sonar-java-plugin/src/main/resources/org/sonar/l10n/java/rules/java/S2092.html
@@ -38,5 +38,7 @@ <h2>See</h2>
   <li> CWE - <a href="https://cwe.mitre.org/data/definitions/311">CWE-311 - Missing Encryption of Sensitive Data</a> </li>
   <li> CWE - <a href="https://cwe.mitre.org/data/definitions/315">CWE-315 - Cleartext Storage of Sensitive Information in a Cookie</a> </li>
   <li> CWE - <a href="https://cwe.mitre.org/data/definitions/614">CWE-614 - Sensitive Cookie in HTTPS Session Without 'Secure' Attribute</a> </li>
+  <li> STIG Viewer - <a href="https://stigviewer.com/stig/application_security_and_development/2023-06-08/finding/V-222576">Application Security and
+  Development: V-222576</a> - The application must set the secure flag on session cookies. </li>
 </ul>
 
diff --git a/sonar-java-plugin/src/main/resources/org/sonar/l10n/java/rules/java/S2092.json b/sonar-java-plugin/src/main/resources/org/sonar/l10n/java/rules/java/S2092.json
index 3d9c275857d..4893092b62c 100644
--- a/sonar-java-plugin/src/main/resources/org/sonar/l10n/java/rules/java/S2092.json
+++ b/sonar-java-plugin/src/main/resources/org/sonar/l10n/java/rules/java/S2092.json
@@ -45,6 +45,9 @@
       "6.1.1",
       "6.1.2",
       "6.1.3"
+    ],
+    "STIG ASD 2023-06-08": [
+      "V-222576"
     ]
   },
   "quickfix": "unknown"
diff --git a/sonar-java-plugin/src/main/resources/org/sonar/l10n/java/rules/java/S2184.html b/sonar-java-plugin/src/main/resources/org/sonar/l10n/java/rules/java/S2184.html
index e4f54e09e98..8c1eb2f52e3 100644
--- a/sonar-java-plugin/src/main/resources/org/sonar/l10n/java/rules/java/S2184.html
+++ b/sonar-java-plugin/src/main/resources/org/sonar/l10n/java/rules/java/S2184.html
@@ -55,11 +55,14 @@ <h3>Compliant solution</h3>
 }
 </pre>
 <h2>Resources</h2>
+<h3>Standards</h3>
 <ul>
   <li> CWE - <a href="https://cwe.mitre.org/data/definitions/190">CWE-190 - Integer Overflow or Wraparound</a> </li>
   <li> <a href="https://wiki.sei.cmu.edu/confluence/x/AjdGBQ">CERT, NUM50-J.</a> - Convert integers to floating point for floating-point operations
   </li>
   <li> <a href="https://wiki.sei.cmu.edu/confluence/x/I9cxBQ">CERT, INT18-C.</a> - Evaluate integer expressions in a larger size before comparing or
   assigning to that size </li>
+  <li> STIG Viewer - <a href="https://stigviewer.com/stig/application_security_and_development/2023-06-08/finding/V-222612">Application Security and
+  Development: V-222612</a> - The application must not be vulnerable to overflow attacks. </li>
 </ul>
 
diff --git a/sonar-java-plugin/src/main/resources/org/sonar/l10n/java/rules/java/S2184.json b/sonar-java-plugin/src/main/resources/org/sonar/l10n/java/rules/java/S2184.json
index 768beedd205..8e308f998ba 100644
--- a/sonar-java-plugin/src/main/resources/org/sonar/l10n/java/rules/java/S2184.json
+++ b/sonar-java-plugin/src/main/resources/org/sonar/l10n/java/rules/java/S2184.json
@@ -31,6 +31,9 @@
     ],
     "ASVS 4.0": [
       "5.4.3"
+    ],
+    "STIG ASD 2023-06-08": [
+      "V-222612"
     ]
   },
   "quickfix": "unknown"
diff --git a/sonar-java-plugin/src/main/resources/org/sonar/l10n/java/rules/java/S2226.html b/sonar-java-plugin/src/main/resources/org/sonar/l10n/java/rules/java/S2226.html
index 66ac8c69dc7..71be12f334c 100644
--- a/sonar-java-plugin/src/main/resources/org/sonar/l10n/java/rules/java/S2226.html
+++ b/sonar-java-plugin/src/main/resources/org/sonar/l10n/java/rules/java/S2226.html
@@ -134,7 +134,10 @@ <h2>Resources</h2>
 <h3>Articles &amp; blog posts</h3>
 <ul>
   <li> <a href="https://www.devinline.com/2013/08/how-to-make-thread-safe-servlet.html">Nikhil Ranjan: How to make thread safe servlet ?</a> </li>
-  <li> <a href="https://objectcomputing.com/resources/publications/sett/april-2000-tips-for-creating-thread-safe-code-avoiding-race-conditions">Object
-  Computing: Tips for creating thread-safe code</a> </li>
+</ul>
+<h3>Standards</h3>
+<ul>
+  <li> STIG Viewer - <a href="https://stigviewer.com/stig/application_security_and_development/2023-06-08/finding/V-222567">Application Security and
+  Development: V-222567</a> - The application must not be vulnerable to race conditions. </li>
 </ul>
 
diff --git a/sonar-java-plugin/src/main/resources/org/sonar/l10n/java/rules/java/S2226.json b/sonar-java-plugin/src/main/resources/org/sonar/l10n/java/rules/java/S2226.json
index c598ab0cdc5..f1426202cc8 100644
--- a/sonar-java-plugin/src/main/resources/org/sonar/l10n/java/rules/java/S2226.json
+++ b/sonar-java-plugin/src/main/resources/org/sonar/l10n/java/rules/java/S2226.json
@@ -24,6 +24,9 @@
   "securityStandards": {
     "CERT": [
       "MSC11-J."
+    ],
+    "STIG ASD 2023-06-08": [
+      "V-222567"
     ]
   },
   "quickfix": "unknown"
diff --git a/sonar-java-plugin/src/main/resources/org/sonar/l10n/java/rules/java/S2254.html b/sonar-java-plugin/src/main/resources/org/sonar/l10n/java/rules/java/S2254.html
index 402f2164d17..30f874d3d2a 100644
--- a/sonar-java-plugin/src/main/resources/org/sonar/l10n/java/rules/java/S2254.html
+++ b/sonar-java-plugin/src/main/resources/org/sonar/l10n/java/rules/java/S2254.html
@@ -49,5 +49,7 @@ <h3>Standards</h3>
   <li> OWASP - <a href="https://owasp.org/www-project-top-ten/2017/A2_2017-Broken_Authentication">Top 10 2017 Category A2 - Broken Authentication</a>
   </li>
   <li> CWE - <a href="https://cwe.mitre.org/data/definitions/807">CWE-807 - Reliance on Untrusted Inputs in a Security Decision</a> </li>
+  <li> STIG Viewer - <a href="https://stigviewer.com/stig/application_security_and_development/2023-06-08/finding/V-222582">Application Security and
+  Development: V-222582</a> - The application must not re-use or recycle session IDs. </li>
 </ul>
 
diff --git a/sonar-java-plugin/src/main/resources/org/sonar/l10n/java/rules/java/S2254.json b/sonar-java-plugin/src/main/resources/org/sonar/l10n/java/rules/java/S2254.json
index 6153678f56e..eec339f3cdf 100644
--- a/sonar-java-plugin/src/main/resources/org/sonar/l10n/java/rules/java/S2254.json
+++ b/sonar-java-plugin/src/main/resources/org/sonar/l10n/java/rules/java/S2254.json
@@ -28,6 +28,9 @@
     ],
     "OWASP Top 10 2021": [
       "A4"
+    ],
+    "STIG ASD 2023-06-08": [
+      "V-222582"
     ]
   },
   "quickfix": "unknown"
diff --git a/sonar-java-plugin/src/main/resources/org/sonar/l10n/java/rules/java/S2612.html b/sonar-java-plugin/src/main/resources/org/sonar/l10n/java/rules/java/S2612.html
index 962080da918..59a6f61fae6 100644
--- a/sonar-java-plugin/src/main/resources/org/sonar/l10n/java/rules/java/S2612.html
+++ b/sonar-java-plugin/src/main/resources/org/sonar/l10n/java/rules/java/S2612.html
@@ -73,5 +73,7 @@ <h2>See</h2>
   Create files with appropriate access permissions </li>
   <li> <a href="https://wiki.sei.cmu.edu/confluence/display/c/FIO06-C.+Create+files+with+appropriate+access+permissions">CERT, FIO06-C.</a> - Create
   files with appropriate access permissions </li>
+  <li> STIG Viewer - <a href="https://stigviewer.com/stig/application_security_and_development/2023-06-08/finding/V-222430">Application Security and
+  Development: V-222430</a> - The application must execute without excessive account permissions. </li>
 </ul>
 
diff --git a/sonar-java-plugin/src/main/resources/org/sonar/l10n/java/rules/java/S2612.json b/sonar-java-plugin/src/main/resources/org/sonar/l10n/java/rules/java/S2612.json
index ee62fd05368..9e1235d6f1c 100644
--- a/sonar-java-plugin/src/main/resources/org/sonar/l10n/java/rules/java/S2612.json
+++ b/sonar-java-plugin/src/main/resources/org/sonar/l10n/java/rules/java/S2612.json
@@ -44,6 +44,9 @@
     ],
     "ASVS 4.0": [
       "4.3.3"
+    ],
+    "STIG ASD 2023-06-08": [
+      "V-222430"
     ]
   },
   "quickfix": "unknown"
diff --git a/sonar-java-plugin/src/main/resources/org/sonar/l10n/java/rules/java/S2647.html b/sonar-java-plugin/src/main/resources/org/sonar/l10n/java/rules/java/S2647.html
index b70cf58bca9..d1c66bb56a4 100644
--- a/sonar-java-plugin/src/main/resources/org/sonar/l10n/java/rules/java/S2647.html
+++ b/sonar-java-plugin/src/main/resources/org/sonar/l10n/java/rules/java/S2647.html
@@ -105,5 +105,7 @@ <h3>Standards</h3>
   <li> <a href="https://cheatsheetseries.owasp.org/cheatsheets/Web_Service_Security_Cheat_Sheet.html#user-authentication">OWASP Web Service Security
   Cheat Sheet</a> </li>
   <li> CWE - <a href="https://cwe.mitre.org/data/definitions/522">CWE-522 - Insufficiently Protected Credentials</a> </li>
+  <li> STIG Viewer - <a href="https://stigviewer.com/stig/application_security_and_development/2023-06-08/finding/V-222533">Application Security and
+  Development: V-222533</a> - The application must authenticate all network connected endpoint devices before establishing any connection. </li>
 </ul>
 
diff --git a/sonar-java-plugin/src/main/resources/org/sonar/l10n/java/rules/java/S2647.json b/sonar-java-plugin/src/main/resources/org/sonar/l10n/java/rules/java/S2647.json
index 607d42653d4..8610ca35978 100644
--- a/sonar-java-plugin/src/main/resources/org/sonar/l10n/java/rules/java/S2647.json
+++ b/sonar-java-plugin/src/main/resources/org/sonar/l10n/java/rules/java/S2647.json
@@ -35,6 +35,9 @@
     ],
     "ASVS 4.0": [
       "2.10.3"
+    ],
+    "STIG ASD 2023-06-08": [
+      "V-222533"
     ]
   },
   "quickfix": "unknown"
diff --git a/sonar-java-plugin/src/main/resources/org/sonar/l10n/java/rules/java/S2696.html b/sonar-java-plugin/src/main/resources/org/sonar/l10n/java/rules/java/S2696.html
index f19499f6052..66275ac36e7 100644
--- a/sonar-java-plugin/src/main/resources/org/sonar/l10n/java/rules/java/S2696.html
+++ b/sonar-java-plugin/src/main/resources/org/sonar/l10n/java/rules/java/S2696.html
@@ -15,4 +15,10 @@ <h3>Noncompliant code example</h3>
   }
 }
 </pre>
+<h2>Resources</h2>
+<h3>Standards</h3>
+<ul>
+  <li> STIG Viewer - <a href="https://stigviewer.com/stig/application_security_and_development/2023-06-08/finding/V-222567">Application Security and
+  Development: V-222567</a> - The application must not be vulnerable to race conditions. </li>
+</ul>
 
diff --git a/sonar-java-plugin/src/main/resources/org/sonar/l10n/java/rules/java/S2696.json b/sonar-java-plugin/src/main/resources/org/sonar/l10n/java/rules/java/S2696.json
index 731024c82da..0a80eec87cc 100644
--- a/sonar-java-plugin/src/main/resources/org/sonar/l10n/java/rules/java/S2696.json
+++ b/sonar-java-plugin/src/main/resources/org/sonar/l10n/java/rules/java/S2696.json
@@ -19,5 +19,10 @@
   "ruleSpecification": "RSPEC-2696",
   "sqKey": "S2696",
   "scope": "Main",
+  "securityStandards": {
+    "STIG ASD 2023-06-08": [
+      "V-222567"
+    ]
+  },
   "quickfix": "unknown"
 }
diff --git a/sonar-java-plugin/src/main/resources/org/sonar/l10n/java/rules/java/S2755.html b/sonar-java-plugin/src/main/resources/org/sonar/l10n/java/rules/java/S2755.html
index 18e05fe5c12..c3d23046475 100644
--- a/sonar-java-plugin/src/main/resources/org/sonar/l10n/java/rules/java/S2755.html
+++ b/sonar-java-plugin/src/main/resources/org/sonar/l10n/java/rules/java/S2755.html
@@ -150,5 +150,7 @@ <h3>Standards</h3>
   Entities (XXE)</a> </li>
   <li> CWE - <a href="https://cwe.mitre.org/data/definitions/611">CWE-611 - Information Exposure Through XML External Entity Reference</a> </li>
   <li> CWE - <a href="https://cwe.mitre.org/data/definitions/827">CWE-827 - Improper Control of Document Type Definition</a> </li>
+  <li> STIG Viewer - <a href="https://stigviewer.com/stig/application_security_and_development/2023-06-08/finding/V-222608">Application Security and
+  Development: V-222608</a> - The application must not be vulnerable to XML-oriented attacks. </li>
 </ul>
 
diff --git a/sonar-java-plugin/src/main/resources/org/sonar/l10n/java/rules/java/S2755.json b/sonar-java-plugin/src/main/resources/org/sonar/l10n/java/rules/java/S2755.json
index 79f1fbc1836..30d28d2f879 100644
--- a/sonar-java-plugin/src/main/resources/org/sonar/l10n/java/rules/java/S2755.json
+++ b/sonar-java-plugin/src/main/resources/org/sonar/l10n/java/rules/java/S2755.json
@@ -39,6 +39,9 @@
     ],
     "ASVS 4.0": [
       "5.5.2"
+    ],
+    "STIG ASD 2023-06-08": [
+      "V-222608"
     ]
   },
   "quickfix": "infeasible"
diff --git a/sonar-java-plugin/src/main/resources/org/sonar/l10n/java/rules/java/S2885.html b/sonar-java-plugin/src/main/resources/org/sonar/l10n/java/rules/java/S2885.html
index d0c928a0094..879bb02f5f3 100644
--- a/sonar-java-plugin/src/main/resources/org/sonar/l10n/java/rules/java/S2885.html
+++ b/sonar-java-plugin/src/main/resources/org/sonar/l10n/java/rules/java/S2885.html
@@ -41,4 +41,9 @@ <h3>Articles &amp; blog posts</h3>
   <li> <a href="https://www.baeldung.com/java-thread-safety">Baeldung - Thread safety</a> </li>
   <li> <a href="https://www.baeldung.com/java-static">Baeldung - Static</a> </li>
 </ul>
+<h3>Standards</h3>
+<ul>
+  <li> STIG Viewer - <a href="https://stigviewer.com/stig/application_security_and_development/2023-06-08/finding/V-222567">Application Security and
+  Development: V-222567</a> - The application must not be vulnerable to race conditions. </li>
+</ul>
 
diff --git a/sonar-java-plugin/src/main/resources/org/sonar/l10n/java/rules/java/S2885.json b/sonar-java-plugin/src/main/resources/org/sonar/l10n/java/rules/java/S2885.json
index 2db3f672805..dca347e2b3a 100644
--- a/sonar-java-plugin/src/main/resources/org/sonar/l10n/java/rules/java/S2885.json
+++ b/sonar-java-plugin/src/main/resources/org/sonar/l10n/java/rules/java/S2885.json
@@ -19,5 +19,10 @@
   "ruleSpecification": "RSPEC-2885",
   "sqKey": "S2885",
   "scope": "Main",
+  "securityStandards": {
+    "STIG ASD 2023-06-08": [
+      "V-222567"
+    ]
+  },
   "quickfix": "unknown"
 }
diff --git a/sonar-java-plugin/src/main/resources/org/sonar/l10n/java/rules/java/S2886.html b/sonar-java-plugin/src/main/resources/org/sonar/l10n/java/rules/java/S2886.html
index 19b1433c58c..b94ce59941c 100644
--- a/sonar-java-plugin/src/main/resources/org/sonar/l10n/java/rules/java/S2886.html
+++ b/sonar-java-plugin/src/main/resources/org/sonar/l10n/java/rules/java/S2886.html
@@ -68,13 +68,15 @@ <h3>Documentation</h3>
   <li> <a href="https://docs.oracle.com/javase/tutorial/essential/concurrency/syncmeth.html">Oracle Java - Synchronized Methods</a> </li>
   <li> <a href="https://docs.oracle.com/javase/specs/jls/se20/html/jls-8.html#jls-8.4.3.6">Oracle SE 20 - Synchronized Methods</a> </li>
 </ul>
-<h3>Standards</h3>
-<ul>
-  <li> <a href="https://wiki.sei.cmu.edu/confluence/x/4jdGBQ">CERT, VNA01-J.</a> - Ensure visibility of shared references to immutable objects </li>
-</ul>
 <h3>Articles &amp; blog posts</h3>
 <ul>
   <li> <a href="https://web.mit.edu/6.005/www/fa14/classes/18-thread-safety/">MIT - Thread safety</a> </li>
   <li> <a href="https://www.baeldung.com/java-thread-safety">Baeldung - Thread safety</a> </li>
 </ul>
+<h3>Standards</h3>
+<ul>
+  <li> <a href="https://wiki.sei.cmu.edu/confluence/x/4jdGBQ">CERT, VNA01-J.</a> - Ensure visibility of shared references to immutable objects </li>
+  <li> STIG Viewer - <a href="https://stigviewer.com/stig/application_security_and_development/2023-06-08/finding/V-222567">Application Security and
+  Development: V-222567</a> - The application must not be vulnerable to race conditions. </li>
+</ul>
 
diff --git a/sonar-java-plugin/src/main/resources/org/sonar/l10n/java/rules/java/S2886.json b/sonar-java-plugin/src/main/resources/org/sonar/l10n/java/rules/java/S2886.json
index 763f637cb98..1d9bb7f2909 100644
--- a/sonar-java-plugin/src/main/resources/org/sonar/l10n/java/rules/java/S2886.json
+++ b/sonar-java-plugin/src/main/resources/org/sonar/l10n/java/rules/java/S2886.json
@@ -23,6 +23,9 @@
   "securityStandards": {
     "CERT": [
       "VNA01-J."
+    ],
+    "STIG ASD 2023-06-08": [
+      "V-222567"
     ]
   },
   "quickfix": "unknown"
diff --git a/sonar-java-plugin/src/main/resources/org/sonar/l10n/java/rules/java/S3330.html b/sonar-java-plugin/src/main/resources/org/sonar/l10n/java/rules/java/S3330.html
index 24b7739eacc..4f754990d94 100644
--- a/sonar-java-plugin/src/main/resources/org/sonar/l10n/java/rules/java/S3330.html
+++ b/sonar-java-plugin/src/main/resources/org/sonar/l10n/java/rules/java/S3330.html
@@ -39,5 +39,7 @@ <h2>See</h2>
   (XSS)</a> </li>
   <li> CWE - <a href="https://cwe.mitre.org/data/definitions/1004">CWE-1004 - Sensitive Cookie Without 'HttpOnly' Flag</a> </li>
   <li> Derived from FindSecBugs rule <a href="https://find-sec-bugs.github.io/bugs.htm#HTTPONLY_COOKIE">HTTPONLY_COOKIE</a> </li>
+  <li> STIG Viewer - <a href="https://stigviewer.com/stig/application_security_and_development/2023-06-08/finding/V-222575">Application Security and
+  Development: V-222575</a> - The application must set the HTTPOnly flag on session cookies. </li>
 </ul>
 
diff --git a/sonar-java-plugin/src/main/resources/org/sonar/l10n/java/rules/java/S3330.json b/sonar-java-plugin/src/main/resources/org/sonar/l10n/java/rules/java/S3330.json
index e39ecd645f6..d88c94437cf 100644
--- a/sonar-java-plugin/src/main/resources/org/sonar/l10n/java/rules/java/S3330.json
+++ b/sonar-java-plugin/src/main/resources/org/sonar/l10n/java/rules/java/S3330.json
@@ -38,6 +38,9 @@
     ],
     "ASVS 4.0": [
       "3.4.2"
+    ],
+    "STIG ASD 2023-06-08": [
+      "V-222575"
     ]
   },
   "quickfix": "unknown"
diff --git a/sonar-java-plugin/src/main/resources/org/sonar/l10n/java/rules/java/S3518.html b/sonar-java-plugin/src/main/resources/org/sonar/l10n/java/rules/java/S3518.html
index 22db6b6dc80..4606b5c6e94 100644
--- a/sonar-java-plugin/src/main/resources/org/sonar/l10n/java/rules/java/S3518.html
+++ b/sonar-java-plugin/src/main/resources/org/sonar/l10n/java/rules/java/S3518.html
@@ -44,16 +44,15 @@ <h2>Resources</h2>
 <h3>Documentation</h3>
 <ul>
   <li> <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/ArithmeticException.html">ArithmeticException</a> </li>
+  <li> <a href="https://docs.oracle.com/javase/specs/jls/se17/html/jls-15.html#jls-15.17.2">The Division Operator in the JLS</a> </li>
+  <li> <a href="https://docs.oracle.com/javase/specs/jls/se17/html/jls-15.html#jls-15.17.3">The Remainder Operator in the JLS</a> </li>
 </ul>
-<h3>Articles &amp; blog posts</h3>
+<h3>Standards</h3>
 <ul>
   <li> CWE - <a href="https://cwe.mitre.org/data/definitions/369">CWE-369 - Divide by zero</a> </li>
   <li> <a href="https://wiki.sei.cmu.edu/confluence/x/CTZGBQ">CERT, NUM02-J.</a> - Ensure that division and remainder operations do not result in
   divide-by-zero errors </li>
-</ul>
-<h3>Standards</h3>
-<ul>
-  <li> <a href="https://docs.oracle.com/javase/specs/jls/se17/html/jls-15.html#jls-15.17.2">The Division Operator in the JLS</a> </li>
-  <li> <a href="https://docs.oracle.com/javase/specs/jls/se17/html/jls-15.html#jls-15.17.3">The Remainder Operator in the JLS</a> </li>
+  <li> STIG Viewer - <a href="https://stigviewer.com/stig/application_security_and_development/2023-06-08/finding/V-222612">Application Security and
+  Development: V-222612</a> - The application must not be vulnerable to overflow attacks. </li>
 </ul>
 
diff --git a/sonar-java-plugin/src/main/resources/org/sonar/l10n/java/rules/java/S3518.json b/sonar-java-plugin/src/main/resources/org/sonar/l10n/java/rules/java/S3518.json
index 75e3d193022..bafd784f171 100644
--- a/sonar-java-plugin/src/main/resources/org/sonar/l10n/java/rules/java/S3518.json
+++ b/sonar-java-plugin/src/main/resources/org/sonar/l10n/java/rules/java/S3518.json
@@ -29,6 +29,9 @@
     ],
     "CWE": [
       369
+    ],
+    "STIG ASD 2023-06-08": [
+      "V-222612"
     ]
   },
   "quickfix": "infeasible"
diff --git a/sonar-java-plugin/src/main/resources/org/sonar/l10n/java/rules/java/S4502.html b/sonar-java-plugin/src/main/resources/org/sonar/l10n/java/rules/java/S4502.html
index 85de4aeeb8d..606f6b8babc 100644
--- a/sonar-java-plugin/src/main/resources/org/sonar/l10n/java/rules/java/S4502.html
+++ b/sonar-java-plugin/src/main/resources/org/sonar/l10n/java/rules/java/S4502.html
@@ -57,5 +57,7 @@ <h2>See</h2>
   <li> OWASP - <a href="https://owasp.org/www-project-top-ten/2017/A6_2017-Security_Misconfiguration">Top 10 2017 Category A6 - Security
   Misconfiguration</a> </li>
   <li> <a href="https://owasp.org/www-community/attacks/csrf">OWASP: Cross-Site Request Forgery</a> </li>
+  <li> STIG Viewer - <a href="https://stigviewer.com/stig/application_security_and_development/2023-06-08/finding/V-222603">Application Security and
+  Development: V-222603</a> - The application must protect from Cross-Site Request Forgery (CSRF) vulnerabilities. </li>
 </ul>
 
diff --git a/sonar-java-plugin/src/main/resources/org/sonar/l10n/java/rules/java/S4502.json b/sonar-java-plugin/src/main/resources/org/sonar/l10n/java/rules/java/S4502.json
index f243103b32a..9d0a4f2ef7c 100644
--- a/sonar-java-plugin/src/main/resources/org/sonar/l10n/java/rules/java/S4502.json
+++ b/sonar-java-plugin/src/main/resources/org/sonar/l10n/java/rules/java/S4502.json
@@ -39,6 +39,9 @@
     "ASVS 4.0": [
       "13.2.3",
       "4.2.2"
+    ],
+    "STIG ASD 2023-06-08": [
+      "V-222603"
     ]
   },
   "quickfix": "unknown"
diff --git a/sonar-java-plugin/src/main/resources/org/sonar/l10n/java/rules/java/S4830.html b/sonar-java-plugin/src/main/resources/org/sonar/l10n/java/rules/java/S4830.html
index 6be4e0a2a94..cbecb915c47 100644
--- a/sonar-java-plugin/src/main/resources/org/sonar/l10n/java/rules/java/S4830.html
+++ b/sonar-java-plugin/src/main/resources/org/sonar/l10n/java/rules/java/S4830.html
@@ -70,6 +70,8 @@ <h3>Standards</h3>
   <li> OWASP - <a href="https://mobile-security.gitbook.io/masvs/security-requirements/0x10-v5-network_communication_requirements">Mobile AppSec
   Verification Standard - Network Communication Requirements</a> </li>
   <li> CWE - <a href="https://cwe.mitre.org/data/definitions/295">CWE-295 - Improper Certificate Validation</a> </li>
+  <li> STIG Viewer - <a href="https://stigviewer.com/stig/application_security_and_development/2023-06-08/finding/V-222550">Application Security and
+  Development: V-222550</a> - The application must validate certificates by constructing a certification path to an accepted trust anchor. </li>
   <li> <a
   href="https://wiki.sei.cmu.edu/confluence/display/java/MSC61-J.+Do+not+use+insecure+or+weak+cryptographic+algorithms">https://wiki.sei.cmu.edu/confluence/display/java/MSC61-J.+Do+not+use+insecure+or+weak+cryptographic+algorithms</a> </li>
 </ul>
diff --git a/sonar-java-plugin/src/main/resources/org/sonar/l10n/java/rules/java/S4830.json b/sonar-java-plugin/src/main/resources/org/sonar/l10n/java/rules/java/S4830.json
index bbcccc263f0..2c3ea6fc429 100644
--- a/sonar-java-plugin/src/main/resources/org/sonar/l10n/java/rules/java/S4830.json
+++ b/sonar-java-plugin/src/main/resources/org/sonar/l10n/java/rules/java/S4830.json
@@ -56,6 +56,9 @@
     "ASVS 4.0": [
       "1.9.2",
       "9.2.1"
+    ],
+    "STIG ASD 2023-06-08": [
+      "V-222550"
     ]
   },
   "quickfix": "unknown"
diff --git a/sonar-java-plugin/src/main/resources/org/sonar/l10n/java/rules/java/S5332.html b/sonar-java-plugin/src/main/resources/org/sonar/l10n/java/rules/java/S5332.html
index 033cea26e01..9d010389b5e 100644
--- a/sonar-java-plugin/src/main/resources/org/sonar/l10n/java/rules/java/S5332.html
+++ b/sonar-java-plugin/src/main/resources/org/sonar/l10n/java/rules/java/S5332.html
@@ -119,21 +119,51 @@ <h2>Exceptions</h2>
   <li> Insecure protocol scheme followed by loopback addresses like 127.0.0.1 or <code>localhost</code>. </li>
 </ul>
 <h2>See</h2>
+<h3>Documentation</h3>
 <ul>
+  <li> AWS Documentation - <a href="https://docs.aws.amazon.com/elasticloadbalancing/latest/application/load-balancer-listeners.html">Listeners for
+  your Application Load Balancers</a> </li>
+  <li> AWS Documentation - <a
+  href="https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-kinesis-stream-streamencryption.html">Stream Encryption</a>
+  </li>
+</ul>
+<h3>Articles &amp; blog posts</h3>
+<ul>
+  <li> Google - <a href="https://security.googleblog.com/2016/09/moving-towards-more-secure-web.html">Moving towards more secure web</a> </li>
+  <li> Mozilla - <a href="https://blog.mozilla.org/security/2015/04/30/deprecating-non-secure-http/">Deprecating non secure http</a> </li>
+</ul>
+<h3>Standards</h3>
+<ul>
+  <li> OWASP - <a href="https://owasp.org/www-project-top-ten/2017/A3_2017-Sensitive_Data_Exposure">Top 10 2017 Category A3 - Sensitive Data
+  Exposure</a> </li>
   <li> OWASP - <a href="https://owasp.org/Top10/A02_2021-Cryptographic_Failures/">Top 10 2021 Category A2 - Cryptographic Failures</a> </li>
-  <li> OWASP - <a href="https://owasp.org/www-project-top-ten/2017/A3_2017-Sensitive_Data_Exposure">Top 10 2017 Category A3 - Sensitive Data Exposure
-  </a> </li>
   <li> OWASP - <a href="https://mobile-security.gitbook.io/masvs/security-requirements/0x10-v5-network_communication_requirements">Mobile AppSec
   Verification Standard - Network Communication Requirements</a> </li>
   <li> OWASP - <a href="https://owasp.org/www-project-mobile-top-10/2016-risks/m3-insecure-communication">Mobile Top 10 2016 Category M3 - Insecure
   Communication</a> </li>
   <li> CWE - <a href="https://cwe.mitre.org/data/definitions/200">CWE-200 - Exposure of Sensitive Information to an Unauthorized Actor</a> </li>
   <li> CWE - <a href="https://cwe.mitre.org/data/definitions/319">CWE-319 - Cleartext Transmission of Sensitive Information</a> </li>
-  <li> <a href="https://security.googleblog.com/2016/09/moving-towards-more-secure-web.html">Google, Moving towards more secure web</a> </li>
-  <li> <a href="https://blog.mozilla.org/security/2015/04/30/deprecating-non-secure-http/">Mozilla, Deprecating non secure http</a> </li>
-  <li> <a href="https://docs.aws.amazon.com/elasticloadbalancing/latest/application/load-balancer-listeners.html">AWS Documentation</a> - Listeners
-  for your Application Load Balancers </li>
-  <li> <a href="https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-kinesis-stream-streamencryption.html">AWS
-  Documentation</a> - Stream Encryption </li>
+  <li> STIG Viewer - <a href="https://stigviewer.com/stig/application_security_and_development/2023-06-08/finding/V-222397">Application Security and
+  Development: V-222397</a> - The application must implement cryptographic mechanisms to protect the integrity of remote access sessions. </li>
+  <li> STIG Viewer - <a href="https://stigviewer.com/stig/application_security_and_development/2023-06-08/finding/V-222534">Application Security and
+  Development: V-222534</a> - Service-Oriented Applications handling non-releasable data must authenticate endpoint devices via mutual SSL/TLS. </li>
+  <li> STIG Viewer - <a href="https://stigviewer.com/stig/application_security_and_development/2023-06-08/finding/V-222562">Application Security and
+  Development: V-222562</a> - Applications used for non-local maintenance must implement cryptographic mechanisms to protect the integrity of
+  maintenance and diagnostic communications. </li>
+  <li> STIG Viewer - <a href="https://stigviewer.com/stig/application_security_and_development/2023-06-08/finding/V-222563">Application Security and
+  Development: V-222563</a> - Applications used for non-local maintenance must implement cryptographic mechanisms to protect the confidentiality of
+  maintenance and diagnostic communications. </li>
+  <li> STIG Viewer - <a href="https://stigviewer.com/stig/application_security_and_development/2023-06-08/finding/V-222577">Application Security and
+  Development: V-222577</a> - The application must not expose session IDs. </li>
+  <li> STIG Viewer - <a href="https://stigviewer.com/stig/application_security_and_development/2023-06-08/finding/V-222596">Application Security and
+  Development: V-222596</a> - The application must protect the confidentiality and integrity of transmitted information. </li>
+  <li> STIG Viewer - <a href="https://stigviewer.com/stig/application_security_and_development/2023-06-08/finding/V-222597">Application Security and
+  Development: V-222597</a> - The application must implement cryptographic mechanisms to prevent unauthorized disclosure of information and/or detect
+  changes to information during transmission. </li>
+  <li> STIG Viewer - <a href="https://stigviewer.com/stig/application_security_and_development/2023-06-08/finding/V-222598">Application Security and
+  Development: V-222598</a> - The application must maintain the confidentiality and integrity of information during preparation for transmission.
+  </li>
+  <li> STIG Viewer - <a href="https://stigviewer.com/stig/application_security_and_development/2023-06-08/finding/V-222599">Application Security and
+  Development: V-222599</a> - The application must maintain the confidentiality and integrity of information during reception. </li>
 </ul>
 
diff --git a/sonar-java-plugin/src/main/resources/org/sonar/l10n/java/rules/java/S5332.json b/sonar-java-plugin/src/main/resources/org/sonar/l10n/java/rules/java/S5332.json
index 9c1e4922df5..1c02db62907 100644
--- a/sonar-java-plugin/src/main/resources/org/sonar/l10n/java/rules/java/S5332.json
+++ b/sonar-java-plugin/src/main/resources/org/sonar/l10n/java/rules/java/S5332.json
@@ -44,6 +44,17 @@
       "1.9.1",
       "9.1.1",
       "9.2.2"
+    ],
+    "STIG ASD 2023-06-08": [
+      "V-222397",
+      "V-222534",
+      "V-222562",
+      "V-222563",
+      "V-222577",
+      "V-222596",
+      "V-222597",
+      "V-222598",
+      "V-222599"
     ]
   },
   "quickfix": "unknown"
diff --git a/sonar-java-plugin/src/main/resources/org/sonar/l10n/java/rules/java/S5344.html b/sonar-java-plugin/src/main/resources/org/sonar/l10n/java/rules/java/S5344.html
index 8a00a320ce7..3dfc6d6b815 100644
--- a/sonar-java-plugin/src/main/resources/org/sonar/l10n/java/rules/java/S5344.html
+++ b/sonar-java-plugin/src/main/resources/org/sonar/l10n/java/rules/java/S5344.html
@@ -91,5 +91,7 @@ <h3>Standards</h3>
   Exposure</a> </li>
   <li> CWE - <a href="https://cwe.mitre.org/data/definitions/256">CWE-256 - Plaintext Storage of a Password</a> </li>
   <li> CWE - <a href="https://cwe.mitre.org/data/definitions/916">CWE-916 - Use of Password Hash With Insufficient Computational Effort</a> </li>
+  <li> STIG Viewer - <a href="https://stigviewer.com/stig/application_security_and_development/2023-06-08/finding/V-222542">Application Security and
+  Development: V-222542</a> - The application must only store cryptographic representations of passwords. </li>
 </ul>
 
diff --git a/sonar-java-plugin/src/main/resources/org/sonar/l10n/java/rules/java/S5344.json b/sonar-java-plugin/src/main/resources/org/sonar/l10n/java/rules/java/S5344.json
index a1b9666abd2..982ecf7c343 100644
--- a/sonar-java-plugin/src/main/resources/org/sonar/l10n/java/rules/java/S5344.json
+++ b/sonar-java-plugin/src/main/resources/org/sonar/l10n/java/rules/java/S5344.json
@@ -45,6 +45,9 @@
       "2.4.3",
       "2.4.4",
       "2.4.5"
+    ],
+    "STIG ASD 2023-06-08": [
+      "V-222542"
     ]
   },
   "quickfix": "unknown"
diff --git a/sonar-java-plugin/src/main/resources/org/sonar/l10n/java/rules/java/S5443.html b/sonar-java-plugin/src/main/resources/org/sonar/l10n/java/rules/java/S5443.html
index 03e76d3bf76..9a8e9c51caa 100644
--- a/sonar-java-plugin/src/main/resources/org/sonar/l10n/java/rules/java/S5443.html
+++ b/sonar-java-plugin/src/main/resources/org/sonar/l10n/java/rules/java/S5443.html
@@ -82,5 +82,7 @@ <h2>See</h2>
   <li> CWE - <a href="https://cwe.mitre.org/data/definitions/379">CWE-379 - Creation of Temporary File in Directory with Incorrect Permissions</a>
   </li>
   <li> <a href="https://owasp.org/www-community/vulnerabilities/Insecure_Temporary_File">OWASP, Insecure Temporary File</a> </li>
+  <li> STIG Viewer - <a href="https://stigviewer.com/stig/application_security_and_development/2023-06-08/finding/V-222567">Application Security and
+  Development: V-222567</a> - The application must not be vulnerable to race conditions. </li>
 </ul>
 
diff --git a/sonar-java-plugin/src/main/resources/org/sonar/l10n/java/rules/java/S5443.json b/sonar-java-plugin/src/main/resources/org/sonar/l10n/java/rules/java/S5443.json
index 6a9b0ff38f7..139e11afd8c 100644
--- a/sonar-java-plugin/src/main/resources/org/sonar/l10n/java/rules/java/S5443.json
+++ b/sonar-java-plugin/src/main/resources/org/sonar/l10n/java/rules/java/S5443.json
@@ -32,6 +32,9 @@
     ],
     "PCI DSS 4.0": [
       "6.2.4"
+    ],
+    "STIG ASD 2023-06-08": [
+      "V-222567"
     ]
   },
   "quickfix": "unknown"
diff --git a/sonar-java-plugin/src/main/resources/org/sonar/l10n/java/rules/java/S5445.html b/sonar-java-plugin/src/main/resources/org/sonar/l10n/java/rules/java/S5445.html
index f591cd63fe9..ed4bc98515f 100644
--- a/sonar-java-plugin/src/main/resources/org/sonar/l10n/java/rules/java/S5445.html
+++ b/sonar-java-plugin/src/main/resources/org/sonar/l10n/java/rules/java/S5445.html
@@ -84,5 +84,7 @@ <h3>Standards</h3>
   <li> CWE - <a href="https://cwe.mitre.org/data/definitions/377">CWE-377 - Insecure Temporary File</a> </li>
   <li> CWE - <a href="https://cwe.mitre.org/data/definitions/379">CWE-379 - Creation of Temporary File in Directory with Incorrect Permissions</a>
   </li>
+  <li> STIG Viewer - <a href="https://stigviewer.com/stig/application_security_and_development/2023-06-08/finding/V-222567">Application Security and
+  Development: V-222567</a> - The application must not be vulnerable to race conditions. </li>
 </ul>
 
diff --git a/sonar-java-plugin/src/main/resources/org/sonar/l10n/java/rules/java/S5445.json b/sonar-java-plugin/src/main/resources/org/sonar/l10n/java/rules/java/S5445.json
index bf744735699..13f111f8273 100644
--- a/sonar-java-plugin/src/main/resources/org/sonar/l10n/java/rules/java/S5445.json
+++ b/sonar-java-plugin/src/main/resources/org/sonar/l10n/java/rules/java/S5445.json
@@ -35,6 +35,9 @@
     ],
     "PCI DSS 4.0": [
       "6.2.4"
+    ],
+    "STIG ASD 2023-06-08": [
+      "V-222567"
     ]
   },
   "quickfix": "unknown"
diff --git a/sonar-java-plugin/src/main/resources/org/sonar/l10n/java/rules/java/S5527.html b/sonar-java-plugin/src/main/resources/org/sonar/l10n/java/rules/java/S5527.html
index 5ef97225c91..c18f374c13a 100644
--- a/sonar-java-plugin/src/main/resources/org/sonar/l10n/java/rules/java/S5527.html
+++ b/sonar-java-plugin/src/main/resources/org/sonar/l10n/java/rules/java/S5527.html
@@ -204,6 +204,8 @@ <h3>Standards</h3>
   <li> OWASP - <a href="https://owasp.org/www-project-mobile-top-10/2016-risks/m3-insecure-communication">Mobile Top 10 2016 Category M3 - Insecure
   Communication</a> </li>
   <li> CWE - <a href="https://cwe.mitre.org/data/definitions/297">CWE-297 - Improper Validation of Certificate with Host Mismatch</a> </li>
+  <li> STIG Viewer - <a href="https://stigviewer.com/stig/application_security_and_development/2023-06-08/finding/V-222550">Application Security and
+  Development: V-222550</a> - The application must validate certificates by constructing a certification path to an accepted trust anchor. </li>
   <li> <a
   href="https://wiki.sei.cmu.edu/confluence/display/java/MSC61-J.+Do+not+use+insecure+or+weak+cryptographic+algorithms">https://wiki.sei.cmu.edu/confluence/display/java/MSC61-J.+Do+not+use+insecure+or+weak+cryptographic+algorithms</a> </li>
 </ul>
diff --git a/sonar-java-plugin/src/main/resources/org/sonar/l10n/java/rules/java/S5527.json b/sonar-java-plugin/src/main/resources/org/sonar/l10n/java/rules/java/S5527.json
index 40979875cf4..cf1834c370f 100644
--- a/sonar-java-plugin/src/main/resources/org/sonar/l10n/java/rules/java/S5527.json
+++ b/sonar-java-plugin/src/main/resources/org/sonar/l10n/java/rules/java/S5527.json
@@ -48,6 +48,9 @@
     "PCI DSS 4.0": [
       "4.2.1",
       "6.2.4"
+    ],
+    "STIG ASD 2023-06-08": [
+      "V-222550"
     ]
   },
   "quickfix": "unknown"
diff --git a/sonar-java-plugin/src/main/resources/org/sonar/l10n/java/rules/java/S5547.html b/sonar-java-plugin/src/main/resources/org/sonar/l10n/java/rules/java/S5547.html
index 0fa717c315e..5eda82bb0a8 100644
--- a/sonar-java-plugin/src/main/resources/org/sonar/l10n/java/rules/java/S5547.html
+++ b/sonar-java-plugin/src/main/resources/org/sonar/l10n/java/rules/java/S5547.html
@@ -68,5 +68,7 @@ <h3>Standards</h3>
   <li> OWASP - <a href="https://owasp.org/www-project-top-ten/2017/A6_2017-Security_Misconfiguration">Top 10 2017 Category A6 - Security
   Misconfiguration</a> </li>
   <li> CWE - <a href="https://cwe.mitre.org/data/definitions/327">CWE-327 - Use of a Broken or Risky Cryptographic Algorithm</a> </li>
+  <li> STIG Viewer - <a href="https://stigviewer.com/stig/application_security_and_development/2023-06-08/finding/V-222396">Application Security and
+  Development: V-222396</a> - The application must implement DoD-approved encryption to protect the confidentiality of remote access sessions. </li>
 </ul>
 
diff --git a/sonar-java-plugin/src/main/resources/org/sonar/l10n/java/rules/java/S5547.json b/sonar-java-plugin/src/main/resources/org/sonar/l10n/java/rules/java/S5547.json
index 6b8676249dc..e63fbe3dd10 100644
--- a/sonar-java-plugin/src/main/resources/org/sonar/l10n/java/rules/java/S5547.json
+++ b/sonar-java-plugin/src/main/resources/org/sonar/l10n/java/rules/java/S5547.json
@@ -55,6 +55,9 @@
       "6.2.3",
       "6.2.5",
       "8.3.7"
+    ],
+    "STIG ASD 2023-06-08": [
+      "V-222396"
     ]
   },
   "quickfix": "unknown"
diff --git a/sonar-java-plugin/src/main/resources/org/sonar/l10n/java/rules/java/S5786.html b/sonar-java-plugin/src/main/resources/org/sonar/l10n/java/rules/java/S5786.html
index 22ca282b877..b6cb3d71e80 100644
--- a/sonar-java-plugin/src/main/resources/org/sonar/l10n/java/rules/java/S5786.html
+++ b/sonar-java-plugin/src/main/resources/org/sonar/l10n/java/rules/java/S5786.html
@@ -14,8 +14,8 @@ <h3>What is the potential impact?</h3>
 <p>The code will be non-conventional and readability can be slightly affected.</p>
 <h3>Exceptions</h3>
 <p>This rule does not raise an issue when the visibility is set to <code>private</code>, because <code>private</code> test methods and classes are
-systematically ignored by JUnit5, without a proper warning. In this case, there is also an impact on reliability and so it is handled by the rule <a
-href="https://rules.sonarsource.com/java/RSPEC-5810/">{rule:java:S5810}</a>.</p>
+systematically ignored by JUnit5, without a proper warning. In this case, there is also an impact on reliability and so it is handled by the rule
+{rule:java:S5810}.</p>
 <h2>How to fix it</h2>
 <p>You can simply change the visibility by removing the <code>public</code> or <code>protected</code> keywords.</p>
 <h3>Code examples</h3>
diff --git a/sonar-java-plugin/src/main/resources/org/sonar/l10n/java/rules/java/S5876.html b/sonar-java-plugin/src/main/resources/org/sonar/l10n/java/rules/java/S5876.html
index 2f64310be9a..89edd0ede9b 100644
--- a/sonar-java-plugin/src/main/resources/org/sonar/l10n/java/rules/java/S5876.html
+++ b/sonar-java-plugin/src/main/resources/org/sonar/l10n/java/rules/java/S5876.html
@@ -82,5 +82,9 @@ <h3>Standards</h3>
   </li>
   <li> <a href="https://owasp.org/www-community/attacks/Session_fixation">OWASP Sesssion Fixation</a> </li>
   <li> CWE - <a href="https://cwe.mitre.org/data/definitions/384">CWE-384 - Session Fixation</a> </li>
+  <li> STIG Viewer - <a href="https://stigviewer.com/stig/application_security_and_development/2023-06-08/finding/V-222579">Application Security and
+  Development: V-222579</a> - Applications must use system-generated session identifiers that protect against session fixation. </li>
+  <li> STIG Viewer - <a href="https://stigviewer.com/stig/application_security_and_development/2023-06-08/finding/V-222582">Application Security and
+  Development: V-222582</a> - The application must not re-use or recycle session IDs. </li>
 </ul>
 
diff --git a/sonar-java-plugin/src/main/resources/org/sonar/l10n/java/rules/java/S5876.json b/sonar-java-plugin/src/main/resources/org/sonar/l10n/java/rules/java/S5876.json
index 1b0d2fd7757..2d65b9cbb22 100644
--- a/sonar-java-plugin/src/main/resources/org/sonar/l10n/java/rules/java/S5876.json
+++ b/sonar-java-plugin/src/main/resources/org/sonar/l10n/java/rules/java/S5876.json
@@ -38,6 +38,10 @@
     ],
     "ASVS 4.0": [
       "3.2.1"
+    ],
+    "STIG ASD 2023-06-08": [
+      "V-222579",
+      "V-222582"
     ]
   },
   "quickfix": "unknown"
diff --git a/sonar-java-plugin/src/main/resources/org/sonar/l10n/java/rules/java/S6373.html b/sonar-java-plugin/src/main/resources/org/sonar/l10n/java/rules/java/S6373.html
index 6de75a8c1f6..afe3d20dc89 100644
--- a/sonar-java-plugin/src/main/resources/org/sonar/l10n/java/rules/java/S6373.html
+++ b/sonar-java-plugin/src/main/resources/org/sonar/l10n/java/rules/java/S6373.html
@@ -98,5 +98,7 @@ <h3>Standards</h3>
   <li> OWASP - <a href="https://owasp.org/Top10/A05_2021-Security_Misconfiguration/">Top 10 2021 - Category A5 - Security Misconfiguration</a> </li>
   <li> CWE - <a href="https://cwe.mitre.org/data/definitions/611">CWE-611 - Improper Restriction of XML External Entity Reference</a> </li>
   <li> CWE - <a href="https://cwe.mitre.org/data/definitions/827">CWE-827 - Improper Control of Document Type Definition</a> </li>
+  <li> STIG Viewer - <a href="https://stigviewer.com/stig/application_security_and_development/2023-06-08/finding/V-222608">Application Security and
+  Development: V-222608</a> - The application must not be vulnerable to XML-oriented attacks. </li>
 </ul>
 
diff --git a/sonar-java-plugin/src/main/resources/org/sonar/l10n/java/rules/java/S6373.json b/sonar-java-plugin/src/main/resources/org/sonar/l10n/java/rules/java/S6373.json
index 62bcd906074..1574a93f442 100644
--- a/sonar-java-plugin/src/main/resources/org/sonar/l10n/java/rules/java/S6373.json
+++ b/sonar-java-plugin/src/main/resources/org/sonar/l10n/java/rules/java/S6373.json
@@ -38,6 +38,9 @@
     ],
     "ASVS 4.0": [
       "5.5.2"
+    ],
+    "STIG ASD 2023-06-08": [
+      "V-222608"
     ]
   },
   "quickfix": "infeasible"
diff --git a/sonar-java-plugin/src/main/resources/org/sonar/l10n/java/rules/java/S6376.html b/sonar-java-plugin/src/main/resources/org/sonar/l10n/java/rules/java/S6376.html
index baddb5ced18..fedac9b9425 100644
--- a/sonar-java-plugin/src/main/resources/org/sonar/l10n/java/rules/java/S6376.html
+++ b/sonar-java-plugin/src/main/resources/org/sonar/l10n/java/rules/java/S6376.html
@@ -86,5 +86,11 @@ <h3>Standards</h3>
   Entities (XXE)</a> </li>
   <li> CWE - <a href="https://cwe.mitre.org/data/definitions/776">CWE-776 - Improper Restriction of Recursive Entity References in DTDs ('XML Entity
   Expansion')</a> </li>
+  <li> STIG Viewer - <a href="https://stigviewer.com/stig/application_security_and_development/2023-06-08/finding/V-222593">Application Security and
+  Development: V-222593</a> - XML-based applications must mitigate DoS attacks by using XML filters, parser options, or gateways. </li>
+  <li> STIG Viewer - <a href="https://stigviewer.com/stig/application_security_and_development/2023-06-08/finding/V-222667">Application Security and
+  Development: V-222667</a> - Protections against DoS attacks must be implemented. </li>
+  <li> STIG Viewer - <a href="https://stigviewer.com/stig/application_security_and_development/2023-06-08/finding/V-222608">Application Security and
+  Development: V-222608</a> - The application must not be vulnerable to XML-oriented attacks. </li>
 </ul>
 
diff --git a/sonar-java-plugin/src/main/resources/org/sonar/l10n/java/rules/java/S6376.json b/sonar-java-plugin/src/main/resources/org/sonar/l10n/java/rules/java/S6376.json
index c86f34cbc9c..71c531bc225 100644
--- a/sonar-java-plugin/src/main/resources/org/sonar/l10n/java/rules/java/S6376.json
+++ b/sonar-java-plugin/src/main/resources/org/sonar/l10n/java/rules/java/S6376.json
@@ -28,6 +28,11 @@
     ],
     "OWASP Top 10 2021": [
       "A5"
+    ],
+    "STIG ASD 2023-06-08": [
+      "V-222593",
+      "V-222608",
+      "V-222667"
     ]
   },
   "quickfix": "infeasible"
diff --git a/sonar-java-plugin/src/main/resources/org/sonar/l10n/java/rules/java/S6377.html b/sonar-java-plugin/src/main/resources/org/sonar/l10n/java/rules/java/S6377.html
index b1f45a949b6..6560c6b1ddf 100644
--- a/sonar-java-plugin/src/main/resources/org/sonar/l10n/java/rules/java/S6377.html
+++ b/sonar-java-plugin/src/main/resources/org/sonar/l10n/java/rules/java/S6377.html
@@ -59,5 +59,7 @@ <h3>Standards</h3>
   <li> OWASP - <a href="https://owasp.org/www-project-top-ten/2017/A3_2017-Sensitive_Data_Exposure">Top 10 2017 Category A3 - Sensitive Data
   Exposure</a> </li>
   <li> CWE - <a href="https://cwe.mitre.org/data/definitions/347">CWE-347 - Improper Verification of Cryptographic Signature</a> </li>
+  <li> STIG Viewer - <a href="https://stigviewer.com/stig/application_security_and_development/2023-06-08/finding/V-222608">Application Security and
+  Development: V-222608</a> - The application must not be vulnerable to XML-oriented attacks. </li>
 </ul>
 
diff --git a/sonar-java-plugin/src/main/resources/org/sonar/l10n/java/rules/java/S6377.json b/sonar-java-plugin/src/main/resources/org/sonar/l10n/java/rules/java/S6377.json
index 43deb9a7af1..48e9387c884 100644
--- a/sonar-java-plugin/src/main/resources/org/sonar/l10n/java/rules/java/S6377.json
+++ b/sonar-java-plugin/src/main/resources/org/sonar/l10n/java/rules/java/S6377.json
@@ -28,6 +28,9 @@
     ],
     "OWASP Top 10 2021": [
       "A2"
+    ],
+    "STIG ASD 2023-06-08": [
+      "V-222608"
     ]
   },
   "quickfix": "infeasible"
diff --git a/sonarpedia.json b/sonarpedia.json
index 20874ae9c44..e0c57ff7849 100644
--- a/sonarpedia.json
+++ b/sonarpedia.json
@@ -3,7 +3,7 @@
   "languages": [
     "JAVA"
   ],
-  "latest-update": "2024-04-24T09:55:28.527679Z",
+  "latest-update": "2024-06-04T10:14:15.293345Z",
   "options": {
     "no-language-in-filenames": true,
     "preserve-filenames": false