diff --git a/docker-bake.hcl b/docker-bake.hcl
index 28355ada..35923c73 100644
--- a/docker-bake.hcl
+++ b/docker-bake.hcl
@@ -81,6 +81,13 @@ target "frappe-nginx" {
     tags =  tag("frappe-nginx", "${FRAPPE_VERSION}")
 }
 
+target "assets-builder" {
+  inherits = ["default-args"]
+  context = "images/nginx"
+  target = "assets_builder"
+  tags = tag("assets-builder", "${FRAPPE_VERSION}")
+}
+
 target "erpnext-nginx" {
     inherits = ["default-args"]
     context = "images/nginx"
diff --git a/images/nginx/Dockerfile b/images/nginx/Dockerfile
index 9e435503..bce933e3 100644
--- a/images/nginx/Dockerfile
+++ b/images/nginx/Dockerfile
@@ -23,11 +23,15 @@ RUN yarn --cwd apps/frappe --prod
 
 
 
-FROM frappe_prod_node_modules as frappe_assets
+FROM frappe_prod_node_modules as assets_builder
 
 # Install development node modules
 RUN yarn --cwd apps/frappe
 
+
+
+FROM assets_builder as frappe_assets
+
 # Build assets they're stored in frappe-bench/sites/assets
 RUN echo "frappe" >sites/apps.txt \
     && yarn --cwd apps/frappe run production \