diff --git a/.github/workflows/cd-release-pgo.yaml b/.github/workflows/cd-release-pgo.yaml
index 0f60372deb..9fb0b5d7aa 100644
--- a/.github/workflows/cd-release-pgo.yaml
+++ b/.github/workflows/cd-release-pgo.yaml
@@ -85,9 +85,9 @@ jobs:
         run: |
           latest=$(git rev-parse HEAD)
           echo "commitish=$latest" >> $GITHUB_OUTPUT
-          GO_BUILD_VERSION=1.24.6 go/utils/publishrelease/buildpgobinaries.sh
+          GO_BUILD_VERSION=1.25 go/utils/publishrelease/buildpgobinaries.sh
         env:
-          GO_BUILD_VERSION: "1.24.6"
+          GO_BUILD_VERSION: "1.25"
           PROFILE: ${{ format('{0}/dolt-cpu-profile.pprof', github.workspace) }}
       - name: Create Release
         id: create_release
diff --git a/docker/serverDockerfile b/docker/serverDockerfile
index 36feff249a..d7475d1a04 100644
--- a/docker/serverDockerfile
+++ b/docker/serverDockerfile
@@ -9,7 +9,7 @@ RUN apt-get update -y && \
 
 
 # We use bookworm since the icu dependency ver. between the base and golang images is the same
-FROM golang:1.24-bookworm AS build-from-source
+FROM golang:1.25-bookworm AS build-from-source
 ENV DEBIAN_FRONTEND=noninteractive
 ARG DOLT_VERSION
 
