diff --git a/.circleci/config.yml b/.circleci/config.yml
index d52472b..ea82ebf 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -11,14 +11,14 @@ jobs:
   # ============================================
   
   test-lint:
-    docker:
-      - image: cimg/node:lts
-    resource_class: small
+    executor:
+      name: node/default
+      resource_class: small
+      tag: '16'
     steps:
       - checkout
       - node/install-packages:
           pkg-manager: pnpm
-          cache-path: ~/.pnpm-store
       - run:
           name: Run linting
           command: pnpm run lint
@@ -27,9 +27,10 @@ jobs:
           command: pnpm run format --check || echo "Format check complete"
   
   test-typecheck:
-    docker:
-      - image: cimg/node:lts
-    resource_class: small
+    executor:
+      name: node/default
+      resource_class: small
+      tag: '16'
     steps:
       - checkout
       - node/install-packages:
@@ -40,9 +41,10 @@ jobs:
           command: pnpm run typecheck
   
   test-unit:
-    docker:
-      - image: cimg/node:lts
-    resource_class: small
+    executor:
+      name: node/default
+      resource_class: medium
+      tag: '16'
     steps:
       - checkout
       - node/install-packages:
@@ -58,9 +60,10 @@ jobs:
           destination: coverage
   
   test-api:
-    docker:
-      - image: cimg/node:lts
-    resource_class: small
+    executor:
+      name: node/default
+      tag: '16'
+      resource_class: small
     steps:
       - checkout
       - restore_cache: