diff --git a/docker-compose.openbao.yml b/docker-compose.openbao.yml
index 5a56a00..d07e9dc 100644
--- a/docker-compose.openbao.yml
+++ b/docker-compose.openbao.yml
@@ -15,7 +15,8 @@ services:
   # ======================
   openbao:
     image: git.mosaicstack.dev/mosaic/stack-openbao:${IMAGE_TAG:-dev}
-    command: server -config=/openbao/config/config.hcl
+    entrypoint: ["dumb-init", "--"]
+    command: ["bao", "server", "-config=/openbao/config/config.hcl"]
     environment:
       OPENBAO_ADDR: http://0.0.0.0:8200
     volumes:
diff --git a/docker-compose.portainer.yml b/docker-compose.portainer.yml
index fc40242..54430b4 100644
--- a/docker-compose.portainer.yml
+++ b/docker-compose.portainer.yml
@@ -27,7 +27,8 @@ services:
   openbao:
     image: git.mosaicstack.dev/mosaic/stack-openbao:${IMAGE_TAG:-dev}
     container_name: mosaic-openbao
-    command: server -config=/openbao/config/config.hcl
+    entrypoint: ["dumb-init", "--"]
+    command: ["bao", "server", "-config=/openbao/config/config.hcl"]
     environment:
       OPENBAO_ADDR: http://0.0.0.0:8200
     ports:
diff --git a/docker-compose.swarm.yml b/docker-compose.swarm.yml
index 398e05a..69efcbf 100644
--- a/docker-compose.swarm.yml
+++ b/docker-compose.swarm.yml
@@ -84,7 +84,8 @@ services:
   # ======================
   openbao:
     image: git.mosaicstack.dev/mosaic/stack-openbao:${IMAGE_TAG:-latest}
-    command: server -config=/openbao/config/config.hcl
+    entrypoint: ["dumb-init", "--"]
+    command: ["bao", "server", "-config=/openbao/config/config.hcl"]
     env_file: .env
     environment:
       OPENBAO_ADDR: http://0.0.0.0:8200
diff --git a/docker-compose.yml b/docker-compose.yml
index 036f6f6..e88da0a 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -269,6 +269,7 @@ services:
     environment:
       VAULT_ADDR: http://0.0.0.0:8200
       SKIP_SETCAP: "true"
+    entrypoint: ["dumb-init", "--"]
     command: ["bao", "server", "-config=/openbao/config/config.hcl"]
     cap_add:
       - IPC_LOCK
diff --git a/docker/docker-compose.build.yml b/docker/docker-compose.build.yml
index 9f60045..9a647a4 100644
--- a/docker/docker-compose.build.yml
+++ b/docker/docker-compose.build.yml
@@ -273,6 +273,7 @@ services:
     environment:
       VAULT_ADDR: http://0.0.0.0:8200
       SKIP_SETCAP: "true"
+    entrypoint: ["dumb-init", "--"]
     command: ["bao", "server", "-config=/openbao/config/config.hcl"]
     cap_add:
       - IPC_LOCK
diff --git a/docker/docker-compose.yml b/docker/docker-compose.yml
index c1fe544..465ecc1 100644
--- a/docker/docker-compose.yml
+++ b/docker/docker-compose.yml
@@ -82,8 +82,8 @@ services:
     environment:
       VAULT_ADDR: http://0.0.0.0:8200
       SKIP_SETCAP: "true"
-    entrypoint: ["/bin/sh", "-c"]
-    command: ["bao server -config=/openbao/config/config.hcl"]
+    entrypoint: ["dumb-init", "--"]
+    command: ["bao", "server", "-config=/openbao/config/config.hcl"]
     cap_add:
       - IPC_LOCK
     healthcheck: