diff --git a/.github/workflows/fork-sync-skills.yml b/.github/workflows/fork-sync-skills.yml
index 0d8433e..4191695 100644
--- a/.github/workflows/fork-sync-skills.yml
+++ b/.github/workflows/fork-sync-skills.yml
@@ -67,10 +67,15 @@ jobs:
             AUTO_RESOLVABLE=true
             for f in $CONFLICTED; do
               case "$f" in
-                package-lock.json|package.json|repo-tokens/badge.svg)
+                package-lock.json|package.json|repo-tokens/badge.svg|.github/workflows/*)
                   git checkout --theirs "$f"
                   git add "$f"
                   ;;
+                .env.example)
+                  # Keep fork's channel-specific env vars
+                  git checkout --ours "$f"
+                  git add "$f"
+                  ;;
                 *)
                   AUTO_RESOLVABLE=false
                   ;;
diff --git a/.github/workflows/merge-forward-skills.yml b/.github/workflows/merge-forward-skills.yml
index b648eb1..82471b0 100644
--- a/.github/workflows/merge-forward-skills.yml
+++ b/.github/workflows/merge-forward-skills.yml
@@ -160,6 +160,8 @@ jobs:
               'nanoclaw-slack',
               'nanoclaw-gmail',
               'nanoclaw-docker-sandboxes',
+              'nanoclaw-docker-sandbox',
+              'nanoclaw-docker-sandbox-windows',
             ];
             const sha = context.sha.substring(0, 7);
             for (const repo of forks) {