diff --git a/build/azure-pipelines/darwin/codesign-darwin.yml b/build/azure-pipelines/darwin/codesign-darwin.yml
index 7578ef1d236b7f476e549c47f4408229affc14b1..e5d24c8aa0d0c0e92f599fc4de0b31f95274f015 100644
--- a/build/azure-pipelines/darwin/codesign-darwin.yml
+++ b/build/azure-pipelines/darwin/codesign-darwin.yml
@@ -11,7 +11,7 @@ steps:
     $(macos-developer-certificate)
     EOF
     base64 -D > $(agent.tempdirectory)/cert.p12
-    security import $(agent.tempdirectory)/cert.p12 -P "$(macos-developer-certificate-key)"
+    security import $(agent.tempdirectory)/cert.p12 -k ~/Library/Keychains/login.keychain -P "$(macos-developer-certificate-key)"
     curl -o $(agent.tempdirectory)/VSCode-darwin.zip https://vscode.blob.core.windows.net/public/VSCode-darwin.zip
     unzip $(agent.tempdirectory)/VSCode-darwin.zip -d $(agent.tempdirectory)
     codesign -s 99FM488X57 --deep --force --options runtime --entitlements build/azure-pipelines/darwin/entitlements.plist $(agent.tempdirectory)/Visual\ Studio\ Code\ -\ Insiders.app
diff --git a/build/azure-pipelines/product-build.yml b/build/azure-pipelines/product-build.yml
index c45cf14d02f11bc1c076ba17e501bd323214b7f2..79c844444293c0c77ae310c13d72e4c26ec0cb68 100644
--- a/build/azure-pipelines/product-build.yml
+++ b/build/azure-pipelines/product-build.yml
@@ -8,7 +8,7 @@ resources:
 
 jobs:
 - job: macOS
-  timeoutInMinutes: 180
+  timeoutInMinutes: 20
   pool:
     vmImage: macOS-latest
   steps: