diff --git a/.github/workflows/release.yaml b/.github/workflows/release.yaml
index df8db391..94ce75a7 100644
--- a/.github/workflows/release.yaml
+++ b/.github/workflows/release.yaml
@@ -28,7 +28,7 @@ jobs:
       - name: Set up Go
         uses: actions/setup-go@v5
         with:
-          go-version: '>=1.23.4'
+          go-version: '>=1.23.5'
 
       # This step usually is not needed because the /ui/dist is pregenerated locally
       # but its here to ensure that each release embeds the latest admin ui artifacts.
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 59beed20..702bd43b 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,6 +1,8 @@
 ## v0.24.4
 
-- Fixed fields extraction for view query with milti-level comments ([#6309](https://github.com/pocketbase/pocketbase/discussions/6309)).
+- Fixed fields extraction for view query with nested comments ([#6309](https://github.com/pocketbase/pocketbase/discussions/6309)).
+
+- Bumped GitHub action min Go version to 1.23.5 as it comes with some [minor security fixes](https://github.com/golang/go/issues?q=milestone%3AGo1.23.5).
 
 
 ## v0.24.3
diff --git a/CHANGELOG_16_22.md b/CHANGELOG_16_22.md
index f907a506..387be75c 100644
--- a/CHANGELOG_16_22.md
+++ b/CHANGELOG_16_22.md
@@ -4,7 +4,9 @@
 
 ## v0.22.30
 
-- (_Backported from v0.24.4_) Fixed fields extraction for view query with milti-level comments ([#6309](https://github.com/pocketbase/pocketbase/discussions/6309)).
+- (_Backported from v0.24.4_) Fixed fields extraction for view queries with nested comments ([#6309](https://github.com/pocketbase/pocketbase/discussions/6309)).
+
+- Bumped GitHub action min Go version to 1.23.5 as it comes with some [minor security fixes](https://github.com/golang/go/issues?q=milestone%3AGo1.23.5).
 
 
 ## v0.22.29