diff --git a/package-lock.json b/package-lock.json
index 902c6ded3..affdc7151 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -32,7 +32,7 @@
         "micromatch": "^4.0.5",
         "mongodb": "^5.2.0",
         "mongodb-build-info": "^1.5.0",
-        "mongodb-cloud-info": "^1.1.3",
+        "mongodb-cloud-info": "^2.0.0",
         "mongodb-connection-string-url": "^2.6.0",
         "mongodb-data-service": "^22.8.0",
         "mongodb-query-parser": "^2.4.11",
@@ -9064,7 +9064,8 @@
     "node_modules/duplexer": {
       "version": "0.1.2",
       "resolved": "https://registry.npmjs.org/duplexer/-/duplexer-0.1.2.tgz",
-      "integrity": "sha512-jtD6YG370ZCIi/9GTaJKQxWTZD045+4R4hTk/x1UyoqadyJ9x9CgSi1RlVDQF8U2sxLLSnFkCaMihqljHIWgMg=="
+      "integrity": "sha512-jtD6YG370ZCIi/9GTaJKQxWTZD045+4R4hTk/x1UyoqadyJ9x9CgSi1RlVDQF8U2sxLLSnFkCaMihqljHIWgMg==",
+      "optional": true
     },
     "node_modules/duplexer2": {
       "version": "0.1.4",
@@ -10537,6 +10538,7 @@
       "version": "4.0.1",
       "resolved": "https://registry.npmjs.org/event-stream/-/event-stream-4.0.1.tgz",
       "integrity": "sha512-qACXdu/9VHPBzcyhdOWR5/IahhGMf0roTeZJfzz077GwylcDd90yOHLouhmv7GJ5XzPi6ekaQWd8AvPP2nOvpA==",
+      "optional": true,
       "dependencies": {
         "duplexer": "^0.1.1",
         "from": "^0.1.7",
@@ -11450,7 +11452,8 @@
     "node_modules/from": {
       "version": "0.1.7",
       "resolved": "https://registry.npmjs.org/from/-/from-0.1.7.tgz",
-      "integrity": "sha1-g8YK/Fi5xWmXAH7Rp2izqzA6RP4="
+      "integrity": "sha1-g8YK/Fi5xWmXAH7Rp2izqzA6RP4=",
+      "optional": true
     },
     "node_modules/from2": {
       "version": "2.3.0",
@@ -16226,7 +16229,8 @@
     "node_modules/lodash.get": {
       "version": "4.4.2",
       "resolved": "https://registry.npmjs.org/lodash.get/-/lodash.get-4.4.2.tgz",
-      "integrity": "sha1-LRd/ZS+jHpObRDjVNBSZ36OCXpk="
+      "integrity": "sha1-LRd/ZS+jHpObRDjVNBSZ36OCXpk=",
+      "dev": true
     },
     "node_modules/lodash.isplainobject": {
       "version": "4.0.6",
@@ -16438,7 +16442,8 @@
     "node_modules/map-stream": {
       "version": "0.0.7",
       "resolved": "https://registry.npmjs.org/map-stream/-/map-stream-0.0.7.tgz",
-      "integrity": "sha1-ih8HiW2CsQkmvTdEokIACfiJdKg="
+      "integrity": "sha1-ih8HiW2CsQkmvTdEokIACfiJdKg=",
+      "optional": true
     },
     "node_modules/map-visit": {
       "version": "1.0.0",
@@ -16690,11 +16695,6 @@
         "dom-walk": "^0.1.0"
       }
     },
-    "node_modules/mingo": {
-      "version": "1.3.3",
-      "resolved": "https://registry.npmjs.org/mingo/-/mingo-1.3.3.tgz",
-      "integrity": "sha1-aSLE0Ufvx3GgFCWixMj3eER4xUY="
-    },
     "node_modules/minimatch": {
       "version": "3.0.4",
       "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.0.4.tgz",
@@ -17250,15 +17250,21 @@
       }
     },
     "node_modules/mongodb-cloud-info": {
-      "version": "1.1.3",
-      "resolved": "https://registry.npmjs.org/mongodb-cloud-info/-/mongodb-cloud-info-1.1.3.tgz",
-      "integrity": "sha512-k0EqjZwrDEZHKXr43GuTbw0r9/Z4xT2EseohhX0cSKaoCmvBqhHn14uvRoAMBsI/f2RRuo+IdnDmZAXsHGOfPw==",
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/mongodb-cloud-info/-/mongodb-cloud-info-2.0.0.tgz",
+      "integrity": "sha512-D79ss+MrhKlvE5O8FBEmrph83MJM1VqycJcv694fbXKaPRGYtTLUcvxwmJFXppX3W+ZZ99w3sGSaRPAH2iEKsQ==",
       "dependencies": {
         "cross-fetch": "^3.0.4",
         "gce-ips": "^1.0.2",
-        "lodash.get": "^4.4.2",
-        "netmask": "^1.0.6",
-        "save": "^2.4.0"
+        "ipaddr.js": "^2.1.0"
+      }
+    },
+    "node_modules/mongodb-cloud-info/node_modules/ipaddr.js": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/ipaddr.js/-/ipaddr.js-2.1.0.tgz",
+      "integrity": "sha512-LlbxQ7xKzfBusov6UMi4MFpEg0m+mAm9xyNGEduwXMEDuf4WfzB/RZwMVYEd7IKGvh4IUkEXYxtAVu9T3OelJQ==",
+      "engines": {
+        "node": ">= 10"
       }
     },
     "node_modules/mongodb-collection-sample": {
@@ -18494,14 +18500,6 @@
       "integrity": "sha512-Yd3UES5mWCSqR+qNT93S3UoYUkqAZ9lLg8a7g9rimsWmYGK8cVToA4/sF3RrshdyV3sAGMXVUmpMYOw+dLpOuw==",
       "dev": true
     },
-    "node_modules/netmask": {
-      "version": "1.0.6",
-      "resolved": "https://registry.npmjs.org/netmask/-/netmask-1.0.6.tgz",
-      "integrity": "sha1-ICl+idhvb2QA8lDZ9Pa0wZRfzTU=",
-      "engines": {
-        "node": ">= 0.4.0"
-      }
-    },
     "node_modules/next-tick": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/next-tick/-/next-tick-1.0.0.tgz",
@@ -19763,6 +19761,7 @@
       "version": "0.0.11",
       "resolved": "https://registry.npmjs.org/pause-stream/-/pause-stream-0.0.11.tgz",
       "integrity": "sha1-/lo0sMvOErWqaitAPuLnO2AvFEU=",
+      "optional": true,
       "dependencies": {
         "through": "~2.3"
       }
@@ -21553,25 +21552,6 @@
         "node": ">=8.9.0"
       }
     },
