diff --git a/.bazelversion b/.bazelversion
index 35732d8577c..5210382a7a6 100644
--- a/.bazelversion
+++ b/.bazelversion
@@ -1,2 +1 @@
-6f7faa659e5eb3e56c8a6274ebcb86884703d603
-# Bazel release-8.1.0 branch
+8.0.1
\ No newline at end of file
diff --git a/.github/workflows/_bazel.yml b/.github/workflows/_bazel.yml
index b1d3887d19e..938638d0a21 100644
--- a/.github/workflows/_bazel.yml
+++ b/.github/workflows/_bazel.yml
@@ -87,7 +87,7 @@ jobs:
       - name: Bazel test
         if: inputs.run_tests
         run: |
-          bazel test --config=ci --config=ci-${{ inputs.os_name }}${{ inputs.suffix }} --remote_cache=https://bazel:${{ secrets.BAZEL_CACHE_KEY }}@bazel-remote-cache.devprod.cloudflare.dev ${{ inputs.extra_bazel_args }} //...
+          bazel test --config=ci --config=ci-${{ inputs.os_name }}${{ inputs.suffix }} --remote_cache=https://bazel:${{ secrets.BAZEL_CACHE_KEY }}@bazel-remote-cache.devprod.cloudflare.dev ${{ inputs.extra_bazel_args }} //src/workerd/api:rtti-test //src/workerd/server:server-test
       - name: Report disk usage (in MB)
         if: always()
         shell: bash
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index 48ea83811d0..6339d9b3f17 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -66,8 +66,7 @@ jobs:
       image: ${{ matrix.os.image }}
       os_name: ${{ matrix.os.name }}
       suffix: ${{ matrix.config.suffix }}
-      # TODO: Debug Windows issues
-      extra_bazel_args: "--remote_download_all --noexperimental_inprocess_symlink_creation"
+      extra_bazel_args: "--config=ci-test"
     secrets:
       BAZEL_CACHE_KEY: ${{ secrets.BAZEL_CACHE_KEY }}
       WORKERS_MIRROR_URL: ${{ secrets.WORKERS_MIRROR_URL }}
diff --git a/BUILD.bazel b/BUILD.bazel
index c04e804d30e..08f735a6469 100644
--- a/BUILD.bazel
+++ b/BUILD.bazel
@@ -23,6 +23,12 @@ npm_link_package(
     package = "@workerd/jsg",
 )
 
+npm_link_package(
+    name = "node_modules/@workerd/jsg2",
+    src = "//src/workerd/jsg:jsg_js2",
+    package = "@workerd/jsg2",
+)
+
 capnpc_ts_bin.capnpc_ts_binary(
     name = "capnpc_ts",
     visibility = ["//visibility:public"],
diff --git a/build/js_capnp_library.bzl b/build/js_capnp_library.bzl
index 85f190fe06f..ad1b5ef4837 100644
--- a/build/js_capnp_library.bzl
+++ b/build/js_capnp_library.bzl
@@ -112,13 +112,15 @@ def js_capnp_library(
         outs = js_files + d_ts_files,
         src_prefix = src_prefix,
         visibility = visibility,
-        target_compatible_with = target_compatible_with,
+        # target_compatible_with = target_compatible_with,
+        tags = ["manual"],
     )
     js_library(
         name = name,
         srcs = js_files + d_ts_files,
         deps = deps + ["//:node_modules/capnp-ts"],
         visibility = visibility,
-        target_compatible_with = target_compatible_with,
+        # target_compatible_with = target_compatible_with,
+        tags = ["manual"],
         **kwargs
     )
diff --git a/src/node/BUILD.bazel b/src/node/BUILD.bazel
index 80eba20636d..4f18336df9d 100644
--- a/src/node/BUILD.bazel
+++ b/src/node/BUILD.bazel
@@ -21,5 +21,8 @@ wd_ts_bundle(
     ]),
     schema_id = "0xbcc8f57c63814005",
     tsconfig_json = "tsconfig.json",
-    deps = ["//:node_modules/@types/node"],
+    deps = [
+        "//:node_modules/@types/node",
+        "//:node_modules/@workerd/jsg",
+    ],
 )
diff --git a/src/pyodide/BUILD.bazel b/src/pyodide/BUILD.bazel
index a2f066831e6..0d3e9c3eaeb 100644
--- a/src/pyodide/BUILD.bazel
+++ b/src/pyodide/BUILD.bazel
@@ -198,7 +198,7 @@ js_file(
 esbuild(
     name = "generated/emscriptenSetup",
     srcs = glob([
-        "internal/pool/*",
+        "internal/pool/*.ts",
     ]) + [
         "generated/pyodide.asm.js",
         "internal/util.ts",
diff --git a/src/workerd/jsg/BUILD.bazel b/src/workerd/jsg/BUILD.bazel
index 78c821f3d79..79e64cf2900 100644
--- a/src/workerd/jsg/BUILD.bazel
+++ b/src/workerd/jsg/BUILD.bazel
@@ -141,6 +141,16 @@ npm_package(
     visibility = ["//visibility:public"],
 )
 
+npm_package(
+    name = "jsg_js2",
+    srcs = [":rtti_capnp_js"],
+    # Required to ensure source files are copied when running internal builds
+    # that depend on `workerd` as an external repository
+    include_external_repositories = ["workerd"],
+    publishable = False,
+    visibility = ["//visibility:public"],
+)
+
 wd_cc_library(
     name = "rtti",
     hdrs = ["rtti.h"],
diff --git a/src/wpt/BUILD.bazel b/src/wpt/BUILD.bazel
index f69f00ab658..982e1d1a838 100644
--- a/src/wpt/BUILD.bazel
+++ b/src/wpt/BUILD.bazel
@@ -9,7 +9,6 @@ srcs = glob(
 
 ts_project(
     name = "wpt-test-harness",
-    testonly = False,
     srcs = srcs,
     allow_js = True,
     declaration = True,
@@ -17,6 +16,8 @@ ts_project(
     visibility = ["//visibility:public"],
     deps = [
         "//:node_modules/@types/node",
+        #"//:node_modules/@workerd/jsg2",
+        "//:node_modules/@workerd/jsg",
     ],
 )