diff --git a/.circleci/config.yml b/.circleci/config.yml
index ef02ead944..832673dc8e 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -1,7 +1,9 @@
+version: 2.1
+
 jobs:
   build_and_test:
     macos:
-      xcode: 26.4
+      xcode: "27.0"
     steps:
       - checkout
       - run:
@@ -12,14 +14,21 @@ jobs:
           command: brew list xcbeautify >/dev/null 2>&1 || brew install xcbeautify
       - run:
           name: Build Loop
-          command: set -o pipefail && time xcodebuild -workspace LoopWorkspace.xcworkspace -scheme 'LoopWorkspace' -destination 'platform=iOS Simulator,name=iPhone 17' build | xcbeautify
+          command: |
+            mkdir -p logs
+            set -o pipefail && time xcodebuild -workspace LoopWorkspace.xcworkspace -scheme 'LoopWorkspace' -destination 'platform=iOS Simulator,name=iPhone 17' build 2>&1 | tee logs/build.log | xcbeautify
       - run:
           name: Run Tests
-          command: set -o pipefail && time xcodebuild -workspace LoopWorkspace.xcworkspace -scheme 'LoopWorkspace' -destination 'platform=iOS Simulator,name=iPhone 17' test | xcbeautify --report junit --report-path test-results/results.xml
+          command: set -o pipefail && time xcodebuild -workspace LoopWorkspace.xcworkspace -scheme 'LoopWorkspace' -destination 'platform=iOS Simulator,name=iPhone 17' -collect-test-diagnostics never test 2>&1 | tee logs/test.log | xcbeautify --report junit --report-path test-results/results.xml
       - store_test_results:
           path: test-results
+      - store_artifacts:
+          path: logs
+      - store_artifacts:
+          path: /Users/distiller/Library/Logs/DiagnosticReports
+          destination: crashes
+
 workflows:
-  version: 2
   build_and_test:
     jobs:
       - build_and_test
diff --git a/Loop b/Loop
index c30b5c89b1..691afb313b 160000
--- a/Loop
+++ b/Loop
@@ -1 +1 @@
-Subproject commit c30b5c89b1dc4151628f33f1384dd4796eaeeec2
+Subproject commit 691afb313b34fa40bc13b2aff26db6cc3f9721c5
diff --git a/LoopKit b/LoopKit
index d9f1437353..29a8e0f0a4 160000
--- a/LoopKit
+++ b/LoopKit
@@ -1 +1 @@
-Subproject commit d9f1437353482690426bd981536f58c1e95ff535
+Subproject commit 29a8e0f0a4fb0104a2989f63bd4d61da520f3363