diff --git a/.circleci/config.yml b/.circleci/config.yml
index 9a655cc..26f491e 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -40,6 +40,44 @@ jobs:
       - run: apt-get update && apt-get install -y gcc-arm-none-eabi gettext wget unzip rsync
       - run: make test
 
+  build_feather_m4_express:
+    docker:
+      - image: 'python:3.7'
+
+    environment:
+        KMK_TEST: 1
+        PIPENV_VENV_IN_PROJECT: 1
+
+    steps:
+      - checkout
+      - restore_cache:
+          keys:
+            - v1-kmk-venv-{{ checksum "Pipfile.lock" }}
+
+      - run: pip install pipenv==2018.7.1
+      - run: apt-get update && apt-get install -y gcc-arm-none-eabi gettext wget unzip rsync
+
+      - run: make SKIP_KEYMAP_VALIDATION=1 USER_KEYMAP=user_keymaps/noop.py build-feather-m4-express
+
+  build_itsybitsy_m4_express:
+    docker:
+      - image: 'python:3.7'
+
+    environment:
+        KMK_TEST: 1
+        PIPENV_VENV_IN_PROJECT: 1
+
+    steps:
+      - checkout
+      - restore_cache:
+          keys:
+            - v1-kmk-venv-{{ checksum "Pipfile.lock" }}
+
+      - run: pip install pipenv==2018.7.1
+      - run: apt-get update && apt-get install -y gcc-arm-none-eabi gettext wget unzip rsync
+
+      - run: make SKIP_KEYMAP_VALIDATION=1 USER_KEYMAP=user_keymaps/noop.py build-itsybitsy-m4-express
+
   build_pyboard:
     docker:
       - image: 'python:3.7'
@@ -59,25 +97,6 @@ jobs:
 
       - run: make SKIP_KEYMAP_VALIDATION=1 USER_KEYMAP=user_keymaps/noop.py build-pyboard
 
-  build_teensy_31:
-    docker:
-      - image: 'python:3.7'
-
-    environment:
-        KMK_TEST: 1
-        PIPENV_VENV_IN_PROJECT: 1
-
-    steps:
-      - checkout
-      - restore_cache:
-          keys:
-            - v1-kmk-venv-{{ checksum "Pipfile.lock" }}
-
-      - run: pip install pipenv==2018.7.1
-      - run: apt-get update && apt-get install -y gcc-arm-none-eabi gettext wget unzip rsync
-
-      - run: make USER_KEYMAP=user_keymaps/noop.py build-teensy-3.1
-
 workflows:
   version: 2
   build-deploy:
@@ -96,6 +115,22 @@ workflows:
               only: /.*/
           requires:
             - lint
+      - build_feather_m4_express:
+          filters:
+            branches:
+              only: /.*/
+            tags:
+              only: /.*/
+          requires:
+            - test
+      - build_itsybitsy_m4_express:
+          filters:
+            branches:
+              only: /.*/
+            tags:
+              only: /.*/
+          requires:
+            - test
       - build_pyboard:
           filters:
             branches:
@@ -104,11 +139,3 @@ workflows:
               only: /.*/
           requires:
             - test
-      - build_teensy_31:
-          filters:
-            branches:
-              only: /.*/
-            tags:
-              only: /.*/
-          requires:
-            - test