diff --git a/plugins/api-docs/package.json b/plugins/api-docs/package.json
index 82faad0853..d00d4497da 100644
--- a/plugins/api-docs/package.json
+++ b/plugins/api-docs/package.json
@@ -50,7 +50,6 @@
     "@types/react": "^16.9",
     "@types/swagger-ui-react": "^3.23.3",
     "msw": "^0.21.2",
-    "node-fetch": "^2.6.1",
     "cross-fetch": "^3.0.6"
   },
   "files": [
diff --git a/plugins/auth-backend/package.json b/plugins/auth-backend/package.json
index 4579892d34..513fb540f2 100644
--- a/plugins/auth-backend/package.json
+++ b/plugins/auth-backend/package.json
@@ -37,7 +37,6 @@
     "knex": "^0.21.1",
     "moment": "^2.26.0",
     "morgan": "^1.10.0",
-    "node-fetch": "^2.6.1",
     "passport": "^0.4.1",
     "passport-github2": "^0.1.12",
     "passport-gitlab2": "^5.0.0",
@@ -55,13 +54,13 @@
     "@types/body-parser": "^1.19.0",
     "@types/cookie-parser": "^1.4.2",
     "@types/jwt-decode": "2.2.1",
-    "@types/node-fetch": "^2.5.7",
     "@types/passport": "^1.0.3",
     "@types/passport-github2": "^1.2.4",
     "@types/passport-google-oauth20": "^2.0.3",
     "@types/passport-microsoft": "^0.0.0",
     "@types/passport-saml": "^1.1.2",
-    "msw": "^0.20.5"
+    "msw": "^0.21.2",
+    "cross-fetch": "^3.0.6"
   },
   "files": [
     "dist",
diff --git a/plugins/catalog-graphql/package.json b/plugins/catalog-graphql/package.json
index 6f036686de..29f85005c1 100644
--- a/plugins/catalog-graphql/package.json
+++ b/plugins/catalog-graphql/package.json
@@ -28,7 +28,7 @@
     "graphql": "^15.3.0",
     "graphql-tag": "^2.11.0",
     "graphql-type-json": "^0.3.2",
-    "node-fetch": "^2.6.0",
+    "cross-fetch": "^3.0.6",
     "winston": "^3.2.1"
   },
   "devDependencies": {
@@ -40,8 +40,8 @@
     "@types/express": "^4.17.7",
     "@types/supertest": "^2.0.8",
     "eslint-plugin-graphql": "^4.0.0",
-    "msw": "^0.20.5",
     "supertest": "^4.0.2",
+    "msw": "^0.21.2",
     "ts-node": "^8.10.2"
   },
   "files": [
diff --git a/plugins/catalog/src/setupTests.ts b/plugins/catalog/src/setupTests.ts
index 778a9dfaa4..aea2220869 100644
--- a/plugins/catalog/src/setupTests.ts
+++ b/plugins/catalog/src/setupTests.ts
@@ -15,6 +15,4 @@
  */
 
 import '@testing-library/jest-dom';
-import fetch from 'node-fetch';
-
-window.fetch = fetch;
+import 'cross-fetch/polyfill';