diff --git a/go.mod b/go.mod
index 93d2c7cd9d..14c145f256 100644
--- a/go.mod
+++ b/go.mod
@@ -55,7 +55,7 @@ require (
 	github.com/miekg/dns v1.1.66
 	github.com/mistifyio/go-zfs/v3 v3.0.1
 	github.com/mitchellh/copystructure v1.2.0
-	github.com/moby/buildkit v0.24.0-rc2 // FIXME(crazy-max): remove override from hack/buildkit-ref when updating.
+	github.com/moby/buildkit v0.24.0
 	github.com/moby/docker-image-spec v1.3.1
 	github.com/moby/go-archive v0.1.0
 	github.com/moby/ipvs v1.1.0
diff --git a/go.sum b/go.sum
index ae9e2ff2dc..2b5ca37f6b 100644
--- a/go.sum
+++ b/go.sum
@@ -396,8 +396,8 @@ github.com/mitchellh/mapstructure v0.0.0-20170523030023-d0303fe80992/go.mod h1:F
 github.com/mitchellh/reflectwalk v1.0.2 h1:G2LzWKi524PWgd3mLHV8Y5k7s6XUvT0Gef6zxSIeXaQ=
 github.com/mitchellh/reflectwalk v1.0.2/go.mod h1:mSTlrgnPZtwu0c4WaC2kGObEpuNDbx0jmZXqmk4esnw=
 github.com/mndrix/tap-go v0.0.0-20171203230836-629fa407e90b/go.mod h1:pzzDgJWZ34fGzaAZGFW22KVZDfyrYW+QABMrWnJBnSs=
-github.com/moby/buildkit v0.24.0-rc2 h1:1Z9+R162yauf3SYvn8cGjBPnglMDK4bO+00dNlJSgZI=
-github.com/moby/buildkit v0.24.0-rc2/go.mod h1:4qovICAdR2H4C7+EGMRva5zgHW1gyhT4/flHI7F5F9k=
+github.com/moby/buildkit v0.24.0 h1:qYfTl7W1SIJzWDIDCcPT8FboHIZCYfi++wvySi3eyFE=
+github.com/moby/buildkit v0.24.0/go.mod h1:4qovICAdR2H4C7+EGMRva5zgHW1gyhT4/flHI7F5F9k=
 github.com/moby/docker-image-spec v1.3.1 h1:jMKff3w6PgbfSa69GfNg+zN/XLhfXJGnEx3Nl2EsFP0=
 github.com/moby/docker-image-spec v1.3.1/go.mod h1:eKmb5VW8vQEh/BAr2yvVNvuiJuY6UIocYsFu/DxxRpo=
 github.com/moby/go-archive v0.1.0 h1:Kk/5rdW/g+H8NHdJW2gsXyZ7UnzvJNOy6VKJqueWdcQ=
diff --git a/hack/buildkit-ref b/hack/buildkit-ref
index 053fe7f848..8e6577f7b0 100755
--- a/hack/buildkit-ref
+++ b/hack/buildkit-ref
@@ -19,9 +19,6 @@ if [[ "${buildkit_ref}" == *-*-* ]]; then
 	buildkit_ref=$(curl -s "https://api.github.com/repos/${buildkit_repo}/commits/${buildkit_ref}" | jq -r .sha)
 fi
 
-# FIXME(crazy-max) temporarily overriding version to use for tests; remove with the next release of buildkit; see https://github.com/moby/buildkit/pull/6179
-buildkit_ref=a59c3fe07d1b25fd6563d3955d66c6d15264c49f
-
 cat << EOF
 BUILDKIT_REPO=$buildkit_repo
 BUILDKIT_REF=$buildkit_ref
diff --git a/vendor/github.com/moby/buildkit/frontend/dockerfile/builder/caps.go b/vendor/github.com/moby/buildkit/frontend/dockerfile/builder/caps.go
index 3c78cd56c4..bb8b100c0b 100644
--- a/vendor/github.com/moby/buildkit/frontend/dockerfile/builder/caps.go
+++ b/vendor/github.com/moby/buildkit/frontend/dockerfile/builder/caps.go
@@ -10,9 +10,10 @@ import (
 )
 
 var enabledCaps = map[string]struct{}{
-	"moby.buildkit.frontend.inputs":      {},
-	"moby.buildkit.frontend.subrequests": {},
-	"moby.buildkit.frontend.contexts":    {},
+	"moby.buildkit.frontend.inputs":         {},
+	"moby.buildkit.frontend.subrequests":    {},
+	"moby.buildkit.frontend.contexts":       {},
+	"moby.buildkit.frontend.gitquerystring": {},
 }
 
 func validateCaps(req string) (forward bool, err error) {
diff --git a/vendor/modules.txt b/vendor/modules.txt
index 1c602054ea..0c22d2d2d3 100644
--- a/vendor/modules.txt
+++ b/vendor/modules.txt
@@ -753,7 +753,7 @@ github.com/mitchellh/hashstructure/v2
 # github.com/mitchellh/reflectwalk v1.0.2
 ## explicit
 github.com/mitchellh/reflectwalk
-# github.com/moby/buildkit v0.24.0-rc2
+# github.com/moby/buildkit v0.24.0
 ## explicit; go 1.23.0
 github.com/moby/buildkit/api/services/control
 github.com/moby/buildkit/api/types