diff --git a/package-lock.json b/package-lock.json
index 5fb8db82f3d..3f68d81a8b3 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -11,7 +11,7 @@
       ],
       "devDependencies": {
         "@apollo/client": "3.11.1",
-        "@apollo/gateway": "2.8.4",
+        "@apollo/gateway": "2.8.5",
         "@apollo/subgraph": "2.8.4",
         "@apollo/utils.createhash": "2.0.1",
         "@changesets/changelog-github": "0.5.0",
@@ -157,14 +157,33 @@
       }
     },
     "node_modules/@apollo/composition": {
-      "version": "2.8.4",
-      "resolved": "https://registry.npmjs.org/@apollo/composition/-/composition-2.8.4.tgz",
-      "integrity": "sha512-x8USTfHAtauW2BrXZo10gFV9yoF3TIfKUu+s5tJVm/vX/zgw3OG54TC34v5c/5pMsStcZu/aYFnMkeZ54Ay7tQ==",
+      "version": "2.8.5",
+      "resolved": "https://registry.npmjs.org/@apollo/composition/-/composition-2.8.5.tgz",
+      "integrity": "sha512-uyZLOaOy6xeaihvIXD+32y6Unvy7xkp4+X9MBvFJmR9ZfFOtL0je/X2YPBX2HhmqdjO/2C6pp2fQdicrV3Vbnw==",
+      "dev": true,
+      "license": "Elastic-2.0",
+      "dependencies": {
+        "@apollo/federation-internals": "2.8.5",
+        "@apollo/query-graphs": "2.8.5"
+      },
+      "engines": {
+        "node": ">=14.15.0"
+      },
+      "peerDependencies": {
+        "graphql": "^16.5.0"
+      }
+    },
+    "node_modules/@apollo/composition/node_modules/@apollo/federation-internals": {
+      "version": "2.8.5",
+      "resolved": "https://registry.npmjs.org/@apollo/federation-internals/-/federation-internals-2.8.5.tgz",
+      "integrity": "sha512-rTDkJmNybJm5mkGKE31I54OjrE3FpocmsZns9Mb2SSJNuDkzv+uxHA4POW9RB6KsRLGFyEkJ/l5WzU1exxmHjA==",
       "dev": true,
       "license": "Elastic-2.0",
       "dependencies": {
-        "@apollo/federation-internals": "2.8.4",
-        "@apollo/query-graphs": "2.8.4"
+        "@types/uuid": "^9.0.0",
+        "chalk": "^4.1.0",
+        "js-levenshtein": "^1.1.6",
+        "uuid": "^9.0.0"
       },
       "engines": {
         "node": ">=14.15.0"
@@ -173,6 +192,20 @@
         "graphql": "^16.5.0"
       }
     },
+    "node_modules/@apollo/composition/node_modules/uuid": {
+      "version": "9.0.1",
+      "resolved": "https://registry.npmjs.org/uuid/-/uuid-9.0.1.tgz",
+      "integrity": "sha512-b+1eJOlsR9K8HJpow9Ok3fiWOWSIcIzXodvv0rQjVoOVNpWMpxf1wZNpt4y9h10odCNrqnYp1OBzRktckBe3sA==",
+      "dev": true,
+      "funding": [
+        "https://github.com/sponsors/broofa",
+        "https://github.com/sponsors/ctavan"
+      ],
+      "license": "MIT",
+      "bin": {
+        "uuid": "dist/bin/uuid"
+      }
+    },
     "node_modules/@apollo/federation-internals": {
       "version": "2.8.4",
       "resolved": "https://registry.npmjs.org/@apollo/federation-internals/-/federation-internals-2.8.4.tgz",
@@ -207,15 +240,15 @@
       }
     },
     "node_modules/@apollo/gateway": {
-      "version": "2.8.4",
-      "resolved": "https://registry.npmjs.org/@apollo/gateway/-/gateway-2.8.4.tgz",
-      "integrity": "sha512-KxYRvRfSLDMqyOlUu9ZuOaqZLvKwGHR3F6XSw8JmHvMUjcRzVeAY6U9821ruM9g+SdYYdm0q2jYJf4/iYPAcow==",
+      "version": "2.8.5",
+      "resolved": "https://registry.npmjs.org/@apollo/gateway/-/gateway-2.8.5.tgz",
+      "integrity": "sha512-zmLiT8qKWMw5fe06F7I4n3RK+OnJTwX8l0tLf8ixuwZVdD1FWQuT1LJAd5fyrZefSTpMCnOcvE/0HIg510nfIg==",
       "dev": true,
       "license": "Elastic-2.0",
       "dependencies": {
-        "@apollo/composition": "2.8.4",
-        "@apollo/federation-internals": "2.8.4",
-        "@apollo/query-planner": "2.8.4",
+        "@apollo/composition": "2.8.5",
+        "@apollo/federation-internals": "2.8.5",
+        "@apollo/query-planner": "2.8.5",
         "@apollo/server-gateway-interface": "^1.1.0",
         "@apollo/usage-reporting-protobuf": "^4.1.0",
         "@apollo/utils.createhash": "^2.0.0",
@@ -239,6 +272,39 @@
         "graphql": "^16.5.0"
       }
     },
