diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index d74fb89..53f1506 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -2,4 +2,4 @@ on: [push, pull_request, workflow_dispatch]
 
 jobs:
   build:
-    uses: zmkfirmware/zmk/.github/workflows/build-user-config.yml@main
+    uses: pipex/zmk/.github/workflows/build-user-config.yml@main
diff --git a/config/corne.keymap b/config/corne.keymap
index a60e2c0..b7c21fe 100644
--- a/config/corne.keymap
+++ b/config/corne.keymap
@@ -77,6 +77,12 @@ ZMK_BEHAVIOR(n5_wfull, tap_dance,
     bindings = <&kp N4>, <&kp LC(LA(RET))>;
 )
 
+// Cmd+Tab swapper, requires PR #1366
+ZMK_BEHAVIOR(swapper, tri_state,
+    bindings = <&kt LGUI>, <&kp TAB>, <&kt LGUI>;
+    ignored-key-positions = <LT2>;
+)
+
 &lt {
     flavor = "balanced";
     tapping-term-ms = <240>;
@@ -100,7 +106,7 @@ ZMK_LAYER(num,
      // ╭─────────────┬─────────────┬─────────────┬─────────────┬─────────────╮   ╭─────────────┬─────────────┬─────────────┬─────────────┬─────────────╮
   xxx     &kp LOCK      &kp C_PP      &kp C_PREV    &kp C_NEXT    xxx               &kp SLASH     &kp N7        &kp N8        &kp N9        &kp MINUS       xxx
      // ├─────────────┼─────────────┼─────────────┼─────────────┼─────────────┤   ├─────────────┼─────────────┼─────────────┼─────────────┼─────────────┤
-  xxx     &kp PTAB      &kp NTAB      xxx           xxx           &kp CMD_Q        &kp ASTRK      &n4_wleft     &n5_wfull     &n6_wright T  &kp PLUS        xxx
+  xxx     &kp PTAB      &kp NTAB      xxx           &swapper      &kp CMD_Q        &kp ASTRK      &n4_wleft     &n5_wfull     &n6_wright T  &kp PLUS        xxx
      // ├─────────────┼─────────────┼─────────────┼─────────────┼─────────────┤   ├─────────────┼─────────────┼─────────────┼─────────────┼─────────────┤
   xxx     xxx           &kp C_MUTE    &kp C_VOL_DN  &kp C_VOL_UP  xxx               &kp N0        &kp N1        &kp N2        &kp N3        &kp DOT         xxx
      // ╰─────────────┼─────────────┼─────────────┼─────────────┼─────────────┤   ├─────────────┼─────────────┼─────────────┼─────────────┼─────────────┤