diff --git a/.github/workflows/cygwin_build.yml b/.github/workflows/cygwin_build.yml
index 01e8090b7d..e564a2de40 100644
--- a/.github/workflows/cygwin_build.yml
+++ b/.github/workflows/cygwin_build.yml
@@ -221,6 +221,6 @@ jobs:
       - name: Archive build
         uses: actions/upload-artifact@v3
         with:
-          name: binaries
-          path: artifacts
-          retention-days: 7
+           name: binaries
+           path: artifacts
+           retention-days: 90
diff --git a/.github/workflows/test_sitl_copter.yml b/.github/workflows/test_sitl_copter.yml
index c22d586db6..c34587dcd3 100644
--- a/.github/workflows/test_sitl_copter.yml
+++ b/.github/workflows/test_sitl_copter.yml
@@ -257,18 +257,18 @@ jobs:
            name: fail-${{matrix.config}}
            path: |
              /tmp/buildlogs
-             /__w/ardupilot/ardupilot/logs
-             /__w/ardupilot/ardupilot/ap-*.core
-             /__w/ardupilot/ardupilot/core.*
-             /__w/ardupilot/ardupilot/dumpstack.sh_*
-             /__w/ardupilot/ardupilot/dumpcore.sh_*
+             /__w/carbopilot_V2/carbopilot_V2/logs
+             /__w/carbopilot_V2/carbopilot_V2/ap-*.core
+             /__w/carbopilot_V2/carbopilot_V2/core.*
+             /__w/carbopilot_V2/carbopilot_V2/dumpstack.sh_*
+             /__w/carbopilot_V2/carbopilot_V2/dumpcore.sh_*
            retention-days: 14
 
       - name: Archive .bin artifacts
         uses: actions/upload-artifact@v3
         with:
            name: BIN-${{matrix.config}}
-           path: /__w/ardupilot/ardupilot/logs
+           path: /__w/carbopilot_V2/carbopilot_V2/logs
            retention-days: 7
 
   build-gcc-heli:
@@ -353,16 +353,16 @@ jobs:
            name: fail-${{matrix.config}}
            path: |
              /tmp/buildlogs
-             /__w/ardupilot/ardupilot/logs
-             /__w/ardupilot/ardupilot/ap-*.core
-             /__w/ardupilot/ardupilot/core.*
-             /__w/ardupilot/ardupilot/dumpstack.sh_*
-             /__w/ardupilot/ardupilot/dumpcore.sh_*
+             /__w/carbopilot_V2/carbopilot_V2/logs
+             /__w/carbopilot_V2/carbopilot_V2/ap-*.core
+             /__w/carbopilot_V2/carbopilot_V2/core.*
+             /__w/carbopilot_V2/carbopilot_V2/dumpstack.sh_*
+             /__w/carbopilot_V2/carbopilot_V2/dumpcore.sh_*
            retention-days: 14
 
       - name: Archive .bin artifacts
         uses: actions/upload-artifact@v3
         with:
            name: BIN-${{matrix.config}}
-           path: /__w/ardupilot/ardupilot/logs
+           path: /__w/carbopilot_V2/carbopilot_V2/logs
            retention-days: 7
diff --git a/.github/workflows/test_sitl_plane.yml b/.github/workflows/test_sitl_plane.yml
index a91cf72735..8d3e7a7ebc 100644
--- a/.github/workflows/test_sitl_plane.yml
+++ b/.github/workflows/test_sitl_plane.yml
@@ -253,17 +253,17 @@ jobs:
            name: fail-${{matrix.config}}
            path: |
              /tmp/buildlogs
-             /__w/ardupilot/ardupilot/logs
-             /__w/ardupilot/ardupilot/ap-*.core
-             /__w/ardupilot/ardupilot/core.*
-             /__w/ardupilot/ardupilot/dumpstack.sh_*
-             /__w/ardupilot/ardupilot/dumpcore.sh_*
+             /__w/carbopilot_V2/carbopilot_V2/logs
+             /__w/carbopilot_V2/carbopilot_V2/ap-*.core
+             /__w/carbopilot_V2/carbopilot_V2/core.*
+             /__w/carbopilot_V2/carbopilot_V2/dumpstack.sh_*
+             /__w/carbopilot_V2/carbopilot_V2/dumpcore.sh_*
            retention-days: 14
 
       - name: Archive .bin artifacts
         uses: actions/upload-artifact@v3
         with:
            name: BIN-${{matrix.config}}
-           path: /__w/ardupilot/ardupilot/logs
+           path: /__w/carbopilot_V2/carbopilot_V2/logs
            retention-days: 7
 
