diff --git a/generate.sh b/generate.sh
index 751ab0b2..7ff974df 100755
--- a/generate.sh
+++ b/generate.sh
@@ -17,10 +17,10 @@ fi
 set -ex
 
 # cd in API repo, generate new spec and then generate code from it
-( cd $SOURCE_PATH ; make openapi ; ./build/chat-manager openapi generate-client --language python --spec ./releases/v2/serverside-api.yaml --output ../stream-py/getstream/ )
+( cd $SOURCE_PATH ; make openapi ; make -C tools/openapi build ; ./build/openapi generate-client --language python --spec ./releases/v2/serverside-api.yaml --output ../stream-py/getstream/ )
 
 # Regenerate webhook conformance fixtures (CHA-2961)
-( cd $SOURCE_PATH ; ./build/chat-manager openapi generate-webhook-fixtures --output ../stream-py/tests/assets/webhooks --time-format=unix-ns )
+( cd $SOURCE_PATH ; ./build/openapi generate-webhook-fixtures --output ../stream-py/tests/assets/webhooks --time-format=unix-ns )
 
 # lint + auto-fix, then format generated code with ruff (align with pre-commit)
 uv run ruff check --fix getstream/ tests/