diff --git a/.circleci/config.yml b/.circleci/config.yml
index e0b51576..89de1a22 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -40,7 +40,7 @@ only_dev: &only_dev
 jobs:
   build:
     docker:
-      - image: circleci/node:16.13.1@sha256:1803e9ed7deec9456ad2609124b7333d40b2eec0cf34998ae766cbf90c9a3625
+      - image: cimg/node:24.21.0@sha256:2944a8d6bea9d71395f670ee689ca63a02b34a846ad9a5d617d21eefe57a9209
     steps:
       - checkout
       # Define the working directory for this job
@@ -85,7 +85,7 @@ jobs:
   test_specs:
     description: Run spec tests
     docker:
-      - image: circleci/node:16.13.1@sha256:1803e9ed7deec9456ad2609124b7333d40b2eec0cf34998ae766cbf90c9a3625
+      - image: cimg/node:24.21.0@sha256:2944a8d6bea9d71395f670ee689ca63a02b34a846ad9a5d617d21eefe57a9209
         auth:
           username: $DOCKERHUB_USERNAME
           password: $DOCKERHUB_PASSWORD
diff --git a/.github/workflows/linter.yml b/.github/workflows/linter.yml
index 097a2d04..8cfa4533 100644
--- a/.github/workflows/linter.yml
+++ b/.github/workflows/linter.yml
@@ -47,10 +47,10 @@ jobs:
       # Github Super Linter needs
       # the latest definitions installed
       ##########################
-      - name: Use Node.js 18.x
+      - name: Use Node.js 24.x
         uses: actions/setup-node@60edb5dd545a775178f52524783378180af0d1f8 # v4.0.2
         with:
-          node-version: 18.x
+          node-version: 24.x
       # Install our eslint packages.
       # We may have custom tsconfigs, eslints that are brought in via a package.
       - run: npm install
diff --git a/.nvmrc b/.nvmrc
index 25bf17fc..a45fd52c 100644
--- a/.nvmrc
+++ b/.nvmrc
@@ -1 +1 @@
-18
\ No newline at end of file
+24
diff --git a/Dockerfile b/Dockerfile
index b53f69c3..0c00e6f6 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,4 +1,4 @@
-FROM node:18@sha256:f4698d49371c8a9fa7dd78b97fb2a532213903066e47966542b3b1d403449da4
+FROM node:24@sha256:64af3819f9275802414d7cdc38c27e9d82bd564dec4d4da87d008255d36c63b4
 
 ARG GIT_SHA