diff --git a/apps/login/docker-bake.hcl b/apps/login/docker-bake.hcl
index f68bc80093..e09d1176e0 100644
--- a/apps/login/docker-bake.hcl
+++ b/apps/login/docker-bake.hcl
@@ -1,3 +1,11 @@
+variable "LOGIN_TAG" {
+  default = "zitadel-login:local"
+}
+
+group "default" {
+  targets = ["login-standalone"]
+}
+
 # The release target is overwritten in docker-bake-release.hcl
 # It makes sure the image is built for multiple platforms.
 # By default the platforms property is empty, so images are only built for the current bake runtime platform.
diff --git a/docker-bake.hcl b/docker-bake.hcl
index 81d863cd4f..533a07b479 100644
--- a/docker-bake.hcl
+++ b/docker-bake.hcl
@@ -1,7 +1,6 @@
-# login-standalone can extend the login-standalone target in apps/login/docker-bake.hcl
+# login-standalone should be extended by the login-standalone target in apps/login/docker-bake.hcl
 target "login-standalone" {
-  context = .
-  dockerfile = dockerfiles/login.Dockerfile
+  dockerfile = "dockerfiles/login.Dockerfile"
 }
 
 target "login-standalone-out" {
@@ -11,3 +10,4 @@ target "login-standalone-out" {
     "type=local,dest=.artifacts/login"
   ]
 }
+ 
\ No newline at end of file