diff --git a/.github/workflows/pr_build.yaml b/.github/workflows/pr_build.yaml
index df590422a3..c7f8b0a854 100644
--- a/.github/workflows/pr_build.yaml
+++ b/.github/workflows/pr_build.yaml
@@ -3,7 +3,7 @@ on:
   pull_request: {}
   workflow_dispatch: {}
 env:
-  GO_VERSION: 1.21.9
+  GO_VERSION: 1.21.10
 permissions:
   contents: read
 
diff --git a/.github/workflows/release_build.yaml b/.github/workflows/release_build.yaml
index 1100d2cf4f..4082201cbf 100644
--- a/.github/workflows/release_build.yaml
+++ b/.github/workflows/release_build.yaml
@@ -4,7 +4,7 @@ on:
     tags:
       - 'v[0-9].[0-9]+.[0-9]+'
 env:
-  GO_VERSION: 1.21.9
+  GO_VERSION: 1.21.10
 jobs:
   cache-deps:
     name: cache-deps (linux)
diff --git a/.go-version b/.go-version
index f124bfa155..ae7bbdf047 100644
--- a/.go-version
+++ b/.go-version
@@ -1 +1 @@
-1.21.9
+1.21.10
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 237a3c061f..32d19209c8 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,11 @@
 # Changelog
 
+## [1.9.5] - 2024-05-07
+
+### Security
+
+- Updated to Go 1.21.10 to address CVE-2024-24788
+
 ## [1.9.4] - 2023-04-05
 
 ### Security
@@ -65,6 +71,12 @@
 
 - X509-SVIDs issued by the server no longer have the x509UniqueIdentifier attribute as part of the subject (#4862)
 
+## [1.8.11] - 2024-05-07
+
+### Security
+
+- Updated to Go 1.21.10 to address CVE-2024-24788
+
 ## [1.8.10] - 2023-04-05
 
 ### Security
diff --git a/pkg/common/version/version.go b/pkg/common/version/version.go
index 5ce27045c5..39e4cb3ca1 100644
--- a/pkg/common/version/version.go
+++ b/pkg/common/version/version.go
@@ -8,7 +8,7 @@ const (
 	// IMPORTANT: When updating, make sure to reconcile the versions list that
 	// is part of the upgrade integration test. See
 	// test/integration/suites/upgrade/README.md for details.
-	Base = "1.9.4"
+	Base = "1.9.5"
 )
 
 var (
diff --git a/pkg/server/datastore/sqlstore/migration.go b/pkg/server/datastore/sqlstore/migration.go
index 403544e8dc..03af16eb02 100644
--- a/pkg/server/datastore/sqlstore/migration.go
+++ b/pkg/server/datastore/sqlstore/migration.go
@@ -220,6 +220,8 @@ import (
 // | v1.8.9  |        |                                                                           |
 // |---------|        |                                                                           |
 // | v1.8.10 |        |                                                                           |
+// |---------|        |                                                                           |
+// | v1.8.11 |        |                                                                           |
 // |*********|********|***************************************************************************|
 // | v1.9.0  |        |                                                                           |
 // |---------|        |                                                                           |
@@ -230,6 +232,8 @@ import (
 // | v1.9.3  |        |                                                                           |
 // |---------|        |                                                                           |
 // | v1.9.4  |        |                                                                           |
+// |---------|        |                                                                           |
+// | v1.9.5  |        |                                                                           |
 // ================================================================================================
 
 const (
diff --git a/test/integration/suites/upgrade/versions.txt b/test/integration/suites/upgrade/versions.txt
index 04a2a2c3d7..e657c89a2e 100644
--- a/test/integration/suites/upgrade/versions.txt
+++ b/test/integration/suites/upgrade/versions.txt
@@ -9,7 +9,9 @@
 1.8.8
 1.8.9
 1.8.10
+1.8.11
 1.9.0
 1.9.1
 1.9.2
 1.9.3
+1.9.4