diff --git a/CHANGES.txt b/CHANGES.txt
index 50f6f851e8..01e0260626 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -1,4 +1,5 @@
 5.0.5
+ * Full Java 17 support (CASSANDRA-20681)
  * Ensure replica filtering protection does not trigger unnecessary short read protection reads (CASSANDRA-20639)
  * Unified Compaction does not properly validate min and target sizes (CASSANDRA-20398)
  * Avoid lambda usage in TrieMemoryIndex range queries and ensure queue size tracking is per column (CASSANDRA-20668)
diff --git a/NEWS.txt b/NEWS.txt
index efbc8d7ac8..c6db55636e 100644
--- a/NEWS.txt
+++ b/NEWS.txt
@@ -65,6 +65,13 @@ restore snapshots created with the previous major version using the
 'sstableloader' tool. You can upgrade the file format of your snapshots
 using the provided 'sstableupgrade' tool.
 
+5.0.5
+=====
+
+New features
+------------
+    - Full support for Java 17, it is not experimental anymore.
+
 5.0.4
 =====
 
diff --git a/doc/modules/cassandra/pages/reference/java17.adoc b/doc/modules/cassandra/pages/reference/java17.adoc
index 1ec3aab36e..645711a668 100644
--- a/doc/modules/cassandra/pages/reference/java17.adoc
+++ b/doc/modules/cassandra/pages/reference/java17.adoc
@@ -8,7 +8,7 @@ the vertical axis and the run version is along the horizontal axis.
 [width="68%",cols="34%,30%,36%",]
 |===
 | | Java 11 (Run) | Java 17 (Run)
-| Java 11 (Build) | Supported | Experimental Support
+| Java 11 (Build) | Supported | Supported
 | Java 17(Build) | Not Supported | Experimental in CI
 |===