diff --git a/.github/workflows/outboards/shields/klotz b/.github/workflows/outboards/shields/klotz
new file mode 100644
index 0000000..7672113
--- /dev/null
+++ b/.github/workflows/outboards/shields/klotz
@@ -0,0 +1,7 @@
+# Copyright 2022 Manna Harbour
+# https://github.com/manna-harbour/miryoku
+
+outboard_repository=GEIGEIGEIST/zmk-config-klotz
+outboard_ref=master
+outboard_from=config/boards/shields/klotz
+outboard_to=boards/shields/klotz
diff --git a/.github/workflows/test-all-promicro-shields.yml b/.github/workflows/test-all-promicro-shields.yml
index 0b382a1..7b52cb9 100644
--- a/.github/workflows/test-all-promicro-shields.yml
+++ b/.github/workflows/test-all-promicro-shields.yml
@@ -41,6 +41,7 @@ jobs:
         "jiran_left","jiran_right",
         "jorne_left","jorne_right",
         "klor_left","klor_right",
+        "klotz_left","klotz_right",
         "kyria_left","kyria_right",
         "kyria_rev2_left","kyria_rev2_right",
         "leeloo_left","leeloo_right",
diff --git a/config/klotz.keymap b/config/klotz.keymap
new file mode 100644
index 0000000..11466a6
--- /dev/null
+++ b/config/klotz.keymap
@@ -0,0 +1,6 @@
+// Copyright 2021 Manna Harbour
+// https://github.com/manna-harbour/miryoku
+
+#include "../miryoku/custom_config.h"
+#include "../miryoku/mapping/34/ferris.h"
+#include "../miryoku/miryoku.dtsi"