diff --git a/.devcontainer/devcontainer.json b/.devcontainer/devcontainer.json
index a0ff1fe7..73ccc26d 100644
--- a/.devcontainer/devcontainer.json
+++ b/.devcontainer/devcontainer.json
@@ -2,7 +2,7 @@
 // README at: https://github.com/devcontainers/templates/tree/main/src/javascript-node-postgres
 {
 	"name": "Node Vault",
-	"image": "mcr.microsoft.com/devcontainers/javascript-node:0-18",
+	"image": "mcr.microsoft.com/devcontainers/javascript-node:1-18-bookworm",
 	"workspaceFolder": "/workspaces/${localWorkspaceFolderBasename}",
 	// Features to add to the dev container. More info: https://containers.dev/features.
 	// "features": {},
diff --git a/.github/workflows/lint-and-test.yaml b/.github/workflows/lint-and-test.yaml
index 40d19bc8..b04cfee0 100644
--- a/.github/workflows/lint-and-test.yaml
+++ b/.github/workflows/lint-and-test.yaml
@@ -12,10 +12,10 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v3
-      # Use node 16
+      # Use node 18
       - uses: actions/setup-node@v3
         with:
-          node-version: 16
+          node-version: 18
       - name: Install dependencies
         # Install deps from lockfile
         run: npm ci
@@ -29,7 +29,8 @@ jobs:
     strategy:
       matrix:
         # We verify compatibility for current and previous LTS
-        node_version: [16, 18]
+        # Jun 2025 -> Still supporting node 16 tho it was EOL on September 11, 2023
+        node_version: [16, 18, 20, 22, 23, 24]
     name: "[ Node ${{ matrix.node_version }} ] Run tests and push to codecov"
     env:
       NODE_VERSION: ${{ matrix.node_version }}
diff --git a/Dockerfile b/Dockerfile
index 6f5565b5..9e3d637f 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -7,8 +7,8 @@ SHELL ["/bin/bash", "--login", "-c"]
 RUN apt update && apt install -y curl
 # Get optional env var to set node version
 ARG SET_NODE_VERSION
-# Set default to node 16.20.0
-ENV NODE_VERSION ${SET_NODE_VERSION:-16.20.0}
+# Set default to node 18.20.8
+ENV NODE_VERSION ${SET_NODE_VERSION:-18.20.8}
 RUN curl -o- https://raw.githubusercontent.com/nvm-sh/nvm/v0.35.3/install.sh | bash
 RUN nvm install $NODE_VERSION
 
diff --git a/package-lock.json b/package-lock.json
index 9ffe853a..c2174e80 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -26,7 +26,7 @@
         "sinon-chai": "^3.7.0"
       },
       "engines": {
-        "node": ">= 16.0.0"
+        "node": ">= 18.0.0"
       }
     },
     "node_modules/@aashutoshrathi/word-wrap": {
diff --git a/package.json b/package.json
index 8d18678e..37b0e190 100644
--- a/package.json
+++ b/package.json
@@ -13,7 +13,7 @@
     "docs": "docco --output docs src/*.js"
   },
   "engines": {
-    "node": ">= 16.0.0"
+    "node": ">= 18.0.0"
   },
   "directories": {
     "example": "./example",