+    "node_modules/@apollo/gateway/node_modules/@apollo/federation-internals": {
+      "version": "2.8.5",
+      "resolved": "https://registry.npmjs.org/@apollo/federation-internals/-/federation-internals-2.8.5.tgz",
+      "integrity": "sha512-rTDkJmNybJm5mkGKE31I54OjrE3FpocmsZns9Mb2SSJNuDkzv+uxHA4POW9RB6KsRLGFyEkJ/l5WzU1exxmHjA==",
+      "dev": true,
+      "license": "Elastic-2.0",
+      "dependencies": {
+        "@types/uuid": "^9.0.0",
+        "chalk": "^4.1.0",
+        "js-levenshtein": "^1.1.6",
+        "uuid": "^9.0.0"
+      },
+      "engines": {
+        "node": ">=14.15.0"
+      },
+      "peerDependencies": {
+        "graphql": "^16.5.0"
+      }
+    },
+    "node_modules/@apollo/gateway/node_modules/uuid": {
+      "version": "9.0.1",
+      "resolved": "https://registry.npmjs.org/uuid/-/uuid-9.0.1.tgz",
+      "integrity": "sha512-b+1eJOlsR9K8HJpow9Ok3fiWOWSIcIzXodvv0rQjVoOVNpWMpxf1wZNpt4y9h10odCNrqnYp1OBzRktckBe3sA==",
+      "dev": true,
+      "funding": [
+        "https://github.com/sponsors/broofa",
+        "https://github.com/sponsors/ctavan"
+      ],
+      "license": "MIT",
+      "bin": {
+        "uuid": "dist/bin/uuid"
+      }
+    },
     "node_modules/@apollo/protobufjs": {
       "version": "1.2.7",
       "resolved": "https://registry.npmjs.org/@apollo/protobufjs/-/protobufjs-1.2.7.tgz",
@@ -264,13 +330,13 @@
       }
     },
     "node_modules/@apollo/query-graphs": {
-      "version": "2.8.4",
-      "resolved": "https://registry.npmjs.org/@apollo/query-graphs/-/query-graphs-2.8.4.tgz",
-      "integrity": "sha512-X2Y79efZh1RQ8aNi9iI+3ePWvyBm+oNW83P1xyxy3qBGFOBFne+YnoADK9tHM1FXLJ34cK03xxTdxY76V2Tteg==",
+      "version": "2.8.5",
+      "resolved": "https://registry.npmjs.org/@apollo/query-graphs/-/query-graphs-2.8.5.tgz",
+      "integrity": "sha512-01YCTeUX4RJUuZF8hrE0wgRQ4mCqq1ZS2IvNbtzcNGzibDcYoDkTa+5EVhn3Yr1b9RujzeJE7T2nJzinupHRug==",
       "dev": true,
       "license": "Elastic-2.0",
       "dependencies": {
-        "@apollo/federation-internals": "2.8.4",
+        "@apollo/federation-internals": "2.8.5",
         "deep-equal": "^2.0.5",
         "ts-graphviz": "^1.5.4",
         "uuid": "^9.0.0"
@@ -282,6 +348,25 @@
         "graphql": "^16.5.0"
       }
     },