diff --git a/.github/workflows/test_sitl_rover.yml b/.github/workflows/test_sitl_rover.yml
index c519164478..c72081e912 100644
--- a/.github/workflows/test_sitl_rover.yml
+++ b/.github/workflows/test_sitl_rover.yml
@@ -253,17 +253,17 @@ jobs:
            name: fail-${{matrix.config}}
            path: |
              /tmp/buildlogs
-             /__w/ardupilot/ardupilot/logs
-             /__w/ardupilot/ardupilot/ap-*.core
-             /__w/ardupilot/ardupilot/core.*
-             /__w/ardupilot/ardupilot/dumpstack.sh_*
-             /__w/ardupilot/ardupilot/dumpcore.sh_*
+             /__w/carbopilot_V2/carbopilot_V2/logs
+             /__w/carbopilot_V2/carbopilot_V2/ap-*.core
+             /__w/carbopilot_V2/carbopilot_V2/core.*
+             /__w/carbopilot_V2/carbopilot_V2/dumpstack.sh_*
+             /__w/carbopilot_V2/carbopilot_V2/dumpcore.sh_*
            retention-days: 14
 
       - name: Archive .bin artifacts
         uses: actions/upload-artifact@v3
         with:
            name: BIN-${{matrix.config}}
-           path: /__w/ardupilot/ardupilot/logs
+           path: /__w/carbopilot_V2/carbopilot_V2/logs
            retention-days: 7
 
diff --git a/.github/workflows/test_sitl_sub.yml b/.github/workflows/test_sitl_sub.yml
index 04eaf44c50..8ac525f517 100644
--- a/.github/workflows/test_sitl_sub.yml
+++ b/.github/workflows/test_sitl_sub.yml
@@ -254,17 +254,17 @@ jobs:
            name: fail-${{matrix.config}}
            path: |
              /tmp/buildlogs
-             /__w/ardupilot/ardupilot/logs
-             /__w/ardupilot/ardupilot/ap-*.core
-             /__w/ardupilot/ardupilot/core.*
-             /__w/ardupilot/ardupilot/dumpstack.sh_*
-             /__w/ardupilot/ardupilot/dumpcore.sh_*
+             /__w/carbopilot_V2/carbopilot_V2/logs
+             /__w/carbopilot_V2/carbopilot_V2/ap-*.core
+             /__w/carbopilot_V2/carbopilot_V2/core.*
+             /__w/carbopilot_V2/carbopilot_V2/dumpstack.sh_*
+             /__w/carbopilot_V2/carbopilot_V2/dumpcore.sh_*
            retention-days: 14
 
       - name: Archive .bin artifacts
         uses: actions/upload-artifact@v3
         with:
            name: BIN-${{matrix.config}}
-           path: /__w/ardupilot/ardupilot/logs
+           path: /__w/carbopilot_V2/carbopilot_V2/logs
            retention-days: 7
 
diff --git a/.github/workflows/test_sitl_tracker.yml b/.github/workflows/test_sitl_tracker.yml
index 81307adf5d..5711ff3610 100644
--- a/.github/workflows/test_sitl_tracker.yml
+++ b/.github/workflows/test_sitl_tracker.yml
@@ -254,17 +254,17 @@ jobs:
            name: fail-${{matrix.config}}
            path: |
              /tmp/buildlogs
-             /__w/ardupilot/ardupilot/logs
-             /__w/ardupilot/ardupilot/ap-*.core
-             /__w/ardupilot/ardupilot/core.*
-             /__w/ardupilot/ardupilot/dumpstack.sh_*
-             /__w/ardupilot/ardupilot/dumpcore.sh_*
+             /__w/carbopilot_V2/carbopilot_V2/logs
+             /__w/carbopilot_V2/carbopilot_V2/ap-*.core
+             /__w/carbopilot_V2/carbopilot_V2/core.*
+             /__w/carbopilot_V2/carbopilot_V2/dumpstack.sh_*
+             /__w/carbopilot_V2/carbopilot_V2/dumpcore.sh_*
            retention-days: 14
 
       - name: Archive .bin artifacts
         uses: actions/upload-artifact@v3
         with:
            name: BIN-${{matrix.config}}
-           path: /__w/ardupilot/ardupilot/logs
+           path: /__w/carbopilot_V2/carbopilot_V2/logs
            retention-days: 7
 
diff --git a/Tools/scripts/build_ci.sh b/Tools/scripts/build_ci.sh
index 732d2d71c6..7b8e6fb7cc 100755
--- a/Tools/scripts/build_ci.sh
+++ b/Tools/scripts/build_ci.sh
@@ -28,6 +28,8 @@ if [ -z "$CI_BUILD_TARGET" ]; then
     CI_BUILD_TARGET="sitl linux fmuv3 omnibusf4pro-one"
 fi
 
+git config --global --add safe.directory /__w/carbopilot_V2/carbopilot_V2
+
 waf=modules/waf/waf-light
 
 echo "Targets: $CI_BUILD_TARGET"