diff --git a/.circleci/config.yml b/.circleci/config.yml
index 91c83c5bff6..bfd9f8f055c 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -1490,7 +1490,11 @@ jobs:
               exit 1
             fi
             echo ${IOS_DEV_TEAM_ID}
-            ruby ${PROJ_ROOT}/scripts/xcode_build.rb -i ${PROJ_ROOT}/build_ios/install -x ${PROJ_ROOT}/ios/TestApp/TestApp.xcodeproj -p ${IOS_PLATFORM} -c ${PROFILE} -t ${IOS_DEV_TEAM_ID}
+            if [ ${IOS_PLATFORM} != "SIMULATOR" ]; then
+              ruby ${PROJ_ROOT}/scripts/xcode_build.rb -i ${PROJ_ROOT}/build_ios/install -x ${PROJ_ROOT}/ios/TestApp/TestApp.xcodeproj -p ${IOS_PLATFORM} -c ${PROFILE} -t ${IOS_DEV_TEAM_ID}
+            else
+              ruby ${PROJ_ROOT}/scripts/xcode_build.rb -i ${PROJ_ROOT}/build_ios/install -x ${PROJ_ROOT}/ios/TestApp/TestApp.xcodeproj -p ${IOS_PLATFORM}
+            fi
             if ! [ "$?" -eq "0" ]; then
               echo 'xcodebuild failed!'
               exit 1
@@ -2256,7 +2260,6 @@ workflows:
       # Pytorch iOS PR builds
       - pytorch_ios_build:
           name: pytorch_ios_11_2_1_x86_64_build
-          context: org-member
           build_environment: "pytorch-ios-11.2.1-x86_64_build"
           ios_arch: "x86_64"
           ios_platform: "SIMULATOR"
diff --git a/.circleci/verbatim-sources/job-specs-custom.yml b/.circleci/verbatim-sources/job-specs-custom.yml
index 6660d768af4..64c0ac57d37 100644
--- a/.circleci/verbatim-sources/job-specs-custom.yml
+++ b/.circleci/verbatim-sources/job-specs-custom.yml
@@ -411,7 +411,11 @@
               exit 1
             fi
             echo ${IOS_DEV_TEAM_ID}
-            ruby ${PROJ_ROOT}/scripts/xcode_build.rb -i ${PROJ_ROOT}/build_ios/install -x ${PROJ_ROOT}/ios/TestApp/TestApp.xcodeproj -p ${IOS_PLATFORM} -c ${PROFILE} -t ${IOS_DEV_TEAM_ID}
+            if [ ${IOS_PLATFORM} != "SIMULATOR" ]; then
+              ruby ${PROJ_ROOT}/scripts/xcode_build.rb -i ${PROJ_ROOT}/build_ios/install -x ${PROJ_ROOT}/ios/TestApp/TestApp.xcodeproj -p ${IOS_PLATFORM} -c ${PROFILE} -t ${IOS_DEV_TEAM_ID}
+            else
+              ruby ${PROJ_ROOT}/scripts/xcode_build.rb -i ${PROJ_ROOT}/build_ios/install -x ${PROJ_ROOT}/ios/TestApp/TestApp.xcodeproj -p ${IOS_PLATFORM}
+            fi
             if ! [ "$?" -eq "0" ]; then
               echo 'xcodebuild failed!'
               exit 1
diff --git a/.circleci/verbatim-sources/workflows-pytorch-ios-builds.yml b/.circleci/verbatim-sources/workflows-pytorch-ios-builds.yml
index 4768b3bfacd..93aa3287444 100644
--- a/.circleci/verbatim-sources/workflows-pytorch-ios-builds.yml
+++ b/.circleci/verbatim-sources/workflows-pytorch-ios-builds.yml
@@ -1,7 +1,6 @@
       # Pytorch iOS PR builds
       - pytorch_ios_build:
           name: pytorch_ios_11_2_1_x86_64_build
-          context: org-member
           build_environment: "pytorch-ios-11.2.1-x86_64_build"
           ios_arch: "x86_64"
           ios_platform: "SIMULATOR"
diff --git a/scripts/xcode_build.rb b/scripts/xcode_build.rb
index ab585b1b935..c4a34380331 100644
--- a/scripts/xcode_build.rb
+++ b/scripts/xcode_build.rb
@@ -43,7 +43,7 @@ target.build_configurations.each do |config|
     config.build_settings['OTHER_LDFLAGS']          = other_linker_flags
     config.build_settings['ENABLE_BITCODE']         = 'No'
     dev_team_id = options[:team_id]
-    if not dev_team_id
+    if not dev_team_id and options[:platform] == 'OS'
         raise "Please sepecify a valid development team id for code signing"
     end
     config.build_settings['DEVELOPMENT_TEAM']       = dev_team_id
@@ -71,7 +71,7 @@ else
 end
 
 profile = options[:profile]
-if not profile
+if not profile and options[:platform] == 'OS'
     raise "no provisioning profile found!"
 end