+    "node_modules/@apollo/query-graphs/node_modules/@apollo/federation-internals": {
+      "version": "2.8.5",
+      "resolved": "https://registry.npmjs.org/@apollo/federation-internals/-/federation-internals-2.8.5.tgz",
+      "integrity": "sha512-rTDkJmNybJm5mkGKE31I54OjrE3FpocmsZns9Mb2SSJNuDkzv+uxHA4POW9RB6KsRLGFyEkJ/l5WzU1exxmHjA==",
+      "dev": true,
+      "license": "Elastic-2.0",
+      "dependencies": {
+        "@types/uuid": "^9.0.0",
+        "chalk": "^4.1.0",
+        "js-levenshtein": "^1.1.6",
+        "uuid": "^9.0.0"
+      },
+      "engines": {
+        "node": ">=14.15.0"
+      },
+      "peerDependencies": {
+        "graphql": "^16.5.0"
+      }
+    },
     "node_modules/@apollo/query-graphs/node_modules/uuid": {
       "version": "9.0.1",
       "resolved": "https://registry.npmjs.org/uuid/-/uuid-9.0.1.tgz",
@@ -297,14 +382,14 @@
       }
     },
     "node_modules/@apollo/query-planner": {
-      "version": "2.8.4",
-      "resolved": "https://registry.npmjs.org/@apollo/query-planner/-/query-planner-2.8.4.tgz",
-      "integrity": "sha512-HNIyYeaIvj9/5Qem7p7w5we3SEaNJeTO77tpP7jkaaYxd+FOHtlwfMM0/5X814kl2eiaMposz78Kv+JF2582Gg==",
+      "version": "2.8.5",
+      "resolved": "https://registry.npmjs.org/@apollo/query-planner/-/query-planner-2.8.5.tgz",
+      "integrity": "sha512-vFuefIXm7oPCYRqSCW+s+OY6jKdkWNsyREoo6jnf3xlzDuqhlZVGN0/3x/V25b7O8NK63KXxxd+YdIgkzN06ow==",
       "dev": true,
       "license": "Elastic-2.0",
       "dependencies": {
-        "@apollo/federation-internals": "2.8.4",
-        "@apollo/query-graphs": "2.8.4",
+        "@apollo/federation-internals": "2.8.5",
+        "@apollo/query-graphs": "2.8.5",
         "@apollo/utils.keyvaluecache": "^2.1.0",
         "chalk": "^4.1.0",
         "deep-equal": "^2.0.5",
@@ -317,6 +402,39 @@
         "graphql": "^16.5.0"
       }
     },
