diff --git a/.github/workflows/acceptance-tests.yml b/.github/workflows/acceptance-tests.yml
index e781cad..9d3f9fb 100644
--- a/.github/workflows/acceptance-tests.yml
+++ b/.github/workflows/acceptance-tests.yml
@@ -61,10 +61,19 @@ jobs:
           echo $BAO_VERSION
           echo "version=$BAO_VERSION" >> "$GITHUB_OUTPUT"
       - name: Run Vault Dev server
+        if: ${{ matrix.cli == 'bao' }}
         run: |
-          docker run --cap-add=IPC_LOCK -e 'VAULT_LOCAL_CONFIG={"storage": {"file": {"path": "/vault/file"}}}' -d --name=dev-vault -p 8200:8200 hashicorp/vault server
+          docker run --cap-add=IPC_LOCK -e 'VAULT_DEV_ROOT_TOKEN_ID=root' -d --rm --name=dev-vault -p 8200:8200 hashicorp/vault
           export VAULT_SERVER_IP=$(docker inspect -f '{{range.NetworkSettings.Networks}}{{.Gateway}}{{end}}' dev-vault)
           echo "VAULT_ADDR=http://$VAULT_SERVER_IP:8200" >> "$GITHUB_ENV"
+          echo "VAULT_TOKEN=root" >> "$GITHUB_ENV"
+      - name: Run Bao Dev server
+        if: ${{ matrix.cli == 'bao' }}
+        run: |
+          docker run --cap-add=IPC_LOCK -d --rm --name=dev-bao -p 8200:8200 quay.io/openbao/openbao server -dev -dev-root-token-id="root"
+          export VAULT_SERVER_IP=$(docker inspect -f '{{range.NetworkSettings.Networks}}{{.Gateway}}{{end}}' dev-bao)
+          echo "VAULT_ADDR=http://$VAULT_SERVER_IP:8200" >> "$GITHUB_ENV"
+          echo "VAULT_TOKEN=root" >> "$GITHUB_ENV"
       - name: Create Artifactory data directories and copy data
         env:
           ARTIFACTORY_LICENSE: ${{ secrets.ARTIFACTORY_LICENSE }}