diff --git a/package.json b/package.json
index 5a5714cb65..2bb093ef90 100644
--- a/package.json
+++ b/package.json
@@ -10,7 +10,8 @@
     "start:web": "pnpm --prefix apps/web run start",
     "rm-node-modules": "find . -name 'node_modules' -type d -prune -exec rm -rf '{}' +",
     "pnpm-install-hack": "cd packages/js-sdk && sed -i '' 's/\"version\": \".*\"/\"version\": \"9.9.9\"/g' package.json && cd ../.. && pnpm i && git checkout -- packages/js-sdk/package.json",
-    "generate-sdk-reference": "pnpm --if-present --recursive run generate-sdk-reference"
+    "generate-sdk-reference": "pnpm --if-present --recursive run generate-sdk-reference",
+    "generate-api": "pnpm --if-present --recursive run generate-api"
   },
   "packageManager": "pnpm@9.15.5",
   "dependencies": {
diff --git a/packages/js-sdk/package.json b/packages/js-sdk/package.json
index e4e7d4f842..5e52a5f23d 100644
--- a/packages/js-sdk/package.json
+++ b/packages/js-sdk/package.json
@@ -28,9 +28,10 @@
     "dev": "tsup --watch",
     "example": "tsx example.mts",
     "test": "vitest run",
-    "generate": "python ./../../spec/remove_extra_tags.py sandboxes templates && openapi-typescript ../../spec/openapi_generated.yml -x api_key --array-length --alphabetize --output src/api/schema.gen.ts",
+    "generate-api": "pnpm generate-envd-api && pnpm generate-api-api",
     "generate-envd-api": "openapi-typescript ../../spec/envd/envd.yaml -x api_key --array-length --alphabetize --output src/envd/schema.gen.ts",
-    "generate-ref": "./scripts/generate_sdk_ref.sh",
+    "generate-api-api": "openapi-typescript ../../spec/openapi.yml -x api_key --array-length --alphabetize --output src/api/schema.gen.ts",
+    "generate-sdk-reference": "./scripts/generate_sdk_ref.sh",
     "check-deps": "knip",
     "update-deps": "ncu -u && pnpm i",
     "postPublish": "./scripts/post-publish.sh || true",
diff --git a/packages/python-sdk/Makefile b/packages/python-sdk/Makefile
index c1b169c534..0087266165 100644
--- a/packages/python-sdk/Makefile
+++ b/packages/python-sdk/Makefile
@@ -1,9 +1,11 @@
 generate-api:
-	python ./../../spec/remove_extra_tags.py sandboxes
-	openapi-python-client generate --output-path e2b/api/api --overwrite --path ../../spec/openapi_generated.yml
-	rm -rf e2b/api/client
-	mv e2b/api/api/e2b_api_client e2b/api/client
-	rm -rf e2b/api/api
-
-init:
-	pip install openapi-python-client
+	docker run --rm \
+	  -v "$(realpath ../../spec):/spec" \
+	  -v "$(realpath e2b/api):/e2b/api" \
+	  python:3.11-slim bash -c "\
+	    pip install pyyaml openapi-python-client && \
+	    python /spec/remove_extra_tags.py sandboxes && \
+	    openapi-python-client generate --output-path /e2b/api/api --overwrite --path /spec/openapi.yml && \
+	    rm -rf /e2b/api/client && \
+	    mv /e2b/api/api/e2b_api_client /e2b/api/client && \
+	    rm -rf /e2b/api/api"
diff --git a/packages/python-sdk/package.json b/packages/python-sdk/package.json
index b0b2031716..69ea7ea791 100644
--- a/packages/python-sdk/package.json
+++ b/packages/python-sdk/package.json
@@ -8,6 +8,7 @@
     "postVersion": "poetry version $(pnpm pkg get version --workspaces=false | tr -d \\\")",
     "postPublish": "poetry build && poetry config pypi-token.pypi ${PYPI_TOKEN} && poetry publish --skip-existing",
     "pretest": "poetry install",
-    "generate-ref": "poetry install && ./scripts/generate_sdk_ref.sh"
+    "generate-api": "make generate-api",
+    "generate-sdk-reference": "poetry install && ./scripts/generate_sdk_ref.sh"
   }
 }