diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index fc03445f..a39d1e94 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -21,17 +21,11 @@ jobs:
           - '6.2.3'
 
     steps:
-      # checkout both skipstone.git and skip.git for the linked SkipDrive
       - name: Checkout skipstone.git
         uses: actions/checkout@v6
         with:
-          path: skipstone
-
-      - name: Checkout skip.git
-        uses: actions/checkout@v6
-        with:
-          repository: skiptools/skip
-          path: skip
+          # skip.git submodule needed for SkipDriveExternal
+          submodules: true
 
       - uses: swift-actions/setup-swift@v3
         with:
@@ -44,11 +38,9 @@ jobs:
         run: which kotlinc
 
       - name: Swift Test (Debug)
-        working-directory: skipstone
         run: KOTLINC=kotlinc swift test -v -c debug --parallel
 
       - name: Build plugin
-        working-directory: skipstone
         shell: bash
         run: |
           # Build plugins using the current installed version of Swift
diff --git a/.gitmodules b/.gitmodules
new file mode 100644
index 00000000..a2866e18
--- /dev/null
+++ b/.gitmodules
@@ -0,0 +1,4 @@
+[submodule "skip"]
+	path = skip
+	url = https://github.com/skiptools/skip.git
+	branch = main
diff --git a/Sources/SkipDriveExternal b/Sources/SkipDriveExternal
index 5e0960b4..752443da 120000
--- a/Sources/SkipDriveExternal
+++ b/Sources/SkipDriveExternal
@@ -1 +1 @@
-../../skip/Sources/SkipDrive
\ No newline at end of file
+../skip/Sources/SkipDrive
\ No newline at end of file
diff --git a/skip b/skip
new file mode 160000
index 00000000..75951ff1
--- /dev/null
+++ b/skip
@@ -0,0 +1 @@
+Subproject commit 75951ff17083ee4bbab96fa8ffe311e1d5489e0b