diff --git a/.github/workflows/nightly.yml b/.github/workflows/nightly.yml
index 670aa14b5a7..12aec1ea428 100644
--- a/.github/workflows/nightly.yml
+++ b/.github/workflows/nightly.yml
@@ -19,6 +19,7 @@ jobs:
     with:
       layout: '2013'
       upload: true
+    secrets: inherit
 
   upload-mac:
     # This job is only useful when run on upstream servo.
@@ -28,6 +29,7 @@ jobs:
     with:
       layout: '2013'
       upload: true
+    secrets: inherit
 
   upload-linux:
     # This job is only useful when run on upstream servo.
@@ -37,6 +39,7 @@ jobs:
     with:
       layout: '2013'
       upload: true
+    secrets: inherit
 
   upload-linux-2020:
     # This job is only useful when run on upstream servo.
@@ -46,3 +49,4 @@ jobs:
     with:
       layout: '2020'
       upload: true
+    secrets: inherit
diff --git a/.github/workflows/windows.yml b/.github/workflows/windows.yml
index e2ba38d0e23..f4c3c0364de 100644
--- a/.github/workflows/windows.yml
+++ b/.github/workflows/windows.yml
@@ -82,6 +82,7 @@ jobs:
           path: C:\\a\\servo\\servo\\target/release/msi/Servo.exe
       - name: Upload
         if: ${{ inputs.upload }}
+        working-directory: "C:\\a\\${{ github.event.repository.name }}\\${{ github.event.repository.name }}"
         run: python mach upload-nightly windows-msvc --secret-from-environment
         env:
           S3_UPLOAD_CREDENTIALS: ${{ secrets.S3_UPLOAD_CREDENTIALS }}