diff --git a/srcpkgs/docker-buildx/patches/fix-tests.patch b/srcpkgs/docker-buildx/patches/fix-tests.patch
new file mode 100644
index 00000000000..333efdecb5d
--- /dev/null
+++ b/srcpkgs/docker-buildx/patches/fix-tests.patch
@@ -0,0 +1,27 @@
+Disable integration tests that fail in CI.
+Use git version for sanity check (tests expect to be running form git repo, not a tarball).
+diff --git i/tests/integration_test.go w/tests/integration_test.go
+index 9cd76c..2811de 100644
+--- i/tests/integration_test.go
++++ w/tests/integration_test.go
+@@ -20,6 +20,7 @@ func init() {
+ }
+ 
+ func TestIntegration(t *testing.T) {
++	t.Skip()
+ 	var tests []func(t *testing.T, sb integration.Sandbox)
+ 	tests = append(tests, commonTests...)
+ 	tests = append(tests, buildTests...)
+diff --git i/util/gitutil/gitutil_test.go w/util/gitutil/gitutil_test.go
+index 06c6fa..0b8cf9 100644
+--- i/util/gitutil/gitutil_test.go
++++ w/util/gitutil/gitutil_test.go
+@@ -10,7 +10,7 @@ func TestGit(t *testing.T) {
+ 	c, err := New()
+ 	require.NoError(t, err)
+ 
+-	out, err := c.run("status")
++	out, err := c.run("version")
+ 	require.NoError(t, err)
+ 	require.NotEmpty(t, out)
+ 
diff --git a/srcpkgs/docker-buildx/template b/srcpkgs/docker-buildx/template
index 22ae8c6dd4e..90933ea2281 100644
--- a/srcpkgs/docker-buildx/template
+++ b/srcpkgs/docker-buildx/template
@@ -1,18 +1,19 @@
 # Template file for 'docker-buildx'
 pkgname=docker-buildx
-version=0.17.0
+version=0.18.0
 revision=1
 build_style=go
 go_import_path="github.com/docker/buildx"
 go_package="./cmd/buildx"
 go_ldflags="-X github.com/docker/buildx/version.Version=v${version}"
 depends="docker-cli"
+checkdepends="git"
 short_desc="Docker CLI plugin for extended build capabilities with BuildKit"
 maintainer="Daniel Lewan <daniel@teddydd.me>"
 license="Apache-2.0"
 homepage="https://docs.docker.com/buildx/working-with-buildx/"
 distfiles="https://github.com/docker/buildx/archive/refs/tags/v${version}.tar.gz"
-checksum=f846f36dc93d78e9b1c94b716279a04f1d6f58ef5d445c6615ec8e5e3a7b5efa
+checksum=a935cb2715a5054d918d40ef07cdd4a6465b20a755d466248718ab59fd41c334
 
 post_install() {
 	vmkdir usr/libexec/docker/cli-plugins