diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
index 8f8f12cc4..379ceac71 100644
--- a/.pre-commit-config.yaml
+++ b/.pre-commit-config.yaml
@@ -158,4 +158,4 @@ repos:
         language: system
 
 fail_fast: true
-default_stages: [commit]
+default_stages: [pre-commit]
diff --git a/.tool-versions b/.tool-versions
index f894d8c85..0e4ec17a7 100644
--- a/.tool-versions
+++ b/.tool-versions
@@ -1,4 +1,4 @@
-nodejs 20.19.5
+nodejs 24.13.0
 python 3.12.12
 poetry 2.2.1
 shellcheck 0.11.0
diff --git a/SAMtemplates/functions/main.yaml b/SAMtemplates/functions/main.yaml
index 93023fc45..3f7368cf6 100644
--- a/SAMtemplates/functions/main.yaml
+++ b/SAMtemplates/functions/main.yaml
@@ -9,7 +9,7 @@ Globals:
     MemorySize: 256
     Architectures:
       - x86_64
-    Runtime: nodejs20.x
+    Runtime: nodejs24.x
     Environment:
       Variables:
         STACK_NAME: !Ref StackName
diff --git a/package-lock.json b/package-lock.json
index e17b46ac5..d1ddf7621 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -302,6 +302,7 @@
       "resolved": "https://registry.npmjs.org/@aws-sdk/client-ssm/-/client-ssm-3.975.0.tgz",
       "integrity": "sha512-yCWgQ+8vI9Q1XxcmeCDcwQTS1I39TM+3hJU6ubpEb5nfC29mosskv0+9+rIE+0PIRfBb6GZ9qLSzl0/suWg4Lg==",
       "license": "Apache-2.0",
