diff --git a/Dockerfile-velero-restore-helper.ubi b/Dockerfile-velero-restore-helper.ubi
index 6ba5c1c33d..91e178c8ab 100644
--- a/Dockerfile-velero-restore-helper.ubi
+++ b/Dockerfile-velero-restore-helper.ubi
@@ -1,4 +1,4 @@
-FROM quay.io/konveyor/builder:latest AS builder
+FROM quay.io/konveyor/builder:ubi9-v1.25.3 AS builder
 ENV GOPATH=$APP_ROOT
 COPY . $APP_ROOT/src/github.com/vmware-tanzu/velero
 WORKDIR $APP_ROOT/src/github.com/vmware-tanzu/velero
diff --git a/Dockerfile.ubi b/Dockerfile.ubi
index 2bc631638b..68dc88867f 100644
--- a/Dockerfile.ubi
+++ b/Dockerfile.ubi
@@ -1,11 +1,11 @@
-FROM quay.io/konveyor/builder:ubi9-v1.23 AS builder
+FROM quay.io/konveyor/builder:ubi9-v1.25.3 AS builder
 ENV GOPATH=$APP_ROOT
 COPY . /go/src/github.com/vmware-tanzu/velero
 WORKDIR /go/src/github.com/vmware-tanzu/velero
 RUN CGO_ENABLED=0 GOOS=linux go build -a -mod=mod -ldflags '-extldflags "-static" -X github.com/vmware-tanzu/velero/pkg/buildinfo.Version=1.12.4' -o /go/src/velero github.com/vmware-tanzu/velero/cmd/velero
 RUN CGO_ENABLED=0 GOOS=linux go build -a -mod=mod -ldflags '-extldflags "-static"' -o /go/src/velero-helper github.com/vmware-tanzu/velero/cmd/velero-helper
 
-FROM quay.io/konveyor/builder:ubi9-v1.23 AS restic-builder
+FROM quay.io/konveyor/builder:ubi9-v1.25.3 AS restic-builder
 ENV GOPATH=$APP_ROOT
 RUN mkdir -p $APP_ROOT/src/github.com/restic \
 && cd $APP_ROOT/src/github.com/restic \
diff --git a/Makefile.prow b/Makefile.prow
index 445ac9ea3e..e47c8e86c0 100644
--- a/Makefile.prow
+++ b/Makefile.prow
@@ -92,7 +92,7 @@ $(GOBIN)/golangci-lint:
 
 $(GOBIN)/setup-envtest:
 	@echo "Installing envtest tools"
-	go install sigs.k8s.io/controller-runtime/tools/setup-envtest@v0.0.0-20230216140739-c98506dc3b8e
+	go install sigs.k8s.io/controller-runtime/tools/setup-envtest@latest
 
 $(GOBIN)/protoc:
 	@echo "Installing protoc and plugins"
diff --git a/go.mod b/go.mod
index d8c890203f..3f9e6874a2 100644
--- a/go.mod
+++ b/go.mod
@@ -1,8 +1,6 @@
 module github.com/vmware-tanzu/velero
 
-go 1.23.0
-
-toolchain go1.23.6
+go 1.25.3
 
 require (
 	cloud.google.com/go/storage v1.30.1