diff --git a/.taskcluster.yml b/.taskcluster.yml
index 890eaf350..af91e664e 100644
--- a/.taskcluster.yml
+++ b/.taskcluster.yml
@@ -79,7 +79,9 @@ tasks:
           && . tools/taskcluster/get_third_party.sh
           && cp tools/gradle/taskcluster.properties ./user.properties
           && ./gradlew --no-daemon --console=plain clean assembleNoapi assembleGooglevr assembleWavevr assembleSvr assembleOculusvr
-          && . tools/taskcluster/sign.sh staging-signing-token
+          && python tools/taskcluster/fetch_secret.py -s project/firefoxreality/staging-signing-token -o token -n token
+          && python tools/taskcluster/sign_apk.py -t token
+          && python tools/taskcluster/archive_debug_apk.py
           && . tools/taskcluster/upload_symbols.sh
       artifacts:
         'public':
@@ -127,7 +129,9 @@ tasks:
           && . tools/taskcluster/get_third_party.sh
           && cp tools/gradle/taskcluster.properties ./user.properties
           && ./gradlew --no-daemon --console=plain clean `python tools/taskcluster/build_targets.py {{ event.version }}`
-          && . tools/taskcluster/sign.sh release-signing-token -r
+          && python tools/taskcluster/fetch_secret.py -s project/firefoxreality/release-signing-token -o token -n token
+          && python tools/taskcluster/sign_apk.py -t token -r
+          && python tools/taskcluster/archive_debug_apk.py
           && . tools/taskcluster/upload_symbols.sh
       artifacts:
         'public':
diff --git a/tools/taskcluster/sign.sh b/tools/taskcluster/sign.sh
deleted file mode 100644
index 59bc9bc65..000000000
--- a/tools/taskcluster/sign.sh
+++ /dev/null
@@ -1,4 +0,0 @@
-#!/bin/sh
-python tools/taskcluster/fetch_secret.py -s project/firefoxreality/$1 -o token -n token
-python tools/taskcluster/sign_apk.py -t token $2
-python tools/taskcluster/archive_debug_apk.py
diff --git a/tools/taskcluster/sign_apk.py b/tools/taskcluster/sign_apk.py
index 949bc8c6d..c0e25c530 100644
--- a/tools/taskcluster/sign_apk.py
+++ b/tools/taskcluster/sign_apk.py
@@ -13,7 +13,7 @@
 
 def main(name, argv):
    token = ''
-   sign_url = 'https://autograph-edge.stage.mozaws.net/sign'
+   sign_url = 'https://edge.stage.autograph.services.mozaws.net/sign'
    release = False
    try:
       opts, args = getopt.getopt(argv,"ht:r")
@@ -28,7 +28,7 @@ def main(name, argv):
          with open(arg, 'r') as tokenfile:
             token = tokenfile.read().rstrip()
       elif opt in ('-r'):
-         sign_url = 'https://autograph-edge.prod.mozaws.net/sign'
+         sign_url = 'https://edge.prod.autograph.services.mozaws.net/sign'
          release = True
 
    build_output_path = './app/build/outputs/apk'