diff --git a/bake/hcl.go b/bake/hcl.go
index e24110ae..6ba868ec 100644
--- a/bake/hcl.go
+++ b/bake/hcl.go
@@ -7,6 +7,7 @@ import (
 	"strconv"
 	"strings"
 
+	"github.com/docker/buildx/util/userfunc"
 	"github.com/hashicorp/go-cty-funcs/cidr"
 	"github.com/hashicorp/go-cty-funcs/crypto"
 	"github.com/hashicorp/go-cty-funcs/encoding"
@@ -14,7 +15,6 @@ import (
 	hcl "github.com/hashicorp/hcl/v2"
 	"github.com/hashicorp/hcl/v2/ext/tryfunc"
 	"github.com/hashicorp/hcl/v2/ext/typeexpr"
-	"github.com/hashicorp/hcl/v2/ext/userfunc"
 	"github.com/hashicorp/hcl/v2/gohcl"
 	"github.com/hashicorp/hcl/v2/hclsyntax"
 	hcljson "github.com/hashicorp/hcl/v2/json"
diff --git a/vendor/github.com/hashicorp/hcl/v2/ext/userfunc/README.md b/util/userfunc/README.md
similarity index 100%
rename from vendor/github.com/hashicorp/hcl/v2/ext/userfunc/README.md
rename to util/userfunc/README.md
diff --git a/vendor/github.com/hashicorp/hcl/v2/ext/userfunc/decode.go b/util/userfunc/decode.go
similarity index 100%
rename from vendor/github.com/hashicorp/hcl/v2/ext/userfunc/decode.go
rename to util/userfunc/decode.go
diff --git a/vendor/github.com/hashicorp/hcl/v2/ext/userfunc/doc.go b/util/userfunc/doc.go
similarity index 100%
rename from vendor/github.com/hashicorp/hcl/v2/ext/userfunc/doc.go
rename to util/userfunc/doc.go
diff --git a/vendor/github.com/hashicorp/hcl/v2/ext/userfunc/public.go b/util/userfunc/public.go
similarity index 100%
rename from vendor/github.com/hashicorp/hcl/v2/ext/userfunc/public.go
rename to util/userfunc/public.go
diff --git a/vendor/modules.txt b/vendor/modules.txt
index f4270338..3a255994 100644
--- a/vendor/modules.txt
+++ b/vendor/modules.txt
@@ -227,7 +227,6 @@ github.com/hashicorp/hcl/v2
 github.com/hashicorp/hcl/v2/ext/customdecode
 github.com/hashicorp/hcl/v2/ext/tryfunc
 github.com/hashicorp/hcl/v2/ext/typeexpr
-github.com/hashicorp/hcl/v2/ext/userfunc
 github.com/hashicorp/hcl/v2/gohcl
 github.com/hashicorp/hcl/v2/hclsyntax
 github.com/hashicorp/hcl/v2/hclwrite