diff --git a/Jenkinsfile b/Jenkinsfile
index d54e534..8678bf2 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -137,7 +137,7 @@
     },
     run: {
       // Fabric Crashlytics / Firebase App Distribution only support APKs as of June 2020
-      if (! deployBranches.contains(lazyConfig['branch']) && lazyConfig['branch'] != workingBranch && lazyConfig.env.RELEASE )
+      if (env.ANDROID_KEYALIAS != 'upload')
           fastLane('android', 'build_apk')
       else
           fastLane('android', 'build')
@@ -152,7 +152,7 @@
       junit(testResults: 'fastlane/report.xml,**/build/test-results/*/*.xml', allowEmptyResults: true)
 
       // Fabric Crashlytics / Firebase App Distribution only support APKs as of June 2020
-      if (! deployBranches.contains(lazyConfig['branch']) && lazyConfig['branch'] != workingBranch && lazyConfig.env.RELEASE )
+      if (env.ANDROID_KEYALIAS != 'upload')
           archiveArtifacts(artifacts: "${buildDirApk}/**", allowEmptyArchive: false)
       else
           archiveArtifacts(artifacts: "${buildDir}/**", allowEmptyArchive: false)
@@ -165,7 +165,7 @@
   onlyif = (! deployBranches.contains(lazyConfig['branch']) && lazyConfig['branch'] != workingBranch && lazyConfig.env.RELEASE )
   tasks = [
     pre: {
-      if (! deployBranches.contains(lazyConfig['branch']) && lazyConfig['branch'] != workingBranch && lazyConfig.env.RELEASE )
+      if (env.ANDROID_KEYALIAS != 'upload')
         unarchive(mapping:["${buildDirApk}/" : '.'])
       else
         unarchive(mapping:["${buildDir}/" : '.'])
@@ -240,7 +240,7 @@
   input = 'Deploy to internal testers?'
   tasks = [
     pre: {
-      if (! deployBranches.contains(lazyConfig['branch']) && lazyConfig['branch'] != workingBranch && lazyConfig.env.RELEASE )
+      if (env.ANDROID_KEYALIAS != 'upload')
         unarchive(mapping:["${buildDirApk}/" : '.'])
       else
         unarchive(mapping:["${buildDir}/" : '.'])
@@ -267,7 +267,7 @@
   input = 'Deploy to alpha users?'
   tasks = [
     pre: {
-      if (! deployBranches.contains(lazyConfig['branch']) && lazyConfig['branch'] != workingBranch && lazyConfig.env.RELEASE )
+      if (env.ANDROID_KEYALIAS != 'upload')
         unarchive(mapping:["${buildDirApk}/" : '.'])
       else
         unarchive(mapping:["${buildDir}/" : '.'])
@@ -297,7 +297,7 @@
   input = 'Promote to beta users?'
   tasks = [
     pre: {
-      if (! deployBranches.contains(lazyConfig['branch']) && lazyConfig['branch'] != workingBranch && lazyConfig.env.RELEASE )
+      if (env.ANDROID_KEYALIAS != 'upload')
         unarchive(mapping:["${buildDirApk}/" : '.'])
       else
         unarchive(mapping:["${buildDir}/" : '.'])