diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index b440f254..9fcf9dd7 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -49,15 +49,6 @@ jobs:
           ./run-vm-shell-command.sh ${{ env.vm_name }} "security unlock-keychain -p 'admin' ~/Library/Keychains/login.keychain-db && security import ~/_repo/Configuration/6YXTQTG8JJ_development.p12 -k ~/Library/Keychains/login.keychain-db -P '6YXTQTG8JJ' -T /usr/bin/security -T /usr/bin/codesign"
           ./run-vm-shell-command.sh ${{ env.vm_name }} "security set-key-partition-list -S apple-tool:,apple: -s -k 'admin' ~/Library/Keychains/login.keychain-db"
           ./run-vm-shell-command.sh ${{ env.vm_name }} "cd ~/_repo && make setup"
-      
-  cache-management:
-    needs: install-tools
-    runs-on: ${{ needs.install-tools.outputs.runner_group_label }}
-    steps:
-      - name: Restore caches on VM
-        run: |
-          cd ~/macos-ci-setup
-          ./restore-vm-caches.sh ${{ env.vm_name }}
 
   # check-quality:
   #   needs: setup-project
@@ -76,7 +67,7 @@ jobs:
           ~/macos-ci-setup/run-vm-shell-command.sh ${{ env.vm_name }} "cd ~/_repo && make test-streams-start"
 
   test-ios:
-    needs: [install-tools, cache-management, run-streams, setup-project]
+    needs: [install-tools, run-streams, setup-project]
     runs-on: ${{ needs.install-tools.outputs.runner_group_label }}
     steps:
       - name: Run the iOS tests
@@ -84,7 +75,7 @@ jobs:
           ~/macos-ci-setup/run-vm-shell-command.sh ${{ env.vm_name }} "cd ~/_repo && make test-ios"
 
   test-tvos:
-    needs: [install-tools, cache-management, run-streams, setup-project]
+    needs: [install-tools, run-streams, setup-project]
     runs-on: ${{ needs.install-tools.outputs.runner_group_label }}
     steps:
       - name: Run the tvOS tests
@@ -115,6 +106,5 @@ jobs:
       - name: Stop and remove the VM
         run: |
           set +e
-          ~/macos-ci-setup/store-vm-caches.sh ${{ env.vm_name }}
           tart stop ${{ env.vm_name }}
           tart delete ${{ env.vm_name }}
diff --git a/fastlane/Fastfile b/fastlane/Fastfile
index a67a6a40..7bc20aaf 100644
--- a/fastlane/Fastfile
+++ b/fastlane/Fastfile
@@ -109,14 +109,11 @@ def bump_testflight_build_number(platform_id, configuration_id)
 end
 
 def build_and_sign_app(platform_id, configuration_id)
-  derived_data_path = "#{Dir.home}/Library/Developer/Xcode/DerivedData/#{platform_id}"
-  FileUtils.mkdir_p(derived_data_path)
   build_app(
     project: 'Demo/Pillarbox-demo.xcodeproj',
     configuration: CONFIGURATIONS[configuration_id],
     scheme: 'Pillarbox-demo',
     destination: "generic/platform=#{PLATFORMS[platform_id]}",
-    derived_data_path: derived_data_path,
     export_team_id: ENV.fetch('TEAM_ID'),
     output_directory: 'Binaries',
     xcargs: "-authenticationKeyIssuerID #{ENV.fetch('KEY_ISSUER_ID')} -authenticationKeyID #{ENV.fetch('KEY_ID')} " \
@@ -193,17 +190,13 @@ def deliver_demo_release(platform_id)
 end
 
 def run_package_tests(platform_id, scheme_name)
-  output_path = "fastlane/test_output_#{platform_id}"
-  derived_data_path = "#{Dir.home}/Library/Developer/Xcode/DerivedData/#{platform_id}"
   FileUtils.mkdir_p(output_path)
-  FileUtils.mkdir_p(derived_data_path)
   run_tests(
     scheme: scheme_name,
     device: DEVICES[platform_id],
     package_path: '.',
     result_bundle: true,
-    output_directory: output_path,
-    derived_data_path: derived_data_path,
+    output_directory: "fastlane/test_output",
     number_of_retries: 3,
     fail_build: false,
     xcargs: '-testLanguage en -testRegion en_US'