diff --git a/package-lock.json b/package-lock.json
index ec206e9e6d..c634174cb7 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -15,7 +15,7 @@
         "@netlify/edge-bundler": "^12.3.3",
         "@netlify/edge-functions": "^2.11.1",
         "@netlify/eslint-config-node": "^7.0.1",
-        "@netlify/functions": "^3.0.0",
+        "@netlify/functions": "^3.0.4",
         "@netlify/serverless-functions-api": "^1.36.0",
         "@netlify/zip-it-and-ship-it": "^10.0.4",
         "@opentelemetry/api": "^1.8.0",
@@ -4879,12 +4879,12 @@
       }
     },
     "node_modules/@netlify/functions": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/@netlify/functions/-/functions-3.0.0.tgz",
-      "integrity": "sha512-XXf9mNw4+fkxUzukDpJtzc32bl1+YlXZwEhc5ZgMcTbJPLpgRLDs5WWSPJ4eY/Mv1ZFvtxmMwmfgoQYVt68Qog==",
+      "version": "3.0.4",
+      "resolved": "https://registry.npmjs.org/@netlify/functions/-/functions-3.0.4.tgz",
+      "integrity": "sha512-Ox8+ABI+nsLK+c4/oC5dpquXuEIjzfTlJrdQKgQijCsDQoje7inXFAtKDLvvaGvuvE+PVpMLwQcIUL6P9Ob1hQ==",
       "dev": true,
       "dependencies": {
-        "@netlify/serverless-functions-api": "1.30.1"
+        "@netlify/serverless-functions-api": "1.36.0"
       },
       "engines": {
         "node": ">=18.0.0"
@@ -4904,19 +4904,6 @@
         "node": "^14.16.0 || >=16.0.0"
       }
     },
-    "node_modules/@netlify/functions/node_modules/@netlify/serverless-functions-api": {
-      "version": "1.30.1",
-      "resolved": "https://registry.npmjs.org/@netlify/serverless-functions-api/-/serverless-functions-api-1.30.1.tgz",
-      "integrity": "sha512-JkbaWFeydQdeDHz1mAy4rw+E3bl9YtbCgkntfTxq+IlNX/aIMv2/b1kZnQZcil4/sPoZGL831Dq6E374qRpU1A==",
-      "dev": true,
-      "dependencies": {
-        "@netlify/node-cookies": "^0.1.0",
-        "urlpattern-polyfill": "8.0.2"
-      },
-      "engines": {
-        "node": ">=18.0.0"
-      }
-    },
     "node_modules/@netlify/git-utils": {
       "version": "5.2.0",
       "resolved": "https://registry.npmjs.org/@netlify/git-utils/-/git-utils-5.2.0.tgz",
@@ -4988,15 +4975,6 @@
         "node": "^14.16.0 || >=16.0.0"
       }
     },
-    "node_modules/@netlify/node-cookies": {
-      "version": "0.1.0",
-      "resolved": "https://registry.npmjs.org/@netlify/node-cookies/-/node-cookies-0.1.0.tgz",
-      "integrity": "sha512-OAs1xG+FfLX0LoRASpqzVntVV/RpYkgpI0VrUnw2u0Q1qiZUzcPffxRK8HF3gc4GjuhG5ahOEMJ9bswBiZPq0g==",
-      "dev": true,
-      "engines": {
-        "node": "^14.16.0 || >=16.0.0"
-      }
-    },
     "node_modules/@netlify/open-api": {
       "version": "2.36.0",
       "resolved": "https://registry.npmjs.org/@netlify/open-api/-/open-api-2.36.0.tgz",
@@ -39274,24 +39252,12 @@
       }
     },
     "@netlify/functions": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/@netlify/functions/-/functions-3.0.0.tgz",
-      "integrity": "sha512-XXf9mNw4+fkxUzukDpJtzc32bl1+YlXZwEhc5ZgMcTbJPLpgRLDs5WWSPJ4eY/Mv1ZFvtxmMwmfgoQYVt68Qog==",
+      "version": "3.0.4",
+      "resolved": "https://registry.npmjs.org/@netlify/functions/-/functions-3.0.4.tgz",
+      "integrity": "sha512-Ox8+ABI+nsLK+c4/oC5dpquXuEIjzfTlJrdQKgQijCsDQoje7inXFAtKDLvvaGvuvE+PVpMLwQcIUL6P9Ob1hQ==",
       "dev": true,
       "requires": {
-        "@netlify/serverless-functions-api": "1.30.1"
-      },
-      "dependencies": {
-        "@netlify/serverless-functions-api": {
-          "version": "1.30.1",
-          "resolved": "https://registry.npmjs.org/@netlify/serverless-functions-api/-/serverless-functions-api-1.30.1.tgz",
-          "integrity": "sha512-JkbaWFeydQdeDHz1mAy4rw+E3bl9YtbCgkntfTxq+IlNX/aIMv2/b1kZnQZcil4/sPoZGL831Dq6E374qRpU1A==",
-          "dev": true,
-          "requires": {
-            "@netlify/node-cookies": "^0.1.0",
-            "urlpattern-polyfill": "8.0.2"
-          }
-        }
+        "@netlify/serverless-functions-api": "1.36.0"
       }
     },
     "@netlify/functions-utils": {
@@ -39363,12 +39329,6 @@
         "path-exists": "^5.0.0"
       }
     },
-    "@netlify/node-cookies": {
-      "version": "0.1.0",
-      "resolved": "https://registry.npmjs.org/@netlify/node-cookies/-/node-cookies-0.1.0.tgz",
-      "integrity": "sha512-OAs1xG+FfLX0LoRASpqzVntVV/RpYkgpI0VrUnw2u0Q1qiZUzcPffxRK8HF3gc4GjuhG5ahOEMJ9bswBiZPq0g==",
-      "dev": true
-    },
     "@netlify/open-api": {
       "version": "2.36.0",
       "resolved": "https://registry.npmjs.org/@netlify/open-api/-/open-api-2.36.0.tgz",
diff --git a/package.json b/package.json
index 0981a13656..87ed19d70e 100644
--- a/package.json
+++ b/package.json
@@ -54,7 +54,7 @@
     "@netlify/edge-bundler": "^12.3.3",
     "@netlify/edge-functions": "^2.11.1",
     "@netlify/eslint-config-node": "^7.0.1",
-    "@netlify/functions": "^3.0.0",
+    "@netlify/functions": "^3.0.4",
     "@netlify/serverless-functions-api": "^1.36.0",
     "@netlify/zip-it-and-ship-it": "^10.0.4",
     "@opentelemetry/api": "^1.8.0",
diff --git a/src/run/handlers/request-context.cts b/src/run/handlers/request-context.cts
index 1e46dab4c5..b351984729 100644
--- a/src/run/handlers/request-context.cts
+++ b/src/run/handlers/request-context.cts
@@ -7,11 +7,6 @@ import type { NetlifyCachedRouteValue } from '../../shared/cache-types.cjs'
 
 type SystemLogger = typeof systemLogger
 
-// TODO: remove once public types are updated
-export interface FutureContext extends Context {
-  waitUntil?: (promise: Promise<unknown>) => void
-}
-
 export type RequestContext = {
   /**
    * Determine if this request is for CDN SWR background revalidation
@@ -56,7 +51,7 @@ function getFallbackRequestID() {
   return `#${requestNumber}`
 }
 
-export function createRequestContext(request?: Request, context?: FutureContext): RequestContext {
+export function createRequestContext(request?: Request, context?: Context): RequestContext {
   const backgroundWorkPromises: Promise<unknown>[] = []
 
   const isDebugRequest =