diff --git a/docker-bake.hcl b/docker-bake.hcl
index 0e1f3e5994..60a67813a8 100644
--- a/docker-bake.hcl
+++ b/docker-bake.hcl
@@ -4,16 +4,26 @@ group "default" {
   ]
 }
 
+variable "LOGIN_PNPM_TAG" {
+  default = "login-pnpm:local"
+}
+
 target "login-pnpm" {
   dockerfile = "dockerfiles/login-pnpm.Dockerfile"
+  tags = ["${LOGIN_PNPM_TAG}"]
   output = ["type=docker"]
 }
 
+variable "LOGIN_DEV_BASE_TAG" {
+  default = "login-dev-base:local"
+}
+
 target "login-dev-base" {
   dockerfile = "dockerfiles/login-dev-base.Dockerfile"
   contexts = {
     login-pnpm = "target:login-pnpm"
   }
+  tags = ["${LOGIN_DEV_BASE_TAG}"]
   output = ["type=docker"]
 }