diff --git a/.github/workflows/android.yml b/.github/workflows/android.yml
index b1fd1ba2b989e..b1ae904dd8109 100644
--- a/.github/workflows/android.yml
+++ b/.github/workflows/android.yml
@@ -6,6 +6,13 @@ on:
         required: false
         default: "release"
         type: string
+      upload:
+        required: false
+        default: false
+        type: boolean
+      github-release-id:
+        required: false
+        type: string
   workflow_dispatch:
     inputs:
       profile:
diff --git a/.github/workflows/nightly.yml b/.github/workflows/nightly.yml
index 04aace01f52c0..038619a8b3e78 100644
--- a/.github/workflows/nightly.yml
+++ b/.github/workflows/nightly.yml
@@ -69,43 +69,57 @@ jobs:
       RELEASE_ID: ${{ needs.create-draft-release.outputs.release-id }}
     needs:
       - create-draft-release
-      - upload-linux
-      - upload-win
-      - upload-mac
+      # - upload-linux
+      # - upload-win
+      # - upload-mac
+      - upload-android
 
-  upload-win:
-    # This job is only useful when run on upstream servo.
-    if: github.repository == 'servo/servo' || github.event_name == 'workflow_dispatch'
-    name: Upload nightly (Windows)
-    needs:
-      - create-draft-release
-    uses: ./.github/workflows/windows.yml
-    with:
-      profile: "production"
-      upload: true
-      github-release-id: ${{ needs.create-draft-release.outputs.release-id }}
-    secrets: inherit
-
-  upload-mac:
-    # This job is only useful when run on upstream servo.
-    if: github.repository == 'servo/servo' || github.event_name == 'workflow_dispatch'
-    name: Upload nightly (macOS)
-    needs:
-      - create-draft-release
-    uses: ./.github/workflows/mac.yml
-    with:
-      profile: "production"
-      upload: true
-      github-release-id: ${{ needs.create-draft-release.outputs.release-id }}
-    secrets: inherit
+  # upload-win:
+  #   # This job is only useful when run on upstream servo.
+  #   if: github.repository == 'servo/servo' || github.event_name == 'workflow_dispatch'
+  #   name: Upload nightly (Windows)
+  #   needs:
+  #     - create-draft-release
+  #   uses: ./.github/workflows/windows.yml
+  #   with:
+  #     profile: "production"
+  #     upload: true
+  #     github-release-id: ${{ needs.create-draft-release.outputs.release-id }}
+  #   secrets: inherit
+  #
+  # upload-mac:
+  #   # This job is only useful when run on upstream servo.
+  #   if: github.repository == 'servo/servo' || github.event_name == 'workflow_dispatch'
+  #   name: Upload nightly (macOS)
+  #   needs:
+  #     - create-draft-release
+  #   uses: ./.github/workflows/mac.yml
+  #   with:
+  #     profile: "production"
+  #     upload: true
+  #     github-release-id: ${{ needs.create-draft-release.outputs.release-id }}
+  #   secrets: inherit
+  #
+  # upload-linux:
+  #   # This job is only useful when run on upstream servo.
+  #   if: github.repository == 'servo/servo' || github.event_name == 'workflow_dispatch'
+  #   name: Upload nightly (Linux)
+  #   needs:
+  #     - create-draft-release
+  #   uses: ./.github/workflows/linux.yml
+  #   with:
+  #     profile: "production"
+  #     upload: true
+  #     github-release-id: ${{ needs.create-draft-release.outputs.release-id }}
+  #   secrets: inherit
 
-  upload-linux:
+  upload-android:
     # This job is only useful when run on upstream servo.
     if: github.repository == 'servo/servo' || github.event_name == 'workflow_dispatch'
-    name: Upload nightly (Linux)
+    name: Upload nightly (Android)
     needs:
       - create-draft-release
-    uses: ./.github/workflows/linux.yml
+    uses: ./.github/workflows/android.yml
     with:
       profile: "production"
       upload: true