diff --git a/go/cmd/dolt/commands/archive.go b/go/cmd/dolt/commands/archive.go
index 50e482db0d..038bf511a7 100644
--- a/go/cmd/dolt/commands/archive.go
+++ b/go/cmd/dolt/commands/archive.go
@@ -162,8 +162,8 @@ func (cmd ArchiveCmd) Exec(ctx context.Context, commandStr string, args []string
 }
 
 func handleProgress(ctx context.Context, wg *sync.WaitGroup, progress chan interface{}) {
+	wg.Add(1)
 	go func() {
-		wg.Add(1)
 		defer wg.Done()
 
 		rotation := 0
diff --git a/go/go.mod b/go/go.mod
index 9a4c56ab2b..441aa4a346 100644
--- a/go/go.mod
+++ b/go/go.mod
@@ -13,7 +13,7 @@ require (
 	github.com/dolthub/fslock v0.0.3
 	github.com/dolthub/ishell v0.0.0-20240701202509-2b217167d718
 	github.com/dolthub/sqllogictest/go v0.0.0-20201107003712-816f3ae12d81
-	github.com/dolthub/vitess v0.0.0-20250915221346-753c44800850
+	github.com/dolthub/vitess v0.0.0-20250918181259-ed0e1c5cb192
 	github.com/dustin/go-humanize v1.0.1
 	github.com/fatih/color v1.13.0
 	github.com/flynn-archive/go-shlex v0.0.0-20150515145356-3f9db97f8568
@@ -61,7 +61,7 @@ require (
 	github.com/dolthub/dolt-mcp v0.2.2-0.20250917171427-13e4520d1c36
 	github.com/dolthub/eventsapi_schema v0.0.0-20250915094920-eadfd39051ca
 	github.com/dolthub/flatbuffers/v23 v23.3.3-dh.2
-	github.com/dolthub/go-mysql-server v0.20.1-0.20250917194252-e24900c62d2f
+	github.com/dolthub/go-mysql-server v0.20.1-0.20250918184337-1e27be84307a
 	github.com/dolthub/gozstd v0.0.0-20240423170813-23a2903bca63
 	github.com/edsrzf/mmap-go v1.2.0
 	github.com/esote/minmaxheap v1.0.0
@@ -199,4 +199,4 @@ require (
 	gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7 // indirect
 )
 
-go 1.24.6
+go 1.25
diff --git a/go/go.sum b/go/go.sum
index 857a9efff7..9a24b1f795 100644
--- a/go/go.sum
+++ b/go/go.sum
@@ -213,8 +213,8 @@ github.com/dolthub/fslock v0.0.3 h1:iLMpUIvJKMKm92+N1fmHVdxJP5NdyDK5bK7z7Ba2s2U=
 github.com/dolthub/fslock v0.0.3/go.mod h1:QWql+P17oAAMLnL4HGB5tiovtDuAjdDTPbuqx7bYfa0=
 github.com/dolthub/go-icu-regex v0.0.0-20250916051405-78a38d478790 h1:zxMsH7RLiG+dlZ/y0LgJHTV26XoiSJcuWq+em6t6VVc=
 github.com/dolthub/go-icu-regex v0.0.0-20250916051405-78a38d478790/go.mod h1:F3cnm+vMRK1HaU6+rNqQrOCyR03HHhR1GWG2gnPOqaE=
-github.com/dolthub/go-mysql-server v0.20.1-0.20250917194252-e24900c62d2f h1:EkS55IYLgQ/WJCacL32AS3ot5oDDjLh+rEROOAUTn20=
-github.com/dolthub/go-mysql-server v0.20.1-0.20250917194252-e24900c62d2f/go.mod h1:fkgI5RU7ABC5gknW+5Q6LUMv12Y2zlkXuDQX7n7su88=
+github.com/dolthub/go-mysql-server v0.20.1-0.20250918184337-1e27be84307a h1:/BpSv3PbnHv2HrJc8rHktE9Z2mIvYuCV/hykfX8B+JM=
+github.com/dolthub/go-mysql-server v0.20.1-0.20250918184337-1e27be84307a/go.mod h1:vYpsrVFnvdhCn3bD7Jsy7lcZsknq9HrqfNpi/DZOg18=
 github.com/dolthub/gozstd v0.0.0-20240423170813-23a2903bca63 h1:OAsXLAPL4du6tfbBgK0xXHZkOlos63RdKYS3Sgw/dfI=
 github.com/dolthub/gozstd v0.0.0-20240423170813-23a2903bca63/go.mod h1:lV7lUeuDhH5thVGDCKXbatwKy2KW80L4rMT46n+Y2/Q=
 github.com/dolthub/ishell v0.0.0-20240701202509-2b217167d718 h1:lT7hE5k+0nkBdj/1UOSFwjWpNxf+LCApbRHgnCA17XE=
@@ -223,8 +223,8 @@ github.com/dolthub/jsonpath v0.0.2-0.20240227200619-19675ab05c71 h1:bMGS25NWAGTE
 github.com/dolthub/jsonpath v0.0.2-0.20240227200619-19675ab05c71/go.mod h1:2/2zjLQ/JOOSbbSboojeg+cAwcRV0fDLzIiWch/lhqI=
 github.com/dolthub/sqllogictest/go v0.0.0-20201107003712-816f3ae12d81 h1:7/v8q9XGFa6q5Ap4Z/OhNkAMBaK5YeuEzwJt+NZdhiE=
 github.com/dolthub/sqllogictest/go v0.0.0-20201107003712-816f3ae12d81/go.mod h1:siLfyv2c92W1eN/R4QqG/+RjjX5W2+gCTRjZxBjI3TY=
-github.com/dolthub/vitess v0.0.0-20250915221346-753c44800850 h1:QXkIRTquxaGUgKVHnKZxU+ikARdszUUDU6C9B/76+a0=
-github.com/dolthub/vitess v0.0.0-20250915221346-753c44800850/go.mod h1:tV3BrIVyDWVkkYy8dKt2o6hjJ89cHb5opY5FpCyhncQ=
+github.com/dolthub/vitess v0.0.0-20250918181259-ed0e1c5cb192 h1:s7Ghoy+x+C/spSjM5/w9MoMIIeXNcBY/fI2oHxWajLM=
+github.com/dolthub/vitess v0.0.0-20250918181259-ed0e1c5cb192/go.mod h1:8pvvk5OLaLN9LLxghyczUapn/97l+mBgIb10qC1LG84=
 github.com/dustin/go-humanize v1.0.1 h1:GzkhY7T5VNhEkwH0PVJgjz+fX1rhBrR7pRT3mDkpeCY=
 github.com/dustin/go-humanize v1.0.1/go.mod h1:Mu1zIs6XwVuF/gI1OepvI0qD18qycQx+mFykh5fBlto=
 github.com/edsrzf/mmap-go v1.2.0 h1:hXLYlkbaPzt1SaQk+anYwKSRNhufIDCchSPkUD6dD84=
diff --git a/go/utils/batsee/main.go b/go/utils/batsee/main.go
index 07789d334e..57f22c9bf0 100644
--- a/go/utils/batsee/main.go
+++ b/go/utils/batsee/main.go
@@ -199,8 +199,8 @@ func main() {
 
 	var wg sync.WaitGroup
 	for i := 0; i < config.threads; i++ {
+		wg.Add(1)
 		go func() {
-			wg.Add(1)
 			defer wg.Done()
 			worker(jobs, results, ctx, config)
 		}()
diff --git a/integration-tests/DataDumpLoadDockerfile b/integration-tests/DataDumpLoadDockerfile
index 19ccf3b204..a93a344cd2 100644
--- a/integration-tests/DataDumpLoadDockerfile
+++ b/integration-tests/DataDumpLoadDockerfile
@@ -21,7 +21,7 @@ RUN apt update -y && \
 
 # install go
 WORKDIR /root
-ENV GO_VERSION=1.24.6
+ENV GO_VERSION=1.25.0
 ENV GOPATH=$HOME/go
 ENV PATH=$PATH:$GOPATH/bin
 ENV PATH=$PATH:$GOPATH/bin:/usr/local/go/bin
diff --git a/integration-tests/MySQLDockerfile b/integration-tests/MySQLDockerfile
index 969caa504b..7f57cf3c16 100644
--- a/integration-tests/MySQLDockerfile
+++ b/integration-tests/MySQLDockerfile
@@ -59,7 +59,7 @@ RUN apt update -y && \
 
 # install go
 WORKDIR /root
-ENV GO_VERSION=1.24.6
+ENV GO_VERSION=1.25.0
 ENV GOPATH=$HOME/go
 ENV PATH=$PATH:$GOPATH/bin
 ENV PATH=$PATH:$GOPATH/bin:/usr/local/go/bin
diff --git a/integration-tests/ORMDockerfile b/integration-tests/ORMDockerfile
index d9227fdd32..4a0e966e87 100644
--- a/integration-tests/ORMDockerfile
+++ b/integration-tests/ORMDockerfile
@@ -25,7 +25,7 @@ RUN apt update -y && \
 
 # install go
 WORKDIR /root
-ENV GO_VERSION=1.24.6
+ENV GO_VERSION=1.25.0
 ENV GOPATH=/go
 ENV PATH=$PATH:$GOPATH/bin
 ENV PATH=$PATH:$GOPATH/bin:/usr/local/go/bin
diff --git a/integration-tests/go-sql-server-driver/go.mod b/integration-tests/go-sql-server-driver/go.mod
index 70f75ff4db..8a0d4dc208 100644
--- a/integration-tests/go-sql-server-driver/go.mod
+++ b/integration-tests/go-sql-server-driver/go.mod
@@ -1,6 +1,6 @@
 module github.com/dolthub/dolt/integration-tests/go-sql-server-driver
 
-go 1.24.6
+go 1.25
 
 require (
 	github.com/dolthub/dolt/go v0.40.4