diff --git a/.github/actions/prepare/action.yml b/.github/actions/prepare/action.yml
index 8aa27bc85c10..77d2aa6039d0 100644
--- a/.github/actions/prepare/action.yml
+++ b/.github/actions/prepare/action.yml
@@ -3,7 +3,8 @@ runs:
   steps:
     - uses: actions/setup-node@master
       with:
-        node-version: 14.x
+        node-version: 16.x
+        check-latest: true
 
     #region Build the standard bundle
     - uses: actions/cache@v2
diff --git a/.github/workflows/e2e-docusaurus-workflow.yml b/.github/workflows/e2e-docusaurus-workflow.yml
index 7318526c1820..91458917810d 100644
--- a/.github/workflows/e2e-docusaurus-workflow.yml
+++ b/.github/workflows/e2e-docusaurus-workflow.yml
@@ -24,20 +24,12 @@ jobs:
     - name: 'Running the integration test'
       run: |
         source scripts/e2e-setup-ci.sh
-
-        # TODO: Remove once https://github.com/yarnpkg/berry/blob/bd146ccddf95aae9c99c0c48d86b1d8997f1dccf/scripts/e2e-setup-ci.sh#L31-L38 is fixed
-        YARN_PNP_ENABLE_ESM_LOADER=true
-
         yarn dlx create-docusaurus@latest my-website classic && cd my-website
         yarn build
 
     - name: 'Running the TypeScript integration test'
       run: |
         source scripts/e2e-setup-ci.sh
-
-        # TODO: Remove once https://github.com/yarnpkg/berry/blob/bd146ccddf95aae9c99c0c48d86b1d8997f1dccf/scripts/e2e-setup-ci.sh#L31-L38 is fixed
-        YARN_PNP_ENABLE_ESM_LOADER=true
-
         yarn dlx create-docusaurus@latest my-website-ts classic --typescript && cd my-website-ts
         yarn build
       if: |
diff --git a/.github/workflows/e2e-pnp-angular-workflow.yml b/.github/workflows/e2e-pnp-angular-workflow.yml
index 4b9953f67502..7f0b59b99c53 100644
--- a/.github/workflows/e2e-pnp-angular-workflow.yml
+++ b/.github/workflows/e2e-pnp-angular-workflow.yml
@@ -25,9 +25,6 @@ jobs:
       run: |
         source scripts/e2e-setup-ci.sh
 
-        # TODO: Remove once https://github.com/yarnpkg/berry/blob/bd146ccddf95aae9c99c0c48d86b1d8997f1dccf/scripts/e2e-setup-ci.sh#L31-L38 is fixed
-        YARN_PNP_ENABLE_ESM_LOADER=true
-
         # TODO: Angular should be fixed to detect the correct package manager to install with
         # but for now we need to specify it
         yarn dlx -p @angular/cli@next ng new berry-angular --interactive=false --package-manager yarn
diff --git a/.github/workflows/e2e-svelte-kit-workflow.yml b/.github/workflows/e2e-svelte-kit-workflow.yml
index c8cfe5d44fc8..eff24e09df1d 100644
--- a/.github/workflows/e2e-svelte-kit-workflow.yml
+++ b/.github/workflows/e2e-svelte-kit-workflow.yml
@@ -24,10 +24,6 @@ jobs:
     - name: 'Running the integration test'
       run: |
         source scripts/e2e-setup-ci.sh
-
-        # TODO: Remove once https://github.com/yarnpkg/berry/blob/bd146ccddf95aae9c99c0c48d86b1d8997f1dccf/scripts/e2e-setup-ci.sh#L31-L38 is fixed
-        YARN_PNP_ENABLE_ESM_LOADER=true
-
         yes | yarn create svelte@next my-app && cd my-app
         yarn
         yarn build
diff --git a/scripts/e2e-setup-ci.sh b/scripts/e2e-setup-ci.sh
index 2741ba749730..f32e4d39c1f7 100644
--- a/scripts/e2e-setup-ci.sh
+++ b/scripts/e2e-setup-ci.sh
@@ -28,15 +28,6 @@ export YARN_ENABLE_IMMUTABLE_INSTALLS=0
 # We want to make sure the projects work in a monorepo
 export YARN_PNP_FALLBACK_MODE=none
 
-# TODO: Remove when either of these issues are fixed
-# - https://github.com/nodejs/node/issues/39140
-# - https://github.com/nodejs/node/issues/37782
-# - https://github.com/facebook/jest/issues/12060
-# Due to a bug in `jest-worker` and/or Node.js adding a loader
-# causes our e2e tests to time out so require the tests that needs it
-# to explicitly enable it
-export YARN_PNP_ENABLE_ESM_LOADER=false
-
 # Otherwise git commit doesn't work, and some tools require it
 git config --global user.email "you@example.com"
 git config --global user.name "John Doe"