diff --git a/docker-bake.hcl b/docker-bake.hcl
index 6e6098ca14..f75c14ebed 100644
--- a/docker-bake.hcl
+++ b/docker-bake.hcl
@@ -16,6 +16,7 @@ group "default" {
     "flow-worker",
     "flow-api",
     "flow-snapshot-worker",
+    "flow-maintenance",
     "peerdb-ui"
   ]
 }
@@ -65,6 +66,20 @@ target "flow-worker" {
   ]
 }
 
+target "flow-maintenance" {
+  context    = "."
+  dockerfile = "stacks/flow.Dockerfile"
+  target     = "flow-maintenance"
+  platforms = [
+    "linux/amd64",
+    "linux/arm64",
+  ]
+  tags = [
+    "${REGISTRY}/flow-maintenance:${TAG}",
+    "${REGISTRY}/flow-maintenance:${SHA_SHORT}",
+  ]
+}
+
 target "peerdb" {
   context    = "."
   dockerfile = "stacks/peerdb-server.Dockerfile"
diff --git a/stacks/flow.Dockerfile b/stacks/flow.Dockerfile
index de9dbb0d5e..80f3f56d04 100644
--- a/stacks/flow.Dockerfile
+++ b/stacks/flow.Dockerfile
@@ -56,3 +56,10 @@ ENTRYPOINT [\
   "./peer-flow",\
   "snapshot-worker"\
   ]
+
+
+FROM flow-base AS flow-maintenance
+ENTRYPOINT [\
+  "./peer-flow",\
+  "maintenance"\
+  ]