+    "node_modules/@apollo/query-planner/node_modules/@apollo/federation-internals": {
+      "version": "2.8.5",
+      "resolved": "https://registry.npmjs.org/@apollo/federation-internals/-/federation-internals-2.8.5.tgz",
+      "integrity": "sha512-rTDkJmNybJm5mkGKE31I54OjrE3FpocmsZns9Mb2SSJNuDkzv+uxHA4POW9RB6KsRLGFyEkJ/l5WzU1exxmHjA==",
+      "dev": true,
+      "license": "Elastic-2.0",
+      "dependencies": {
+        "@types/uuid": "^9.0.0",
+        "chalk": "^4.1.0",
+        "js-levenshtein": "^1.1.6",
+        "uuid": "^9.0.0"
+      },
+      "engines": {
+        "node": ">=14.15.0"
+      },
+      "peerDependencies": {
+        "graphql": "^16.5.0"
+      }
+    },
+    "node_modules/@apollo/query-planner/node_modules/uuid": {
+      "version": "9.0.1",
+      "resolved": "https://registry.npmjs.org/uuid/-/uuid-9.0.1.tgz",
+      "integrity": "sha512-b+1eJOlsR9K8HJpow9Ok3fiWOWSIcIzXodvv0rQjVoOVNpWMpxf1wZNpt4y9h10odCNrqnYp1OBzRktckBe3sA==",
+      "dev": true,
+      "funding": [
+        "https://github.com/sponsors/broofa",
+        "https://github.com/sponsors/ctavan"
+      ],
+      "license": "MIT",
+      "bin": {
+        "uuid": "dist/bin/uuid"
+      }
+    },
     "node_modules/@apollo/server": {
       "resolved": "packages/server",
       "link": true
@@ -14689,13 +14807,33 @@
       }
     },
     "@apollo/composition": {
-      "version": "2.8.4",
-      "resolved": "https://registry.npmjs.org/@apollo/composition/-/composition-2.8.4.tgz",
-      "integrity": "sha512-x8USTfHAtauW2BrXZo10gFV9yoF3TIfKUu+s5tJVm/vX/zgw3OG54TC34v5c/5pMsStcZu/aYFnMkeZ54Ay7tQ==",
+      "version": "2.8.5",
+      "resolved": "https://registry.npmjs.org/@apollo/composition/-/composition-2.8.5.tgz",
+      "integrity": "sha512-uyZLOaOy6xeaihvIXD+32y6Unvy7xkp4+X9MBvFJmR9ZfFOtL0je/X2YPBX2HhmqdjO/2C6pp2fQdicrV3Vbnw==",
       "dev": true,
       "requires": {
-        "@apollo/federation-internals": "2.8.4",
-        "@apollo/query-graphs": "2.8.4"
+        "@apollo/federation-internals": "2.8.5",
+        "@apollo/query-graphs": "2.8.5"
+      },
+      "dependencies": {
+        "@apollo/federation-internals": {
+          "version": "2.8.5",
+          "resolved": "https://registry.npmjs.org/@apollo/federation-internals/-/federation-internals-2.8.5.tgz",
+          "integrity": "sha512-rTDkJmNybJm5mkGKE31I54OjrE3FpocmsZns9Mb2SSJNuDkzv+uxHA4POW9RB6KsRLGFyEkJ/l5WzU1exxmHjA==",
+          "dev": true,
+          "requires": {
+            "@types/uuid": "^9.0.0",
+            "chalk": "^4.1.0",
+            "js-levenshtein": "^1.1.6",
+            "uuid": "^9.0.0"
+          }
+        },
+        "uuid": {
+          "version": "9.0.1",
+          "resolved": "https://registry.npmjs.org/uuid/-/uuid-9.0.1.tgz",
+          "integrity": "sha512-b+1eJOlsR9K8HJpow9Ok3fiWOWSIcIzXodvv0rQjVoOVNpWMpxf1wZNpt4y9h10odCNrqnYp1OBzRktckBe3sA==",
+          "dev": true
+        }
       }
     },
     "@apollo/federation-internals": {
@@ -14719,14 +14857,14 @@
       }
     },
     "@apollo/gateway": {
-      "version": "2.8.4",
-      "resolved": "https://registry.npmjs.org/@apollo/gateway/-/gateway-2.8.4.tgz",
-      "integrity": "sha512-KxYRvRfSLDMqyOlUu9ZuOaqZLvKwGHR3F6XSw8JmHvMUjcRzVeAY6U9821ruM9g+SdYYdm0q2jYJf4/iYPAcow==",
+      "version": "2.8.5",
+      "resolved": "https://registry.npmjs.org/@apollo/gateway/-/gateway-2.8.5.tgz",
+      "integrity": "sha512-zmLiT8qKWMw5fe06F7I4n3RK+OnJTwX8l0tLf8ixuwZVdD1FWQuT1LJAd5fyrZefSTpMCnOcvE/0HIg510nfIg==",
       "dev": true,
       "requires": {
-        "@apollo/composition": "2.8.4",
-        "@apollo/federation-internals": "2.8.4",
-        "@apollo/query-planner": "2.8.4",
+        "@apollo/composition": "2.8.5",
+        "@apollo/federation-internals": "2.8.5",
+        "@apollo/query-planner": "2.8.5",
         "@apollo/server-gateway-interface": "^1.1.0",
         "@apollo/usage-reporting-protobuf": "^4.1.0",
         "@apollo/utils.createhash": "^2.0.0",
@@ -14742,6 +14880,26 @@
         "make-fetch-happen": "^11.0.0",
         "node-abort-controller": "^3.0.1",
         "node-fetch": "^2.6.7"
+      },
+      "dependencies": {
+        "@apollo/federation-internals": {
+          "version": "2.8.5",
+          "resolved": "https://registry.npmjs.org/@apollo/federation-internals/-/federation-internals-2.8.5.tgz",
+          "integrity": "sha512-rTDkJmNybJm5mkGKE31I54OjrE3FpocmsZns9Mb2SSJNuDkzv+uxHA4POW9RB6KsRLGFyEkJ/l5WzU1exxmHjA==",
+          "dev": true,
+          "requires": {
+            "@types/uuid": "^9.0.0",
+            "chalk": "^4.1.0",
+            "js-levenshtein": "^1.1.6",
+            "uuid": "^9.0.0"
+          }
+        },
+        "uuid": {
+          "version": "9.0.1",
+          "resolved": "https://registry.npmjs.org/uuid/-/uuid-9.0.1.tgz",
+          "integrity": "sha512-b+1eJOlsR9K8HJpow9Ok3fiWOWSIcIzXodvv0rQjVoOVNpWMpxf1wZNpt4y9h10odCNrqnYp1OBzRktckBe3sA==",
+          "dev": true
+        }
       }
     },
     "@apollo/protobufjs": {
@@ -14764,17 +14922,29 @@
       }
     },
     "@apollo/query-graphs": {
-      "version": "2.8.4",
-      "resolved": "https://registry.npmjs.org/@apollo/query-graphs/-/query-graphs-2.8.4.tgz",
-      "integrity": "sha512-X2Y79efZh1RQ8aNi9iI+3ePWvyBm+oNW83P1xyxy3qBGFOBFne+YnoADK9tHM1FXLJ34cK03xxTdxY76V2Tteg==",
+      "version": "2.8.5",
+      "resolved": "https://registry.npmjs.org/@apollo/query-graphs/-/query-graphs-2.8.5.tgz",
+      "integrity": "sha512-01YCTeUX4RJUuZF8hrE0wgRQ4mCqq1ZS2IvNbtzcNGzibDcYoDkTa+5EVhn3Yr1b9RujzeJE7T2nJzinupHRug==",
       "dev": true,
       "requires": {
-        "@apollo/federation-internals": "2.8.4",
+        "@apollo/federation-internals": "2.8.5",
         "deep-equal": "^2.0.5",
         "ts-graphviz": "^1.5.4",
         "uuid": "^9.0.0"
       },
       "dependencies": {
+        "@apollo/federation-internals": {
+          "version": "2.8.5",
+          "resolved": "https://registry.npmjs.org/@apollo/federation-internals/-/federation-internals-2.8.5.tgz",
+          "integrity": "sha512-rTDkJmNybJm5mkGKE31I54OjrE3FpocmsZns9Mb2SSJNuDkzv+uxHA4POW9RB6KsRLGFyEkJ/l5WzU1exxmHjA==",
+          "dev": true,
+          "requires": {
+            "@types/uuid": "^9.0.0",
+            "chalk": "^4.1.0",
+            "js-levenshtein": "^1.1.6",
+            "uuid": "^9.0.0"
+          }
+        },
         "uuid": {
           "version": "9.0.1",
           "resolved": "https://registry.npmjs.org/uuid/-/uuid-9.0.1.tgz",
@@ -14784,17 +14954,37 @@
       }
     },
     "@apollo/query-planner": {
-      "version": "2.8.4",
-      "resolved": "https://registry.npmjs.org/@apollo/query-planner/-/query-planner-2.8.4.tgz",
-      "integrity": "sha512-HNIyYeaIvj9/5Qem7p7w5we3SEaNJeTO77tpP7jkaaYxd+FOHtlwfMM0/5X814kl2eiaMposz78Kv+JF2582Gg==",
+      "version": "2.8.5",
+      "resolved": "https://registry.npmjs.org/@apollo/query-planner/-/query-planner-2.8.5.tgz",
+      "integrity": "sha512-vFuefIXm7oPCYRqSCW+s+OY6jKdkWNsyREoo6jnf3xlzDuqhlZVGN0/3x/V25b7O8NK63KXxxd+YdIgkzN06ow==",
       "dev": true,
       "requires": {
-        "@apollo/federation-internals": "2.8.4",
-        "@apollo/query-graphs": "2.8.4",
+        "@apollo/federation-internals": "2.8.5",
+        "@apollo/query-graphs": "2.8.5",
         "@apollo/utils.keyvaluecache": "^2.1.0",
         "chalk": "^4.1.0",
         "deep-equal": "^2.0.5",
         "pretty-format": "^29.0.0"
+      },
+      "dependencies": {
+        "@apollo/federation-internals": {
+          "version": "2.8.5",
+          "resolved": "https://registry.npmjs.org/@apollo/federation-internals/-/federation-internals-2.8.5.tgz",
+          "integrity": "sha512-rTDkJmNybJm5mkGKE31I54OjrE3FpocmsZns9Mb2SSJNuDkzv+uxHA4POW9RB6KsRLGFyEkJ/l5WzU1exxmHjA==",
+          "dev": true,
+          "requires": {
+            "@types/uuid": "^9.0.0",
+            "chalk": "^4.1.0",
+            "js-levenshtein": "^1.1.6",
+            "uuid": "^9.0.0"
+          }
+        },
+        "uuid": {
+          "version": "9.0.1",
+          "resolved": "https://registry.npmjs.org/uuid/-/uuid-9.0.1.tgz",
+          "integrity": "sha512-b+1eJOlsR9K8HJpow9Ok3fiWOWSIcIzXodvv0rQjVoOVNpWMpxf1wZNpt4y9h10odCNrqnYp1OBzRktckBe3sA==",
+          "dev": true
+        }
       }
     },
     "@apollo/server": {
diff --git a/package.json b/package.json
index 4e2e6768f7b..7b48329058a 100644
--- a/package.json
+++ b/package.json
@@ -39,7 +39,7 @@
   },
   "devDependencies": {
     "@apollo/client": "3.11.1",
-    "@apollo/gateway": "2.8.4",
+    "@apollo/gateway": "2.8.5",
     "@apollo/subgraph": "2.8.4",
     "@apollo/utils.createhash": "2.0.1",
     "@changesets/changelog-github": "0.5.0",