diff --git a/.github/workflows/ios-sdk-ci.yml b/.github/workflows/ios-sdk-ci.yml
index 84127a8..2e6309f 100644
--- a/.github/workflows/ios-sdk-ci.yml
+++ b/.github/workflows/ios-sdk-ci.yml
@@ -3,6 +3,8 @@ name: "iOS SDK CI"
 on: 
     pull_request:
 
+
+
 jobs:
   setup:
     name: "Setup"
@@ -20,6 +22,8 @@ jobs:
     name: "SDK Tests"
     runs-on: macos-14
     needs: [setup]
+    env:
+        FL_OUTPUT_DIR: output
     steps:
       - name: Checkout Code
         uses: actions/checkout@v4
diff --git a/fastlane/Fastfile b/fastlane/Fastfile
index f6c1ee4..3f29f2d 100644
--- a/fastlane/Fastfile
+++ b/fastlane/Fastfile
@@ -2,7 +2,7 @@ default_platform :ios
 
 platform :ios do
   before_all do
-    setup_circle_ci
+    setup_ci if ENV['CI'] # it creates a temporary keychain. Without this, the build could freeze and never finish
   end
 
   desc "Runs all the OptableSDK tests"