diff --git a/.gitlab-ci-asdf-versions.yml b/.gitlab-ci-asdf-versions.yml
index 185be80886350e5de9bbc95c7fee7c3abb0cba47..2be3f97bc8a3efa45ef07615382c98db5fd9a8ad 100644
--- a/.gitlab-ci-asdf-versions.yml
+++ b/.gitlab-ci-asdf-versions.yml
@@ -1,6 +1,6 @@
 # DO NOT MANUALLY EDIT; Run ./scripts/update-asdf-version-variables.sh to update this
 variables:
-    GL_ASDF_GOLANG_VERSION: "1.24.5"
+    GL_ASDF_GOLANG_VERSION: "1.25.0"
     GL_ASDF_GOLANGCI_LINT_VERSION: "1.64"
     GL_ASDF_PRE_COMMIT_VERSION: "4.1.0"
     GL_ASDF_SHELLCHECK_VERSION: "0.10"
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index e687b77b8a87b11141864278919b37efe080e26f..8b5d9e62fe90ff5f373d0a0f44dd368be7d486f7 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -44,7 +44,7 @@ variables:
       # have you reviewed
       # https://docs.gitlab.com/ee/development/go_guide/go_upgrade.html#testing-against-shipped-go-versions?
       # Generally, we should always support the latest 3 minor Go versions
-      - GO_VERSION: ["1.23", "1.24"]
+      - GO_VERSION: ["1.23", "1.24", "1.25"]
 
 .go-fips-version-matrix:
   parallel:
@@ -52,7 +52,7 @@ variables:
       # NOTE: before changing the `GO_FIPS_VERSION` matrix,
       # have you reviewed
       # https://docs.gitlab.com/ee/development/go_guide/go_upgrade.html#testing-against-shipped-go-versions?
-      - GO_FIPS_VERSION: ["1.23", "1.24"]
+      - GO_FIPS_VERSION: ["1.23", "1.24", "1.25"]
 
 backwards_compat:
   image: registry.gitlab.com/gitlab-org/gitlab-build-images/debian-bookworm-golang-1.23-rust-1.73:git-2.45
diff --git a/.tool-versions b/.tool-versions
index cc9893cc2e6cdc948f6c7753500430441aa929c6..4076bac5a982ea021dae165f44fec2d74abf8262 100644
--- a/.tool-versions
+++ b/.tool-versions
@@ -1,4 +1,4 @@
-golang 1.24.5 # datasource=docker depName=registry.gitlab.com/gitlab-com/gl-infra/common-ci-tasks-images/golang-fips
+golang 1.25.0 # datasource=docker depName=registry.gitlab.com/gitlab-com/gl-infra/common-ci-tasks-images/golang-fips
 golangci-lint 1.64 # datasource=github-releases depName=golangci/golangci-lint
 pre-commit 4.1.0 # datasource=github-releases depName=pre-commit/pre-commit
 shellcheck 0.10 # datasource=github-releases depName=koalaman/shellcheck