-    "node_modules/save": {
-      "version": "2.4.0",
-      "resolved": "https://registry.npmjs.org/save/-/save-2.4.0.tgz",
-      "integrity": "sha512-wd5L2uVnsKYkIUaK6i8Ie66IOHaI328gMF0MPuTJtYOjXgUolC33LSIk7Qr8WVA55QHaGwfiVS8a7EFIeGOR3w==",
-      "dependencies": {
-        "async": "^2.6.2",
-        "event-stream": "^4.0.1",
-        "lodash.assign": "^4.2.0",
-        "mingo": "1"
-      }
-    },
-    "node_modules/save/node_modules/async": {
-      "version": "2.6.3",
-      "resolved": "https://registry.npmjs.org/async/-/async-2.6.3.tgz",
-      "integrity": "sha512-zflvls11DCy+dQWzTW2dzuilv8Z5X/pjfmZOWba6TNIVDm+2UDaJmXSOXlasHKfNBs8oo3M0aT50fDEWfKZjXg==",
-      "dependencies": {
-        "lodash": "^4.17.14"
-      }
-    },
     "node_modules/sax": {
       "version": "1.2.4",
       "resolved": "https://registry.npmjs.org/sax/-/sax-1.2.4.tgz",
@@ -22295,6 +22275,7 @@
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/split/-/split-1.0.1.tgz",
       "integrity": "sha512-mTyOoPbrivtXnwnIxZRFYRrPNtEFKlpB2fvjSnCQUiAA6qAZzqwna5envK4uk6OIeP17CsdF3rSBGYVBsU0Tkg==",
+      "optional": true,
       "dependencies": {
         "through": "2"
       },
@@ -22532,6 +22513,7 @@
       "version": "0.2.2",
       "resolved": "https://registry.npmjs.org/stream-combiner/-/stream-combiner-0.2.2.tgz",
       "integrity": "sha1-rsjLrBd7Vrb0+kec7YwZEs7lKFg=",
+      "optional": true,
       "dependencies": {
         "duplexer": "~0.1.1",
         "through": "~2.3.4"
@@ -32185,7 +32167,8 @@
     "duplexer": {
       "version": "0.1.2",
       "resolved": "https://registry.npmjs.org/duplexer/-/duplexer-0.1.2.tgz",
-      "integrity": "sha512-jtD6YG370ZCIi/9GTaJKQxWTZD045+4R4hTk/x1UyoqadyJ9x9CgSi1RlVDQF8U2sxLLSnFkCaMihqljHIWgMg=="
+      "integrity": "sha512-jtD6YG370ZCIi/9GTaJKQxWTZD045+4R4hTk/x1UyoqadyJ9x9CgSi1RlVDQF8U2sxLLSnFkCaMihqljHIWgMg==",
+      "optional": true
     },
     "duplexer2": {
       "version": "0.1.4",
@@ -33353,6 +33336,7 @@
       "version": "4.0.1",
       "resolved": "https://registry.npmjs.org/event-stream/-/event-stream-4.0.1.tgz",
       "integrity": "sha512-qACXdu/9VHPBzcyhdOWR5/IahhGMf0roTeZJfzz077GwylcDd90yOHLouhmv7GJ5XzPi6ekaQWd8AvPP2nOvpA==",
+      "optional": true,
       "requires": {
         "duplexer": "^0.1.1",
         "from": "^0.1.7",
@@ -34072,7 +34056,8 @@
     "from": {
       "version": "0.1.7",
       "resolved": "https://registry.npmjs.org/from/-/from-0.1.7.tgz",
-      "integrity": "sha1-g8YK/Fi5xWmXAH7Rp2izqzA6RP4="
+      "integrity": "sha1-g8YK/Fi5xWmXAH7Rp2izqzA6RP4=",
+      "optional": true
     },
     "from2": {
       "version": "2.3.0",
@@ -38043,7 +38028,8 @@
     "lodash.get": {
       "version": "4.4.2",
       "resolved": "https://registry.npmjs.org/lodash.get/-/lodash.get-4.4.2.tgz",
-      "integrity": "sha1-LRd/ZS+jHpObRDjVNBSZ36OCXpk="
+      "integrity": "sha1-LRd/ZS+jHpObRDjVNBSZ36OCXpk=",
+      "dev": true
     },
     "lodash.isplainobject": {
       "version": "4.0.6",
@@ -38229,7 +38215,8 @@
     "map-stream": {
       "version": "0.0.7",
       "resolved": "https://registry.npmjs.org/map-stream/-/map-stream-0.0.7.tgz",
-      "integrity": "sha1-ih8HiW2CsQkmvTdEokIACfiJdKg="
+      "integrity": "sha1-ih8HiW2CsQkmvTdEokIACfiJdKg=",
+      "optional": true
     },
     "map-visit": {
       "version": "1.0.0",
@@ -38429,11 +38416,6 @@
         "dom-walk": "^0.1.0"
       }
     },
-    "mingo": {
-      "version": "1.3.3",
-      "resolved": "https://registry.npmjs.org/mingo/-/mingo-1.3.3.tgz",
-      "integrity": "sha1-aSLE0Ufvx3GgFCWixMj3eER4xUY="
-    },
     "minimatch": {
       "version": "3.0.4",
       "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.0.4.tgz",
@@ -38831,15 +38813,20 @@
       }
     },
     "mongodb-cloud-info": {
-      "version": "1.1.3",
-      "resolved": "https://registry.npmjs.org/mongodb-cloud-info/-/mongodb-cloud-info-1.1.3.tgz",
-      "integrity": "sha512-k0EqjZwrDEZHKXr43GuTbw0r9/Z4xT2EseohhX0cSKaoCmvBqhHn14uvRoAMBsI/f2RRuo+IdnDmZAXsHGOfPw==",
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/mongodb-cloud-info/-/mongodb-cloud-info-2.0.0.tgz",
+      "integrity": "sha512-D79ss+MrhKlvE5O8FBEmrph83MJM1VqycJcv694fbXKaPRGYtTLUcvxwmJFXppX3W+ZZ99w3sGSaRPAH2iEKsQ==",
       "requires": {
         "cross-fetch": "^3.0.4",
         "gce-ips": "^1.0.2",
-        "lodash.get": "^4.4.2",
-        "netmask": "^1.0.6",
-        "save": "^2.4.0"
+        "ipaddr.js": "^2.1.0"
+      },
+      "dependencies": {
+        "ipaddr.js": {
+          "version": "2.1.0",
+          "resolved": "https://registry.npmjs.org/ipaddr.js/-/ipaddr.js-2.1.0.tgz",
+          "integrity": "sha512-LlbxQ7xKzfBusov6UMi4MFpEg0m+mAm9xyNGEduwXMEDuf4WfzB/RZwMVYEd7IKGvh4IUkEXYxtAVu9T3OelJQ=="
+        }
       }
     },
     "mongodb-collection-sample": {
@@ -39827,11 +39814,6 @@
       "integrity": "sha512-Yd3UES5mWCSqR+qNT93S3UoYUkqAZ9lLg8a7g9rimsWmYGK8cVToA4/sF3RrshdyV3sAGMXVUmpMYOw+dLpOuw==",
       "dev": true
     },
-    "netmask": {
-      "version": "1.0.6",
-      "resolved": "https://registry.npmjs.org/netmask/-/netmask-1.0.6.tgz",
-      "integrity": "sha1-ICl+idhvb2QA8lDZ9Pa0wZRfzTU="
-    },
     "next-tick": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/next-tick/-/next-tick-1.0.0.tgz",
@@ -40808,6 +40790,7 @@
       "version": "0.0.11",
       "resolved": "https://registry.npmjs.org/pause-stream/-/pause-stream-0.0.11.tgz",
       "integrity": "sha1-/lo0sMvOErWqaitAPuLnO2AvFEU=",
+      "optional": true,
       "requires": {
         "through": "~2.3"
       }
@@ -42203,27 +42186,6 @@
         "chokidar": ">=2.0.0 <4.0.0"
       }
     },
-    "save": {
-      "version": "2.4.0",
-      "resolved": "https://registry.npmjs.org/save/-/save-2.4.0.tgz",
-      "integrity": "sha512-wd5L2uVnsKYkIUaK6i8Ie66IOHaI328gMF0MPuTJtYOjXgUolC33LSIk7Qr8WVA55QHaGwfiVS8a7EFIeGOR3w==",
-      "requires": {
-        "async": "^2.6.2",
-        "event-stream": "^4.0.1",
-        "lodash.assign": "^4.2.0",
-        "mingo": "1"
-      },
-      "dependencies": {
-        "async": {
-          "version": "2.6.3",
-          "resolved": "https://registry.npmjs.org/async/-/async-2.6.3.tgz",
-          "integrity": "sha512-zflvls11DCy+dQWzTW2dzuilv8Z5X/pjfmZOWba6TNIVDm+2UDaJmXSOXlasHKfNBs8oo3M0aT50fDEWfKZjXg==",
-          "requires": {
-            "lodash": "^4.17.14"
-          }
-        }
-      }
-    },
     "sax": {
       "version": "1.2.4",
       "resolved": "https://registry.npmjs.org/sax/-/sax-1.2.4.tgz",
@@ -42819,6 +42781,7 @@
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/split/-/split-1.0.1.tgz",
       "integrity": "sha512-mTyOoPbrivtXnwnIxZRFYRrPNtEFKlpB2fvjSnCQUiAA6qAZzqwna5envK4uk6OIeP17CsdF3rSBGYVBsU0Tkg==",
+      "optional": true,
       "requires": {
         "through": "2"
       }
@@ -42999,6 +42962,7 @@
       "version": "0.2.2",
       "resolved": "https://registry.npmjs.org/stream-combiner/-/stream-combiner-0.2.2.tgz",
       "integrity": "sha1-rsjLrBd7Vrb0+kec7YwZEs7lKFg=",
+      "optional": true,
       "requires": {
         "duplexer": "~0.1.1",
         "through": "~2.3.4"
diff --git a/package.json b/package.json
index 96b82bf80..d8cfe6afe 100644
--- a/package.json
+++ b/package.json
@@ -983,7 +983,7 @@
     "micromatch": "^4.0.5",
     "mongodb": "^5.2.0",
     "mongodb-build-info": "^1.5.0",
-    "mongodb-cloud-info": "^1.1.3",
+    "mongodb-cloud-info": "^2.0.0",
     "mongodb-connection-string-url": "^2.6.0",
     "mongodb-data-service": "^22.8.0",
     "mongodb-query-parser": "^2.4.11",