diff --git a/.cirrus.yml b/.cirrus.yml
index 8ec3b35c6..a13b96aa9 100644
--- a/.cirrus.yml
+++ b/.cirrus.yml
@@ -208,10 +208,10 @@ macos_task_template: &MACOS_TASK_TEMPLATE
     # Add certificates to keychain and allow codesign to access them
     # 1) Apple Worldwide Developer Relations Certification Authority
     - curl https://www.apple.com/certificateauthority/AppleWWDRCAG3.cer --output $HOME/AppleWWDRCAG3.cer --silent
-    - security import $HOME/AppleWWDRCAG3.cer -k build.keychain -T /usr/bin/codesign
+    - security import $HOME/AppleWWDRCAG3.cer -k /Library/Keychains/System.keychain -T /usr/bin/codesign
     # 2) Developer Authentication Certification Authority
     - curl https://www.apple.com/certificateauthority/DeveloperIDG2CA.cer --output $HOME/DeveloperIDG2CA.cer --silent
-    - security import $HOME/DeveloperIDG2CA.cer -k build.keychain -T /usr/bin/codesign
+    - security import $HOME/DeveloperIDG2CA.cer -k /Library/Keychains/System.keychain -T /usr/bin/codesign
     # 3) Developer ID
     - security import certificate.p12 -k build.keychain -P "$MACOS_CERTIFICATE_PWD" -T /usr/bin/codesign
     # Delete the files, we no longer need them
diff --git a/appveyor.yml b/appveyor.yml
index eee7e189b..195031c5d 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -630,10 +630,10 @@ for:
     # Add certificates to keychain and allow codesign to access them
     # 1) Apple Worldwide Developer Relations Certification Authority
     - curl https://www.apple.com/certificateauthority/AppleWWDRCAG3.cer --output $HOME/AppleWWDRCAG3.cer --silent
-    - security import $HOME/AppleWWDRCAG3.cer -k build.keychain -T /usr/bin/codesign
+    - security import $HOME/AppleWWDRCAG3.cer -k /Library/Keychains/System.keychain -T /usr/bin/codesign
     # 2) Developer Authentication Certification Authority
     - curl https://www.apple.com/certificateauthority/DeveloperIDG2CA.cer --output $HOME/DeveloperIDG2CA.cer --silent
-    - security import $HOME/DeveloperIDG2CA.cer -k build.keychain -T /usr/bin/codesign
+    - security import $HOME/DeveloperIDG2CA.cer -k /Library/Keychains/System.keychain -T /usr/bin/codesign
     # 3) Developer ID
     - security import certificate.p12 -k build.keychain -P "$MACOS_CERTIFICATE_PWD" -T /usr/bin/codesign
     # Delete the files, we no longer need them