diff --git a/.github/workflows/outboards/arch36.outboard b/.github/workflows/outboards/arch36.outboard
new file mode 100644
index 0000000..13b7af8
--- /dev/null
+++ b/.github/workflows/outboards/arch36.outboard
@@ -0,0 +1,7 @@
+# Copyright 2021 Manna Harbour
+# https://github.com/manna-harbour/miryoku
+
+outboard_repository=okke-formsma/zmk-config
+outboard_ref=master
+outboard_from=config/boards/shields/arch36
+outboard_to=boards/shields/arch36
diff --git a/.github/workflows/src/test-shields.yml.m4 b/.github/workflows/src/test-shields.yml.m4
index e9613f7..470dbde 100644
--- a/.github/workflows/src/test-shields.yml.m4
+++ b/.github/workflows/src/test-shields.yml.m4
@@ -8,6 +8,8 @@ m4_include(include/jobs-build.yml.m4)m4_dnl
           - a_dux_left
           - a_dux_right
           - ahokore # outboard
+          # - arch36_left # outboard
+          # - arch36_right # outboard
           - bastyl_left # outboard
           - bastyl_right # outboard
           - bat43 # outboard
diff --git a/.github/workflows/test-shields.yml b/.github/workflows/test-shields.yml
index 00aadc0..a6eb96c 100644
--- a/.github/workflows/test-shields.yml
+++ b/.github/workflows/test-shields.yml
@@ -18,6 +18,8 @@ jobs:
           - a_dux_left
           - a_dux_right
           - ahokore # outboard
+          # - arch36_left # outboard
+          # - arch36_right # outboard
           - bastyl_left # outboard
           - bastyl_right # outboard
           - bat43 # outboard
diff --git a/config/arch36.keymap b/config/arch36.keymap
new file mode 100644
index 0000000..1481841
--- /dev/null
+++ b/config/arch36.keymap
@@ -0,0 +1,6 @@
+// Copyright 2021 Manna Harbour
+// https://github.com/manna-harbour/miryoku
+
+#include "../miryoku/config.h"
+#include "../miryoku/mapping/36-minidox.h"
+#include "../miryoku/miryoku.dtsi"