diff --git a/scripts/devops_tasks/trust_proxy_cert.py b/scripts/devops_tasks/trust_proxy_cert.py
index 57ddb4b5d3ed..7c767179d57e 100644
--- a/scripts/devops_tasks/trust_proxy_cert.py
+++ b/scripts/devops_tasks/trust_proxy_cert.py
@@ -33,7 +33,10 @@ def combine_cert_file():
     print("Set the following certificate paths:")
     print("\tSSL_CERT_DIR={}".format(os.path.dirname(COMBINED_LOCATION)))
     print("\tREQUESTS_CA_BUNDLE={}".format(COMBINED_LOCATION))
+    print("\tDEFAULT_CA_BUNDLE_PATH={}".format(COMBINED_LOCATION))
 
     if os.getenv('TF_BUILD', False):
         print("##vso[task.setvariable variable=SSL_CERT_DIR]{}".format(os.path.dirname(COMBINED_LOCATION)))
         print("##vso[task.setvariable variable=REQUESTS_CA_BUNDLE]{}".format(COMBINED_LOCATION))
+        print("##vso[task.setvariable variable=DEFAULT_CA_BUNDLE_PATH]{}".format(COMBINED_LOCATION))
+
diff --git a/tools/azure-sdk-tools/pypi_tools/pypi.py b/tools/azure-sdk-tools/pypi_tools/pypi.py
index 08fa20691755..5d41d4330f19 100644
--- a/tools/azure-sdk-tools/pypi_tools/pypi.py
+++ b/tools/azure-sdk-tools/pypi_tools/pypi.py
@@ -14,7 +14,7 @@ def get_pypi_xmlrpc_client():
 class PyPIClient:
     def __init__(self, host="https://pypi.org"):
         self._host = host
-        self._http = PoolManager(retries=Retry(raise_on_status=True))
+        self._http = PoolManager(retries=Retry(total=3, raise_on_status=True))
 
     def project(self, package_name):
         response = self._http.request(