diff --git a/config/base.keymap b/config/base.keymap
index 03a74ae..6df18d3 100644
--- a/config/base.keymap
+++ b/config/base.keymap
@@ -201,18 +201,11 @@ ZMK_BEHAVIOR(dot_morph, mod_morph,
     mods = <(MOD_LSFT|MOD_RSFT)>;
 )
 
-// Swapper
-/ {
-    behaviors {
-        swap: swapper {
-            compatible = "zmk,behavior-tri-state";
-            label = "SWAPPER";
-            #binding-cells = <0>;
-            bindings = <&kt LALT>, <&kp TAB>, <&kt LALT>;
-            ignored-key-positions = <LT2>;
-        };
-    };
-};
+// Swapper, requires PR #1366
+ZMK_BEHAVIOR(swap, tri_state,
+    bindings = <&kt LALT>, <&kp TAB>, <&kt LALT>;
+    ignored-key-positions = <LT2>;
+)
 
 /* Keymap */
 
diff --git a/zmk-nodefree-config b/zmk-nodefree-config
index f9bb1ef..94b0609 160000
--- a/zmk-nodefree-config
+++ b/zmk-nodefree-config
@@ -1 +1 @@
-Subproject commit f9bb1ef8ae54c1a38e45287224fb3a32c8b77d52
+Subproject commit 94b06095a430fe0364b37dd4c31b948e30302cdb