diff --git a/.github/workflows/outboards/shields/luna b/.github/workflows/outboards/shields/luna
new file mode 100644
index 0000000..707d91e
--- /dev/null
+++ b/.github/workflows/outboards/shields/luna
@@ -0,0 +1,7 @@
+# Copyright 2022 Manna Harbour
+# https://github.com/manna-harbour/miryoku
+
+outboard_repository=mindhatch/zmk-config-luna
+outboard_ref=master
+outboard_from=config/boards/shields/luna
+outboard_to=boards/shields/luna
diff --git a/.github/workflows/test-all-promicro-shields.yml b/.github/workflows/test-all-promicro-shields.yml
index 0f86084..3723db0 100644
--- a/.github/workflows/test-all-promicro-shields.yml
+++ b/.github/workflows/test-all-promicro-shields.yml
@@ -52,6 +52,7 @@ jobs:
         "levinson_left","levinson_right",
         "lily58_left","lily58_right",
         "lotus58_left","lotus58_right",
+        "luna_left","luna_right",
         "mano42_left","mano42_right",
         "microdox_left","microdox_right",
         "microdox_mod_left","microdox_mod_right",
diff --git a/config/luna.conf b/config/luna.conf
new file mode 100644
index 0000000..d29a372
--- /dev/null
+++ b/config/luna.conf
@@ -0,0 +1,4 @@
+# Copyright 2022 Manna Harbour
+# https://github.com/manna-harbour/miryoku
+
+CONFIG_ZMK_COMBO_MAX_COMBOS_PER_KEY=16
diff --git a/config/luna.keymap b/config/luna.keymap
new file mode 100644
index 0000000..2da568c
--- /dev/null
+++ b/config/luna.keymap
@@ -0,0 +1,6 @@
+// Copyright 2022 Manna Harbour
+// https://github.com/manna-harbour/miryoku
+
+#include "../miryoku/custom_config.h"
+#include "../miryoku/mapping/30/hummingbird.h"
+#include "../miryoku/miryoku.dtsi"