diff --git a/keyserver/.nvmrc b/keyserver/.nvmrc
--- a/keyserver/.nvmrc
+++ b/keyserver/.nvmrc
@@ -1 +1 @@
-16.18.0
+18.12.1
diff --git a/keyserver/Dockerfile b/keyserver/Dockerfile
--- a/keyserver/Dockerfile
+++ b/keyserver/Dockerfile
@@ -1,4 +1,4 @@
-FROM node:16.18.0-bullseye
+FROM node:18.12.1-bullseye
 
 #-------------------------------------------------------------------------------
 # STEP 0: SET UP USER
diff --git a/nix/dev-shell.nix b/nix/dev-shell.nix
--- a/nix/dev-shell.nix
+++ b/nix/dev-shell.nix
@@ -27,7 +27,7 @@
 , localstack
 , mariadb
 , mariadb-up
-, nodejs-16_x-openssl_1_1
+, nodejs
 , olm
 , openjdk11
 , openssl
@@ -63,7 +63,7 @@
 
     # node development
     mariadb
-    nodejs-16_x-openssl_1_1
+    nodejs
     yarn
     python3
     redis
diff --git a/nix/overlay.nix b/nix/overlay.nix
--- a/nix/overlay.nix
+++ b/nix/overlay.nix
@@ -82,9 +82,4 @@
   });
 
   rabbitmq-up = prev.callPackage ./rabbitmq-up-mac.nix { };
-
-  # Ensure that yarn is using the pinned version
-  yarn = prev.yarn.override (_: {
-    nodejs = final.nodejs-16_x-openssl_1_1;
-  });
 }