+      "peer": true,
       "dependencies": {
         "@aws-crypto/sha256-browser": "5.2.0",
         "@aws-crypto/sha256-js": "5.2.0",
@@ -869,6 +870,7 @@
       "integrity": "sha512-yDBHV9kQNcr2/sUr9jghVyz9C3Y5G2zUM2H2lo+9mKv4sFgbA8s8Z9t8D1jiTkGoO/NoIfKMyKWr4s6CN23ZwQ==",
       "dev": true,
       "license": "MIT",
+      "peer": true,
       "dependencies": {
         "@ampproject/remapping": "^2.2.0",
         "@babel/code-frame": "^7.27.1",
@@ -2798,6 +2800,7 @@
       "integrity": "sha512-3giAOQvZiH5F9bMlMiv8+GSPMeqg0dbaeo58/0SlA9sxSqZhnUtxzX9/2FzyhS9sWQf5S0GJE0AKBrFqjpeYcg==",
       "dev": true,
       "license": "Apache-2.0",
+      "peer": true,
       "engines": {
         "node": ">=8.0.0"
       }
@@ -4342,6 +4345,7 @@
       "integrity": "sha512-zWW5KPngR/yvakJgGOmZ5vTBemDoSqF3AcV/LrO5u5wTWyEAVVh+IT39G4gtyAkh3CtTZs8aX/yRM82OfzHJRg==",
       "dev": true,
       "license": "MIT",
+      "peer": true,
       "dependencies": {
         "undici-types": "~7.16.0"
       }
@@ -4420,6 +4424,7 @@
       "integrity": "sha512-nm3cvFN9SqZGXjmw5bZ6cGmvJSyJPn0wU9gHAZZHDnZl2wF9PhHv78Xf06E0MaNk4zLVHL8hb2/c32XvyJOLQg==",
       "dev": true,
       "license": "MIT",
+      "peer": true,
       "dependencies": {
         "@typescript-eslint/scope-manager": "8.53.1",
         "@typescript-eslint/types": "8.53.1",
@@ -4920,6 +4925,7 @@
       "integrity": "sha512-NZyJarBfL7nWwIq+FDL6Zp/yHEhePMNnnJ0y3qfieCrmNvYct8uvtiV41UvlSe6apAfk0fY1FbWx+NwfmpvtTg==",
       "dev": true,
       "license": "MIT",
+      "peer": true,
       "bin": {
         "acorn": "bin/acorn"
       },
@@ -4966,6 +4972,7 @@
       "integrity": "sha512-j3fVLgvTo527anyYyJOGTYJbG+vnnQYvE0m5mmkc1TK+nxAppkCLMIL0aZ4dblVCNoGShhm+kzE4ZUykBoMg4g==",
       "dev": true,
       "license": "MIT",
+      "peer": true,
       "dependencies": {
         "fast-deep-equal": "^3.1.1",
         "fast-json-stable-stringify": "^2.0.0",
@@ -5182,6 +5189,7 @@
       "resolved": "https://registry.npmjs.org/axios/-/axios-1.13.2.tgz",
       "integrity": "sha512-VPk9ebNqPcy5lRGuSlKx752IlDatOjT9paPlm8A7yOuW2Fbvp4X3JznJtT4f0GzGLLiWE9W8onz51SqLYwzGaA==",
       "license": "MIT",
+      "peer": true,
       "dependencies": {
         "follow-redirects": "^1.15.6",
         "form-data": "^4.0.4",
@@ -5423,6 +5431,7 @@
         }
       ],
       "license": "MIT",
+      "peer": true,
       "dependencies": {
         "caniuse-lite": "^1.0.30001735",
         "electron-to-chromium": "^1.5.204",
@@ -6256,6 +6265,7 @@
       "integrity": "sha512-LEyamqS7W5HB3ujJyvi0HQK/dtVINZvd5mAAp9eT5S/ujByGjiZLCzPcHVzuXbpJDJF/cxwHlfceVUDZ2lnSTw==",
       "dev": true,
       "license": "MIT",
+      "peer": true,
       "dependencies": {
         "@eslint-community/eslint-utils": "^4.8.0",
         "@eslint-community/regexpp": "^4.12.1",
@@ -7535,6 +7545,7 @@
       "integrity": "sha512-F26gjC0yWN8uAA5m5Ss8ZQf5nDHWGlN/xWZIh8S5SRbsEKBovwZhxGd6LJlbZYxBgCYOtreSUyb8hpXyGC5O4A==",
       "dev": true,
       "license": "MIT",
+      "peer": true,
       "dependencies": {
         "@jest/core": "30.2.0",
         "@jest/types": "30.2.0",
@@ -8721,6 +8732,7 @@
       "integrity": "sha512-UczzB+0nnwGotYSgllfARAqWCJ5e/skuV2K/l+Zyck/H6pJIhLXuBnz+6vn2i211o7DtbE78HQtsYEKICHGI+g==",
       "dev": true,
       "license": "MIT",
+      "peer": true,
       "funding": {
         "type": "opencollective",
         "url": "https://opencollective.com/mobx"
@@ -9689,6 +9701,7 @@
       "integrity": "sha512-DGrYcCWK7tvYMnWh79yrPHt+vdx9tY+1gPZa7nJQtO/p8bLTDaHp4dzwEhQB7pZ4Xe3ok4XKuEPrVuc+wlpkmw==",
       "dev": true,
       "license": "MIT",
+      "peer": true,
       "engines": {
         "node": ">=0.10.0"
       }
@@ -9699,6 +9712,7 @@
       "integrity": "sha512-ibrK8llX2a4eOskq1mXKu/TGZj9qzomO+sNfO98M6d9zIPOEhlBkMkBUBLd1vgS0gQsLDBzA+8jJBVXDnfHmJg==",
       "dev": true,
       "license": "MIT",
+      "peer": true,
       "dependencies": {
         "scheduler": "^0.27.0"
       },
@@ -10647,6 +10661,7 @@
       "integrity": "sha512-1v/e3Dl1BknC37cXMhwGomhO8AkYmN41CqyX9xhUDxry1ns3BFQy2lLDRQXJRdVVWB9OHemv/53xaStimvWyuA==",
       "dev": true,
       "license": "MIT",
+      "peer": true,
       "dependencies": {
         "@emotion/is-prop-valid": "1.2.2",
         "@emotion/unitless": "0.8.1",
@@ -10856,6 +10871,7 @@
       "integrity": "sha512-5gTmgEY/sqK6gFXLIsQNH19lWb4ebPDLA4SdLP7dsWkIXHWlG66oPuVvXSGFPppYZz8ZDZq0dYYrbHfBCVUb1Q==",
       "dev": true,
       "license": "MIT",
+      "peer": true,
       "engines": {
         "node": ">=12"
       },
@@ -10992,6 +11008,7 @@
       "integrity": "sha512-f0FFpIdcHgn8zcPSbf1dRevwt047YMnaiJM3u2w2RewrB+fob/zePZcrOyQoLMMO7aBIddLcQIEK5dYjkLnGrQ==",
       "dev": true,
       "license": "MIT",
+      "peer": true,
       "dependencies": {
         "@cspotcode/source-map-support": "^0.8.0",
         "@tsconfig/node10": "^1.0.7",
@@ -11098,6 +11115,7 @@
       "integrity": "sha512-jl1vZzPDinLr9eUt3J/t7V6FgNEw9QjvBPdysz9KfQDD41fQrC2Y4vKQdiaUpFT4bXlb1RHhLpp8wtm6M5TgSw==",
       "dev": true,
       "license": "Apache-2.0",
+      "peer": true,
       "bin": {
         "tsc": "bin/tsc",
         "tsserver": "bin/tsserver"
@@ -11743,10 +11761,7 @@
     "packages/common": {
       "name": "@pfp-common/utilities",
       "version": "1.0.0",
-      "dev": true,
       "license": "MIT",
-      "optional": true,
-      "peer": true,
       "dependencies": {
         "@aws-lambda-powertools/logger": "^2.27.0",
         "@aws-lambda-powertools/parameters": "^2.27.0",
@@ -11866,8 +11881,8 @@
         "tsx": "4.21.0"
       },
       "engines": {
-        "node": "20.10.x",
-        "npm": "10.2.x"
+        "node": "24.13.x",
+        "npm": "11.6.2"
       }
     },
     "packages/statusLambda": {
diff --git a/packages/capabilityStatement/jest.config.ts b/packages/capabilityStatement/jest.config.ts
index 1ddbc83f6..dd2cb2f16 100644
--- a/packages/capabilityStatement/jest.config.ts
+++ b/packages/capabilityStatement/jest.config.ts
@@ -1,4 +1,4 @@
-import defaultConfig from "../../jest.default.config"
+import defaultConfig from "../../jest.default.config.ts"
 import type {JestConfigWithTsJest} from "ts-jest"
 
 const jestConfig: JestConfigWithTsJest = {
diff --git a/packages/common/utilities/jest.config.ts b/packages/common/utilities/jest.config.ts
index 8871c8cbd..14c8c40b8 100644
--- a/packages/common/utilities/jest.config.ts
+++ b/packages/common/utilities/jest.config.ts
@@ -1,5 +1,5 @@
 import type {JestConfigWithTsJest} from "ts-jest"
-import defaultConfig from "../../../jest.default.config"
+import defaultConfig from "../../../jest.default.config.ts"
 
 const jestConfig: JestConfigWithTsJest = {
   ...defaultConfig,
diff --git a/packages/distanceSelling/jest.config.ts b/packages/distanceSelling/jest.config.ts
index fb4d05f26..d93d212b9 100644
--- a/packages/distanceSelling/jest.config.ts
+++ b/packages/distanceSelling/jest.config.ts
@@ -1,5 +1,5 @@
 import type {JestConfigWithTsJest} from "ts-jest"
-import defaultConfig from "../../jest.default.config"
+import defaultConfig from "../../jest.default.config.ts"
 
 const jestConfig: JestConfigWithTsJest = {
   ...defaultConfig,
diff --git a/packages/enrichPrescriptions/jest.config.ts b/packages/enrichPrescriptions/jest.config.ts
index 67f084ee6..c2e04f105 100644
--- a/packages/enrichPrescriptions/jest.config.ts
+++ b/packages/enrichPrescriptions/jest.config.ts
@@ -1,5 +1,5 @@
 import type {JestConfigWithTsJest} from "ts-jest"
-import defaultConfig from "../../jest.default.config"
+import defaultConfig from "../../jest.default.config.ts"
 
 const jestConfig: JestConfigWithTsJest = {
   ...defaultConfig,
diff --git a/packages/getMyPrescriptions/jest.config.ts b/packages/getMyPrescriptions/jest.config.ts
index 32f17fbae..097ff79f1 100644
--- a/packages/getMyPrescriptions/jest.config.ts
+++ b/packages/getMyPrescriptions/jest.config.ts
@@ -1,5 +1,5 @@
 import type {JestConfigWithTsJest} from "ts-jest"
-import defaultConfig from "../../jest.default.config"
+import defaultConfig from "../../jest.default.config.ts"
 
 const jestConfig: JestConfigWithTsJest = {
   ...defaultConfig,
diff --git a/packages/nhsd-pfp-sandbox/jest.config.ts b/packages/nhsd-pfp-sandbox/jest.config.ts
index 1ddbc83f6..dd2cb2f16 100644
--- a/packages/nhsd-pfp-sandbox/jest.config.ts
+++ b/packages/nhsd-pfp-sandbox/jest.config.ts
@@ -1,4 +1,4 @@
-import defaultConfig from "../../jest.default.config"
+import defaultConfig from "../../jest.default.config.ts"
 import type {JestConfigWithTsJest} from "ts-jest"
 
 const jestConfig: JestConfigWithTsJest = {
diff --git a/packages/serviceSearchClient/jest.config.ts b/packages/serviceSearchClient/jest.config.ts
index 1ddbc83f6..dd2cb2f16 100644
--- a/packages/serviceSearchClient/jest.config.ts
+++ b/packages/serviceSearchClient/jest.config.ts
@@ -1,4 +1,4 @@
-import defaultConfig from "../../jest.default.config"
+import defaultConfig from "../../jest.default.config.ts"
 import type {JestConfigWithTsJest} from "ts-jest"
 
 const jestConfig: JestConfigWithTsJest = {
diff --git a/packages/specification/package.json b/packages/specification/package.json
index f8e4f6325..6cf16008f 100644
--- a/packages/specification/package.json
+++ b/packages/specification/package.json
@@ -7,8 +7,8 @@
   "license": "MIT",
   "type": "module",
   "engines": {
-    "node": "20.10.x",
-    "npm": "10.2.x"
+    "node": "24.13.x",
+    "npm": "11.6.2"
   },
   "scripts": {
     "lint": "redocly lint --extends=recommended --config ./redocly.yaml",
diff --git a/packages/statusLambda/jest.config.ts b/packages/statusLambda/jest.config.ts
index 1ddbc83f6..dd2cb2f16 100644
--- a/packages/statusLambda/jest.config.ts
+++ b/packages/statusLambda/jest.config.ts
@@ -1,4 +1,4 @@
-import defaultConfig from "../../jest.default.config"
+import defaultConfig from "../../jest.default.config.ts"
 import type {JestConfigWithTsJest} from "ts-jest"
 
 const jestConfig: JestConfigWithTsJest = {