diff --git a/mobile/android/mach_commands.py b/mobile/android/mach_commands.py
index 598a8703a915..ecb5c286d37c 100755
--- a/mobile/android/mach_commands.py
+++ b/mobile/android/mach_commands.py
@@ -55,7 +55,7 @@ class MachCommands(MachCommandBase):
             import taskcluster_urls
             from taskgraph.util.taskcluster import get_root_url
             return taskcluster_urls.api(
-                get_root_url(), 'queue', 'v1', 'task/{}/runs/{}/artifacts/{}'.format(
+                get_root_url(False), 'queue', 'v1', 'task/{}/runs/{}/artifacts/{}'.format(
                     os.environ['TASK_ID'], os.environ['RUN_ID'], artifactdir))
         else:
             return os.path.join(self.topobjdir, objdir)
diff --git a/python/mozrelease/mozrelease/buglist_creator.py b/python/mozrelease/mozrelease/buglist_creator.py
index 135af3168ff3..82732b6acd99 100644
--- a/python/mozrelease/mozrelease/buglist_creator.py
+++ b/python/mozrelease/mozrelease/buglist_creator.py
@@ -218,9 +218,8 @@ Task group: [{task_group_id}](https://tools.taskcluster.net/groups/{task_group_i
 
     subject = '{} Build of {} {} build {}'.format(subject_prefix, product, version, build_number)
 
-    notify_options = optionsFromEnvironment({'rootUrl': get_root_url()})
-    if 'TASKCLUSTER_PROXY_URL' in os.environ:
-        notify_options['rootUrl'] = os.environ['TASKCLUSTER_PROXY_URL']
+    use_proxy = 'TASKCLUSTER_PROXY_URL' in os.environ
+    notify_options = optionsFromEnvironment({'rootUrl': get_root_url(use_proxy)})
     notify = Notify(notify_options)
     for address in addresses:
         notify.email({