diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index d7011283cc4..082dffe1c57 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -18,48 +18,9 @@ jobs:
     strategy:
       matrix:
         board:
-          - bluemicro840_v1
           - nice_nano
-          - nrfmicro_13
-          - proton_c
         shield:
-          - bfo9000_left
-          - bfo9000_right
-          - boardsource3x4
-          - corne_left
-          - corne_right
-          - cradio_left
-          - cradio_right
-          - crbn
-          - eek
-          - helix_left
-          - helix_right
-          - iris_left
-          - iris_right
-          - jian_left
-          - jian_right
-          - jorne_left
-          - jorne_right
-          - kyria_left
-          - kyria_right
-          - lily58_left
-          - lily58_right
-          - microdox_left
-          - microdox_right
-          - nibble
-          - qaz
-          - quefrency_left
-          - quefrency_right
-          - reviung41
-          - romac
-          - romac_plus
-          - settings_reset
-          - sofle_left
-          - sofle_right
-          - splitreus62_left
-          - splitreus62_right
-          - tg4x
-          - tidbit
+          - atreus_choc
         cmake-args: [""]
         include:
           - board: bdn9_rev2
diff --git a/app/boards/shields/atreus_choc/Kconfig.defconfig b/app/boards/shields/atreus_choc/Kconfig.defconfig
new file mode 100644
index 00000000000..0ed7e2fc673
--- /dev/null
+++ b/app/boards/shields/atreus_choc/Kconfig.defconfig
@@ -0,0 +1,9 @@
+# Copyright (c) 2021 The ZMK Contributors
+# SPDX-License-Identifier: MIT
+
+if SHIELD_MY_BOARD
+
+config ZMK_KEYBOARD_NAME
+    default "Atreus Choc"
+
+endif
\ No newline at end of file
diff --git a/app/boards/shields/atreus_choc/Kconfig.shield b/app/boards/shields/atreus_choc/Kconfig.shield
new file mode 100644
index 00000000000..85a90df0210
--- /dev/null
+++ b/app/boards/shields/atreus_choc/Kconfig.shield
@@ -0,0 +1,5 @@
+# Copyright (c) 2021 The ZMK Contributors
+# SPDX-License-Identifier: MIT
+
+config SHIELD_ATREUS_CHOC
+    def_bool $(shields_list_contains,atreus_choc)
\ No newline at end of file
diff --git a/app/boards/shields/atreus_choc/atreus_choc.conf b/app/boards/shields/atreus_choc/atreus_choc.conf
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/app/boards/shields/atreus_choc/atreus_choc.keymap b/app/boards/shields/atreus_choc/atreus_choc.keymap
new file mode 100644
index 00000000000..3381cbee37d
--- /dev/null
+++ b/app/boards/shields/atreus_choc/atreus_choc.keymap
@@ -0,0 +1,23 @@
+/*
+ * Copyright (c) 2020 The ZMK Contributors
+ *
+ * SPDX-License-Identifier: MIT
+ */
+
+#include <behaviors.dtsi>
+#include <dt-bindings/zmk/keys.h>
+#include <dt-bindings/zmk/bt.h>
+
+/ {
+    keymap {
+        compatible = "zmk,keymap";
+        default_layer {
+            bindings = <
+    &kp Q     &kp W    &kp E     &kp R     &kp T                         &kp Y     &kp U     &kp I     &kp O     &kp P   
+    &kp A     &kp S    &kp D     &kp F     &kp G                         &kp H     &kp J     &kp K     &kp L     &kp SEMI
+    &kp Z     &kp X    &kp C     &kp V     &kp B      &kp BSPC &kp SPACE &kp N     &kp M     &kp COMMA &kp QMARK &kp FSLH
+    &kp ESC   &kp TAB  &kp LCTRL &none     &kp LCMD                      &kp RALT  &none     &kp RSHFT &kp SQT   &kp RET
+            >;
+        };
+    };
+};
\ No newline at end of file
diff --git a/app/boards/shields/atreus_choc/atreus_choc.overlay b/app/boards/shields/atreus_choc/atreus_choc.overlay
new file mode 100644
index 00000000000..b78c8a814ff
--- /dev/null
+++ b/app/boards/shields/atreus_choc/atreus_choc.overlay
@@ -0,0 +1,39 @@
+/*
+ * Copyright (c) 2020 The ZMK Contributors
+ *
+ * SPDX-License-Identifier: MIT
+ */
+
+ / {
+    chosen {
+        zmk,kscan = &kscan0;
+    };
+
+    kscan0: kscan_0 {
+        compatible = "zmk,kscan-gpio-matrix";
+        label = "KSCAN";
+        diode-direction = "col2row";
+
+        col-gpios
+            = <&pro_micro_d 2 GPIO_ACTIVE_HIGH>
+            , <&pro_micro_d 3 GPIO_ACTIVE_HIGH>
+            , <&pro_micro_d 4 GPIO_ACTIVE_HIGH>
+            , <&pro_micro_d 5 GPIO_ACTIVE_HIGH>
+            , <&pro_micro_d 6 GPIO_ACTIVE_HIGH>
+            , <&pro_micro_d 7 GPIO_ACTIVE_HIGH>
+            , <&pro_micro_d 14 GPIO_ACTIVE_HIGH>
+            , <&pro_micro_d 15 GPIO_ACTIVE_HIGH>
+            , <&pro_micro_a 0 GPIO_ACTIVE_HIGH>
+            , <&pro_micro_a 1 GPIO_ACTIVE_HIGH>
+            , <&pro_micro_a 2 GPIO_ACTIVE_HIGH>
+            , <&pro_micro_a 3 GPIO_ACTIVE_HIGH>
+            ;
+
+        row-gpios
+            = <&pro_micro_d 16 (GPIO_ACTIVE_HIGH | GPIO_PULL_DOWN)>
+            , <&pro_micro_d 10 (GPIO_ACTIVE_HIGH | GPIO_PULL_DOWN)>
+            , <&pro_micro_d 8 (GPIO_ACTIVE_HIGH | GPIO_PULL_DOWN)>
+            , <&pro_micro_d 9 (GPIO_ACTIVE_HIGH | GPIO_PULL_DOWN)>
+            ;
+    };
+};
\ No newline at end of file