diff --git a/.circleci/config.yml b/.circleci/config.yml
index 547b9f8..dc27711 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -1,71 +1,55 @@
-# Javascript Node CircleCI 2.0 configuration file
-#
-# Check https://circleci.com/docs/2.0/language-javascript/ for more details
-#
-version: 2
-jobs:
-  install-test-linux:
-    docker:
-      # specify the version you desire here
-      - image: circleci/node:14-browsers
+version: 2.1
 
-      # Specify service dependencies here if necessary
-      # CircleCI maintains a library of pre-built images
-      # documented at https://circleci.com/docs/2.0/circleci-images/
-      # - image: circleci/mongo:3.4.4
-
-    working_directory: ~/repo
+orbs:
+  node: circleci/node@5.1.0
+  win: circleci/windows@5.0.0
 
+commands:
+  install:
     steps:
+      - node/install:
+          node-version: "16.19.0"
+      - run: nvm use 16.19.0
       - checkout
-
-      # Download and cache dependencies
       - restore_cache:
           keys:
-          - v1-dependencies-{{ checksum "package.json" }}
-          # fallback to using the latest cache if no exact match is found
-          - v1-dependencies-
-
+            - v1-dependencies-{{ arch }}-{{ checksum "package-lock.json" }}
+            - v1-dependencies-{{ arch }}
       - run: npm install
-
       - save_cache:
           paths:
             - node_modules
-          key: v1-dependencies-{{ checksum "package.json" }}
-
-      # run tests!
+          key: v1-dependencies-{{ arch }}-{{ checksum "package-lock.json" }}
+  test:
+    steps:
       - run: node --version
       - run: npm --version
       - run: npm test
 
-  install-test-osx:
+jobs:
+  test-linux:
+    docker:
+      - image: cimg/base:stable
+    steps:
+      - install
+      - test
+  test-mac:
     macos:
       xcode: "13.3.0"
     steps:
-      - checkout
-      # Download and cache dependencies
-      - restore_cache:
-          keys:
-          - v1-mac-dependencies-{{ checksum "package.json" }}
-          # fallback to using the latest cache if no exact match is found
-          - v1-mac-dependencies-
-      - run: node --version
-      - run: npm --version
-      - run: npm install
-
-      - save_cache:
-          paths:
-            - node_modules
-          key: v1-mac-dependencies-{{ checksum "package.json" }}
-
-      # run tests!
-      - run: npm test
+      - install
+      - test
+  test-windows:
+    executor:
+      name: win/default
+      shell: bash.exe
+    steps:
+      - install
+      - test
 
 workflows:
-  version: 2
-  test-linux:
-    jobs:
-      - install-test-linux
-  test-osx:
+  test_and_release:
     jobs:
-      - install-test-osx
+      - test-linux
+      - test-mac
+      - test-windows
diff --git a/README.md b/README.md
index d382a80..a40be49 100644
--- a/README.md
+++ b/README.md
@@ -1,12 +1,11 @@
 # Electron ChromeDriver
 
-[![Linux and Mac Build Status](https://circleci.com/gh/electron/chromedriver/tree/main.svg?style=shield)](https://circleci.com/gh/electron/chromedriver/tree/main)
-[![Windows Build status](https://ci.appveyor.com/api/projects/status/43safb37jdlaeviw/branch/main?svg=true)](https://ci.appveyor.com/project/electron-bot/chromedriver/branch/main)
+[![CircleCI Status](https://circleci.com/gh/electron/chromedriver/tree/main.svg?style=shield)](https://circleci.com/gh/electron/chromedriver/tree/main)
+[![npm:](https://img.shields.io/npm/v/electron-chromedriver.svg)](https://www.npmjs.com/package/electron-chromedriver)
 <br>
 [![js-standard-style](https://img.shields.io/badge/code%20style-standard-brightgreen.svg?style=flat)](https://standardjs.com/)
 [![license:mit](https://img.shields.io/badge/license-mit-blue.svg)](https://opensource.org/licenses/MIT)
 <br>
-[![npm:](https://img.shields.io/npm/v/electron-chromedriver.svg)](https://www.npmjs.com/package/electron-chromedriver)
 [![dependencies:?](https://img.shields.io/npm/dm/electron-chromedriver.svg)](https://www.npmjs.com/package/electron-chromedriver)
 
 Simple node module to download the [ChromeDriver](https://sites.google.com/corp/chromium.org/driver/)
diff --git a/appveyor.yml b/appveyor.yml
deleted file mode 100644
index dc8560e..0000000
--- a/appveyor.yml
+++ /dev/null
@@ -1,22 +0,0 @@
-build: off
-
-skip_tags: true
-
-branches:
-  only:
-    - main
-
-environment:
-  nodejs_version: "14"
-
-cache:
-  - node_modules -> package.json
-
-install:
-  - ps: Install-Product node $env:nodejs_version
-  - npm install
-
-test_script:
-  - node --version
-  - npm --version
-  - npm test