diff --git a/.github/workflows/CD.yml b/.github/workflows/CD.yml
index 99ab9a5c..8f5568ba 100644
--- a/.github/workflows/CD.yml
+++ b/.github/workflows/CD.yml
@@ -57,7 +57,7 @@ jobs:
     strategy:
       matrix:
         os: [ubuntu-24.04, macos-14]
-        golang-version: ['1.20', '1.21']
+        golang-version: ['1.21']
     steps:
       - name: Set up Golang ${{ matrix.golang-version }}
         uses: actions/setup-go@v5
diff --git a/.github/workflows/CI.yml b/.github/workflows/CI.yml
index b55a28af..365bbcc1 100644
--- a/.github/workflows/CI.yml
+++ b/.github/workflows/CI.yml
@@ -48,6 +48,8 @@ jobs:
               - '.clang-format'
               - '.bazelrc'
               - '.bazelversion'
+              - 'MODULE.bazel'
+              - 'MODULE.bazel.lock'
               - 'WORKSPACE'
             go:
               - 'private_set_intersection/go/**'
@@ -62,6 +64,8 @@ jobs:
               - '.eslint*'
               - '.bazelrc'
               - '.bazelversion'
+              - 'MODULE.bazel'
+              - 'MODULE.bazel.lock'
               - 'WORKSPACE'
             python:
               - 'private_set_intersection/python/**'
@@ -69,12 +73,16 @@ jobs:
               - '.pyproject.toml'
               - '.bazelrc'
               - '.bazelversion'
+              - 'MODULE.bazel'
+              - 'MODULE.bazel.lock'
               - 'WORKSPACE'
             rust:
               - 'private_set_intersection/rust/**'
               - 'third_party/**'
               - '.bazelrc'
               - '.bazelversion'
+              - 'MODULE.bazel'
+              - 'MODULE.bazel.lock'
               - 'WORKSPACE'
   Core:
     needs: changes
diff --git a/README.md b/README.md
index c344a7a0..3cb90afd 100644
--- a/README.md
+++ b/README.md
@@ -130,39 +130,26 @@ git_repository(
    branch = "master",
 )
 
-load("@org_openmined_psi//private_set_intersection:preload.bzl", "psi_preload")
-
-psi_preload()
-
-load("@org_openmined_psi//private_set_intersection:deps.bzl", "psi_deps")
-
-psi_deps()
-
-load("@rules_python//python:pip.bzl", "pip_parse")
+load("@bazel_tools//tools/build_defs/repo:git.bzl", "git_repository")
 
-pip_parse(
-    name = "pip_deps",
-    # Generated via pip-compile requirements.in
-    requirements_lock = "@org_openmined_psi//private_set_intersection/python:requirements.txt",
+git_repository(
+    name = "emsdk",
+    remote = "https://github.com/emscripten-core/emsdk.git",
+    strip_prefix = "bazel",
+    tag = "3.1.67",
 )
 
-load("@pip_deps//:requirements.bzl", "install_deps")
+load("@emsdk//:deps.bzl", emsdk_deps = "deps")
 
-install_deps()
+emsdk_deps()
 
-load("@build_bazel_rules_nodejs//:index.bzl", "node_repositories", "npm_install")
+load("@emsdk//:emscripten_deps.bzl", emsdk_emscripten_deps = "emscripten_deps")
 
-node_repositories()
+emsdk_emscripten_deps(emscripten_version = "3.1.67")
 
-npm_install(
-    name = "npm",
-    package_json = "//:package.json",
-    package_lock_json = "//:package-lock.json",
-)
-
-load("@emsdk//:emscripten_deps.bzl", emsdk_emscripten_deps = "emscripten_deps")
+load("@emsdk//:toolchains.bzl", "register_emscripten_toolchains")
 
-emsdk_emscripten_deps()
+register_emscripten_toolchains()
 ```
 
 A full description of the protocol can be found in the documentation of the
diff --git a/private_set_intersection/rust/README.md b/private_set_intersection/rust/README.md
index 60fd5c5d..296510af 100644
--- a/private_set_intersection/rust/README.md
+++ b/private_set_intersection/rust/README.md
@@ -26,7 +26,7 @@ bazel test //private_set_intersection/rust/...
 Run the benchmark:
 
 ```
-bazel run -c opt //private_set_intersection/rust:bench --experimental_isolated_extension_usages
+bazel run -c opt //private_set_intersection/rust:bench
 ```
 
 ## Developing