diff --git a/.circleci/config.yml b/.circleci/config.yml
index 14a0204..e09c5ad 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -6,7 +6,7 @@ orbs:
 jobs:
   sdk-tests:
     macos:
-      xcode: 12.1.0
+      xcode: 15.4.0
     environment:
       FL_OUTPUT_DIR: output
       FASTLANE_LANE: tests
@@ -26,7 +26,7 @@ jobs:
 
   build-demo-swift:
     macos:
-      xcode: 12.1.0
+      xcode: 15.4.0
     environment:
       FL_OUTPUT_DIR: output
       FASTLANE_LANE: demo_swift
@@ -44,7 +44,7 @@ jobs:
 
   build-demo-objc:
     macos:
-      xcode: 12.1.0
+      xcode: 15.4.0
     environment:
       FL_OUTPUT_DIR: output
       FASTLANE_LANE: demo_objc
diff --git a/fastlane/Fastfile b/fastlane/Fastfile
index 3f29f2d..f1c44ee 100644
--- a/fastlane/Fastfile
+++ b/fastlane/Fastfile
@@ -3,6 +3,7 @@ default_platform :ios
 platform :ios do
   before_all do
     setup_ci if ENV['CI'] # it creates a temporary keychain. Without this, the build could freeze and never finish
+    setup_circle_ci if ENV['CIRCLECI']
   end
 
   desc "Runs all the OptableSDK tests"