diff --git a/CHANGELOG.md b/CHANGELOG.md
index 4a31021e..6e334722 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,7 @@
+# 1.8.17 (23 July 2025)
+- [#1337](https://github.com/wiremock/WireMock.Net/pull/1337) - Make CSharpCodeMatcher public [bug] contributed by [StefH](https://github.com/StefH)
+- [#1336](https://github.com/wiremock/WireMock.Net/issues/1336) - Is CSharpCodeMatcher actually usable? [bug]
+
 # 1.8.16 (19 July 2025)
 - [#1332](https://github.com/wiremock/WireMock.Net/pull/1332) - Use correct Handlebars.Net.Helpers.Xslt (2.5.2) [bug] contributed by [StefH](https://github.com/StefH)
 - [#1328](https://github.com/wiremock/WireMock.Net/issues/1328) - ReflectionTypeLoadException occurs when running multiple unit tests (Nunit 3) [bug]
diff --git a/Directory.Build.props b/Directory.Build.props
index a030351c..7c270510 100644
--- a/Directory.Build.props
+++ b/Directory.Build.props
@@ -4,7 +4,7 @@
     </PropertyGroup>
 
     <PropertyGroup>
-        <VersionPrefix>1.8.16</VersionPrefix>
+        <VersionPrefix>1.8.17</VersionPrefix>
         <PackageIcon>WireMock.Net-Logo.png</PackageIcon>
         <PackageProjectUrl>https://github.com/wiremock/WireMock.Net</PackageProjectUrl>
         <PackageLicenseExpression>Apache-2.0</PackageLicenseExpression>
diff --git a/Generate-ReleaseNotes.cmd b/Generate-ReleaseNotes.cmd
index 0fe59ff4..1610d4bc 100644
--- a/Generate-ReleaseNotes.cmd
+++ b/Generate-ReleaseNotes.cmd
@@ -1,6 +1,6 @@
 rem https://github.com/StefH/GitHubReleaseNotes
 
-SET version=1.8.16
+SET version=1.8.17
 
 GitHubReleaseNotes --output CHANGELOG.md --skip-empty-releases --exclude-labels wontfix test question invalid doc duplicate example environment --version %version% --token %GH_TOKEN%
 
diff --git a/PackageReleaseNotes.txt b/PackageReleaseNotes.txt
index 16390a7f..5b7e2ff3 100644
--- a/PackageReleaseNotes.txt
+++ b/PackageReleaseNotes.txt
@@ -1,5 +1,5 @@
-# 1.8.16 (19 July 2025)
-- #1332 Use correct Handlebars.Net.Helpers.Xslt (2.5.2) [bug]
-- #1328 ReflectionTypeLoadException occurs when running multiple unit tests (Nunit 3) [bug]
+# 1.8.17 (23 July 2025)
+- #1337 Make CSharpCodeMatcher public [bug]
+- #1336 Is CSharpCodeMatcher actually usable? [bug]
 
 The full release notes can be found here: https://github.com/wiremock/WireMock.Net/blob/master/CHANGELOG.md
\ No newline at end of file