diff --git a/docker-bake.hcl b/docker-bake.hcl
index 08e087708..fa95f9ff9 100644
--- a/docker-bake.hcl
+++ b/docker-bake.hcl
@@ -43,7 +43,8 @@ group "all" {
     "retriever",
     "churner",
     "dataapi",
-    "traffic-generator"
+    "traffic-generator",
+    "controller"
   ]
 }
 
@@ -65,7 +66,8 @@ group "ci-release" {
     "encoder",
     "retriever",
     "churner",
-    "dataapi"
+    "dataapi",
+    "controller"
   ]
 }
 
@@ -79,7 +81,8 @@ group "internal-release" {
     "retriever-internal",
     "churner-internal",
     "dataapi-internal",
-    "traffic-generator-internal"
+    "traffic-generator-internal",
+    "controller-internal"
   ]
 }
 
@@ -227,6 +230,21 @@ target "dataapi-internal" {
   ]
 }
 
+target "controller" {
+  context    = "."
+  dockerfile = "./Dockerfile"
+  tags       = ["${REGISTRY}/${REPO}/controller:${BUILD_TAG}"]
+}
+
+target "controller-internal" {
+  inherits = ["controller"]
+  tags     = [
+    "${REGISTRY}/eigenda-controller:${BUILD_TAG}",
+    "${REGISTRY}/eigenda-controller:${GIT_SHA}",
+    "${REGISTRY}/eigenda-controller:sha-${GIT_SHORT_SHA}"
+  ]
+}
+
 # NODE TARGETS
 target "node" {
   context    = "."