diff --git a/typescript-client/build.jsr.sh b/typescript-client/build.jsr.sh
index a3ee691b60..a268e97162 100755
--- a/typescript-client/build.jsr.sh
+++ b/typescript-client/build.jsr.sh
@@ -4,8 +4,15 @@ script_dirpath="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
 
 rm -rf "${script_dirpath}/dist"
 
-npx --yes @hey-api/openapi-ts  --input "${script_dirpath}/../backend/windmill-api/openapi.yaml" --output "${script_dirpath}/dist" --useOptions --schemas false
+npx --yes @hey-api/openapi-ts  --input "${script_dirpath}/../backend/windmill-api/openapi.yaml" --output "${script_dirpath}/src" --useOptions --schemas false
 
 # Add explicit type as it's missing in the client source code. This will be unnecessary in newer openapi-ts versions
-sed -i 's/get \[Symbol\.toStringTag\]() {/get \[Symbol\.toStringTag\]() : string {/g' "${script_dirpath}/dist/core/CancelablePromise.ts"
+sed -i 's/get \[Symbol\.toStringTag\]() {/get \[Symbol\.toStringTag\]() : string {/g' "${script_dirpath}/src/core/CancelablePromise.ts"
+
+cp "${script_dirpath}/client.ts" "${script_dirpath}/src/"
+cp "${script_dirpath}/s3Types.ts" "${script_dirpath}/src/"
+echo "" >> "${script_dirpath}/src/index.ts"
+echo 'export type { S3Object, DenoS3LightClientSettings } from "./s3Types";' >> "${script_dirpath}/src/index.ts"
+echo "" >> "${script_dirpath}/src/index.ts"
+echo 'export { type Base64, setClient, getVariable, setVariable, getResource, setResource, getResumeUrls, setState, getState, getIdToken, denoS3LightClientSettings, loadS3FileStream, loadS3File, writeS3File, task, runScript, runScriptAsync, waitJob, getRootJobId, setFlowUserState, getFlowUserState } from "./client";' >> "${script_dirpath}/src/index.ts"
 
diff --git a/typescript-client/jsr.json b/typescript-client/jsr.json
index f6f5aa27fd..edcbfe1019 100644
--- a/typescript-client/jsr.json
+++ b/typescript-client/jsr.json
@@ -1,8 +1,8 @@
 {
   "name": "@windmill-labs/windmill",
   "version": "1.317.1",
-  "exports": "./dist/index.ts",
+  "exports": "./src/index.ts",
   "publish": {
-    "exclude": ["!dist"]
+    "exclude": ["!src", "./s3Types.ts", "./client.ts"]
   }
 }
diff --git a/typescript-client/publish.jsr.sh b/typescript-client/publish.jsr.sh
index 2f4aabc2d8..24a8e8e0bd 100755
--- a/typescript-client/publish.jsr.sh
+++ b/typescript-client/publish.jsr.sh
@@ -1,6 +1,7 @@
 #!/bin/bash
 set -eou pipefail
 script_dirpath="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
+${script_dirpath}/build.jsr.sh
 
 args=${1:-}