diff --git a/build/bench/Dockerfile b/build/bench/Dockerfile
index 3947e488..b7427441 100644
--- a/build/bench/Dockerfile
+++ b/build/bench/Dockerfile
@@ -1,4 +1,4 @@
-FROM debian:bullseye-slim as build
+FROM debian:bullseye-slim as bench
 
 LABEL author=frappé
 
@@ -122,7 +122,7 @@ RUN wget -qO- https://raw.githubusercontent.com/nvm-sh/nvm/v0.39.0/install.sh |
 
 EXPOSE 8000-8005 9000-9005 6787
 
-FROM build as test
+FROM bench as bench-test
 
 # Print version and verify bashrc is properly sourced so that everything works
 # in the interactive shell and Dockerfile
diff --git a/docker-bake.hcl b/docker-bake.hcl
index 15203cdb..64744ed4 100644
--- a/docker-bake.hcl
+++ b/docker-bake.hcl
@@ -16,14 +16,14 @@ variable "ERPNEXT_VERSION" {
 # Bench image
 
 target "bench" {
+    context = "build/bench"
+    target = "bench"
     tags = ["frappe/bench:latest"]
-    dockerfile = "build/bench/Dockerfile"
-    target = "build"
 }
 
 target "bench-test" {
     inherits = ["bench"]
-    target = "test"
+    target = "bench-test"
 }
 
 # Main images