diff --git a/.github/workflows/build-electron.yml b/.github/workflows/build-electron.yml
index 2f1cab77..54110f63 100644
--- a/.github/workflows/build-electron.yml
+++ b/.github/workflows/build-electron.yml
@@ -67,9 +67,11 @@ jobs:
         uses: actions/checkout@v4
         with:
           repository: zseven-w/openpencil-skill
-          path: ../openpencil-skill
+          path: external/openpencil-skill
 
       - name: Compile CLI
+        env:
+          SKILL_ROOT: ${{ github.workspace }}/external/openpencil-skill
         run: bun run cli:compile
 
       - name: Build Electron app
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 516e695f..c3b49957 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -43,7 +43,15 @@ jobs:
       - name: Format check
         run: bun run format:check
 
+      - name: Checkout openpencil-skill
+        uses: actions/checkout@v4
+        with:
+          repository: zseven-w/openpencil-skill
+          path: external/openpencil-skill
+
       - name: Bundle CLI skill
+        env:
+          SKILL_ROOT: ${{ github.workspace }}/external/openpencil-skill
         run: bun run cli:bundle-skill
 
       - name: Type check
@@ -77,7 +85,15 @@ jobs:
       - name: Build
         run: bun --bun run build
 
+      - name: Checkout openpencil-skill
+        uses: actions/checkout@v4
+        with:
+          repository: zseven-w/openpencil-skill
+          path: external/openpencil-skill
+
       - name: Build CLI
+        env:
+          SKILL_ROOT: ${{ github.workspace }}/external/openpencil-skill
         run: bun run cli:compile
 
       - name: Upload web build artifact
diff --git a/.github/workflows/publish-cli.yml b/.github/workflows/publish-cli.yml
index 83b6aad9..283e6165 100644
--- a/.github/workflows/publish-cli.yml
+++ b/.github/workflows/publish-cli.yml
@@ -65,9 +65,11 @@ jobs:
         uses: actions/checkout@v4
         with:
           repository: zseven-w/openpencil-skill
-          path: ../openpencil-skill
+          path: external/openpencil-skill
 
       - name: Compile CLI
+        env:
+          SKILL_ROOT: ${{ github.workspace }}/external/openpencil-skill
         run: bun run cli:compile
 
       - name: Verify CLI build