diff --git a/.github/dependabot.yml b/.github/dependabot.yml
index 70b20e02..ea0aa4d6 100644
--- a/.github/dependabot.yml
+++ b/.github/dependabot.yml
@@ -11,31 +11,21 @@ updates:
       interval: daily
 
   - package-ecosystem: docker
-    directory: build/erpnext-nginx
+    directory: build/nginx
     schedule:
       interval: daily
 
   - package-ecosystem: docker
-    directory: build/erpnext-worker
+    directory: build/worker
     schedule:
       interval: daily
 
   - package-ecosystem: docker
-    directory: build/frappe-nginx
-    schedule:
-      interval: daily
-
-  - package-ecosystem: docker
-    directory: build/frappe-socketio
-    schedule:
-      interval: daily
-
-  - package-ecosystem: docker
-    directory: build/frappe-worker
+    directory: build/socketio
     schedule:
       interval: daily
 
   - package-ecosystem: npm
-    directory: build/frappe-socketio
+    directory: build/socketio
     schedule:
       interval: daily
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index fd2f83ea..02962aa8 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -7,9 +7,9 @@ on:
   #   branches:
   #     - main
   #   paths:
-  #     - build/frappe-nginx/**
+  #     - build/nginx/**
   #     - build/frappe-socketio/**
-  #     - build/frappe-worker/**
+  #     - build/worker/**
   #     - overrides/**
   #     - tests/**
   #     - compose.yml
@@ -20,9 +20,9 @@ on:
   #   branches:
   #     - main
   #   paths:
-  #     - build/frappe-nginx/**
+  #     - build/nginx/**
   #     - build/frappe-socketio/**
-  #     - build/frappe-worker/**
+  #     - build/worker/**
   #     - overrides/**
   #     - tests/**
   #     - compose.yml
diff --git a/build/frappe-nginx/Dockerfile b/build/nginx/Dockerfile
similarity index 100%
rename from build/frappe-nginx/Dockerfile
rename to build/nginx/Dockerfile
diff --git a/build/frappe-nginx/nginx-template.conf b/build/nginx/nginx-template.conf
similarity index 100%
rename from build/frappe-nginx/nginx-template.conf
rename to build/nginx/nginx-template.conf
diff --git a/build/frappe-socketio/Dockerfile b/build/socketio/Dockerfile
similarity index 100%
rename from build/frappe-socketio/Dockerfile
rename to build/socketio/Dockerfile
diff --git a/build/frappe-socketio/package.json b/build/socketio/package.json
similarity index 100%
rename from build/frappe-socketio/package.json
rename to build/socketio/package.json
diff --git a/build/frappe-worker/Dockerfile b/build/worker/Dockerfile
similarity index 100%
rename from build/frappe-worker/Dockerfile
rename to build/worker/Dockerfile
diff --git a/build/frappe-worker/entrypoint.sh b/build/worker/entrypoint.sh
similarity index 100%
rename from build/frappe-worker/entrypoint.sh
rename to build/worker/entrypoint.sh
diff --git a/build/frappe-worker/healthcheck.sh b/build/worker/healthcheck.sh
similarity index 100%
rename from build/frappe-worker/healthcheck.sh
rename to build/worker/healthcheck.sh
diff --git a/build/frappe-worker/patched_bench_helper.py b/build/worker/patched_bench_helper.py
similarity index 100%
rename from build/frappe-worker/patched_bench_helper.py
rename to build/worker/patched_bench_helper.py
diff --git a/build/frappe-worker/pretend-bench.sh b/build/worker/pretend-bench.sh
similarity index 100%
rename from build/frappe-worker/pretend-bench.sh
rename to build/worker/pretend-bench.sh
diff --git a/docker-bake.hcl b/docker-bake.hcl
index b7b29753..15203cdb 100644
--- a/docker-bake.hcl
+++ b/docker-bake.hcl
@@ -58,34 +58,34 @@ target "default-args" {
 
 target "frappe-worker" {
     inherits = ["default-args"]
-    context = "build/frappe-worker"
+    context = "build/worker"
     target = "frappe"
     tags = tag("frappe-worker", "${FRAPPE_VERSION}")
 }
 
 target "erpnext-worker" {
     inherits = ["default-args"]
-    context = "build/frappe-worker"
+    context = "build/worker"
     target = "erpnext"
     tags =  tag("erpnext-worker", "${ERPNEXT_VERSION}")
 }
 
 target "frappe-nginx" {
     inherits = ["default-args"]
-    context = "build/frappe-nginx"
+    context = "build/nginx"
     target = "frappe"
     tags =  tag("frappe-nginx", "${FRAPPE_VERSION}")
 }
 
 target "erpnext-nginx" {
     inherits = ["default-args"]
-    context = "build/frappe-nginx"
+    context = "build/nginx"
     target = "erpnext"
     tags =  tag("erpnext-nginx", "${ERPNEXT_VERSION}")
 }
 
 target "frappe-socketio" {
     inherits = ["default-args"]
-    context = "build/frappe-socketio"
+    context = "build/socketio"
     tags =  tag("frappe-socketio", "${FRAPPE_VERSION}")
 }