diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 45837c1954d..5f4095c671f 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -780,8 +780,7 @@ jobs:
         with:
           concurrency_key: docs-preview-x86
       - name: "Docs Preview"
-        if: github.event.number
-        timeout-minutes: 40
+        timeout-minutes: 60
         run: |
           earthly-ci --no-output \
           ./docs/+deploy-preview --ENV=staging --PR=${{ github.event.number }} \
diff --git a/.github/workflows/publish-docs.yml b/.github/workflows/publish-docs.yml
index b1cca0a9b8f..c6583ec45de 100644
--- a/.github/workflows/publish-docs.yml
+++ b/.github/workflows/publish-docs.yml
@@ -29,7 +29,7 @@ jobs:
         with:
           concurrency_key: docs-preview-${{ inputs.username || github.actor }}-x86
 
-      - timeout-minutes: 25
+      - timeout-minutes: 60 # in case of full build
         run: |
           earthly-ci --no-output ./docs/+deploy-prod \
           --NETLIFY_AUTH_TOKEN=${{ secrets.NETLIFY_AUTH_TOKEN }} \
diff --git a/docs/Earthfile b/docs/Earthfile
index de42389b1ed..17986c9ff00 100644
--- a/docs/Earthfile
+++ b/docs/Earthfile
@@ -37,14 +37,14 @@ serve:
 
 
 deploy-preview:
-  BUILD ../yarn-project/+scripts-preview
+  BUILD ../yarn-project/+scripts-prod
   ARG ENV
   ARG NETLIFY_AUTH_TOKEN
   ARG NETLIFY_SITE_ID
   ARG AZTEC_BOT_COMMENTER_GITHUB_TOKEN
   ARG PR
   FROM +serve
-  COPY --dir ../yarn-project/+scripts-preview/usr/src/yarn-project /usr/src
+  COPY --dir ../yarn-project/+scripts-prod/usr/src/yarn-project /usr/src
   COPY ./netlify.toml .
   COPY ./deploy_preview.sh .
   RUN NETLIFY_AUTH_TOKEN=$NETLIFY_AUTH_TOKEN NETLIFY_SITE_ID=$NETLIFY_SITE_ID ./deploy_preview.sh $PR $AZTEC_BOT_COMMENTER_GITHUB_TOKEN
diff --git a/docs/deploy_preview.sh b/docs/deploy_preview.sh
index 3f6ea1785d6..74091495fd0 100755
--- a/docs/deploy_preview.sh
+++ b/docs/deploy_preview.sh
@@ -26,4 +26,4 @@ DOCS_PREVIEW_URL=$(echo "$DEPLOY_OUTPUT" | grep -E "https://.*aztec-docs-dev.net
 echo "Unique deploy URL: $DOCS_PREVIEW_URL"
 
 cd ../yarn-project/scripts
-AZTEC_BOT_COMMENTER_GITHUB_TOKEN=$AZTEC_BOT_COMMENTER_GITHUB_TOKEN PR_NUMBER=$PR_NUMBER DOCS_PREVIEW_URL=$DOCS_PREVIEW_URL yarn docs-preview-comment
+AZTEC_BOT_COMMENTER_GITHUB_TOKEN=$AZTEC_BOT_COMMENTER_GITHUB_TOKEN PR_NUMBER=$PR_NUMBER DOCS_PREVIEW_URL=$DOCS_PREVIEW_URL yarn docs-preview-comment 
diff --git a/yarn-project/Earthfile b/yarn-project/Earthfile
index 469083c22cf..0333fbcec5a 100644
--- a/yarn-project/Earthfile
+++ b/yarn-project/Earthfile
@@ -37,6 +37,7 @@ build:
     BUILD ../noir/+nargo
     BUILD --pass-args ../noir-projects/+build
     BUILD ../l1-contracts/+build
+    BUILD ../barretenberg/ts/+build
     BUILD ../noir/+packages
     FROM +deps
 
@@ -52,6 +53,7 @@ build:
     RUN ./bootstrap.sh full
     RUN cd ivc-integration && chmod +x run_browser_tests.sh && npx playwright install && npx playwright install-deps
 
+
 build-dev:
     FROM +build
     SAVE ARTIFACT /usr/src /usr/src
@@ -241,13 +243,8 @@ end-to-end:
     WORKDIR /usr/src/yarn-project/end-to-end
     ENTRYPOINT ["yarn", "test"]
 
-scripts-preview:
-    FROM +build
-    RUN yarn workspaces focus @aztec/scripts --production && yarn cache clean
-    SAVE ARTIFACT /usr/src /usr/src
-
 scripts-prod:
-    FROM +deps
+    FROM +build
     RUN yarn workspaces focus @aztec/scripts --production && yarn cache clean
     SAVE ARTIFACT /usr/src /usr/src