diff --git a/.circleci/config.yml b/.circleci/config.yml
index 18d0059..7214113 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -1,12 +1,12 @@
 version: 2.1
 
 executors:
-  ubuntu_1804:
+  ubuntu_2004:
     docker:
-      - image: circleci/buildpack-deps:bionic
-  macos_1013:
+      - image: circleci/buildpack-deps:20.04
+  macos_1106:
     macos:
-      xcode: "10.0.0"
+      xcode: "13.2.1"
 
 commands:
   setup_ubuntu:
@@ -14,7 +14,6 @@ commands:
     parameters:
       OTP_VERSION:
         type: string
-        default: "20.3.8.23"
     steps:
       - run:
           name: Setup environment
@@ -43,7 +42,6 @@ commands:
     parameters:
       OTP_VERSION:
         type: string
-        default: "20"
     steps:
       - run:
           name: Setup environment
@@ -61,37 +59,55 @@ commands:
             make
 
 jobs:
-  ubuntu_1804_otp20:
-    executor: ubuntu_1804
-    steps:
-      - checkout
-      - setup_ubuntu
-      - run_build
-  ubuntu_1804_otp21:
-    executor: ubuntu_1804
+  ubuntu_2004_otp21:
+    executor: ubuntu_2004
     steps:
       - checkout
       - setup_ubuntu:
-          OTP_VERSION: "21.0"
+          OTP_VERSION: "21.3.8.24"
       - run_build
-  macos_1013_otp20:
-    executor: macos_1013
+  ubuntu_2004_otp22:
+    executor: ubuntu_2004
     steps:
       - checkout
-      - setup_macos
+      - setup_ubuntu:
+          OTP_VERSION: "22.3.4.26"
       - run_build
-  macos_1013_otp21:
-    executor: macos_1013
+  ubuntu_2004_otp23:
+    executor: ubuntu_2004
+    steps:
+      - checkout
+      - setup_ubuntu:
+          OTP_VERSION: "23.3.4.18"
+      - run_build
+  macos_1106_otp21:
+    executor: macos_1106
     steps:
       - checkout
       - setup_macos:
           OTP_VERSION: "21"
       - run_build
+  macos_1106_otp22:
+    executor: macos_1106
+    steps:
+      - checkout
+      - setup_macos:
+          OTP_VERSION: "22"
+      - run_build
+  macos_1106_otp23:
+    executor: macos_1106
+    steps:
+      - checkout
+      - setup_macos:
+          OTP_VERSION: "23"
+      - run_build
 
 workflows:
   check:
     jobs:
-      - ubuntu_1804_otp20
-      - ubuntu_1804_otp21
-      - macos_1013_otp20
-      - macos_1013_otp21
+      - ubuntu_2004_otp21
+      - ubuntu_2004_otp22
+      - ubuntu_2004_otp23
+      - macos_1106_otp21
+      - macos_1106_otp22
+      - macos_1106_otp23