diff --git a/.github/workflows/windows.yml b/.github/workflows/windows.yml
index 21f4c0a3877..b8be054d9d9 100644
--- a/.github/workflows/windows.yml
+++ b/.github/workflows/windows.yml
@@ -85,7 +85,7 @@ jobs:
       - name: Upload
         if: ${{ inputs.upload }}
         run: |
-          python mach upload-nightly win --secret-from-environment `
+          python mach upload-nightly windows-msvc --secret-from-environment `
             --github-release-id ${{ inputs.github-release-id }}
         env:
           S3_UPLOAD_CREDENTIALS: ${{ secrets.S3_UPLOAD_CREDENTIALS }}
diff --git a/python/servo/package_commands.py b/python/servo/package_commands.py
index b9c70a22f50..555a87a4127 100644
--- a/python/servo/package_commands.py
+++ b/python/servo/package_commands.py
@@ -53,15 +53,9 @@ PACKAGES = {
     'linux': [
         'release/servo-tech-demo.tar.gz',
     ],
-    'linux-layout2020': [
-        'release/servo-tech-demo.tar.gz',
-    ],
     'mac': [
         'release/servo-tech-demo.dmg',
     ],
-    'mac-layout2020': [
-        'release/servo-tech-demo.dmg',
-    ],
     'macbrew': [
         'release/brew/servo.tar.gz',
     ],
@@ -73,10 +67,6 @@ PACKAGES = {
         r'release\msi\Servo.exe',
         r'release\msi\Servo.zip',
     ],
-    'windows-msvc-layout2020': [
-        r'release\msi\Servo.exe',
-        r'release\msi\Servo.zip',
-    ],
 }