diff --git a/.github/workflows/build_and_deploy.yaml b/.github/workflows/build_and_deploy.yaml
index 49e70338..eaaae413 100644
--- a/.github/workflows/build_and_deploy.yaml
+++ b/.github/workflows/build_and_deploy.yaml
@@ -206,6 +206,8 @@ jobs:
                   AWS_SECRET_ACCESS_KEY: ${{ secrets.CF_R2_TOKEN }}
                   R2_URL: ${{ vars.CF_R2_S3_API }}
                   DEPLOYMENT_DIR: ${{ needs.prepare.outputs.packages-dir }}
+                  # Workaround for https://www.cloudflarestatus.com/incidents/t5nrjmpxc1cj
+                  AWS_REQUEST_CHECKSUM_CALCULATION: when_required
 
             - name: Notify packages.element.io of new files
               if: needs.prepare.outputs.deploy == 'true'
@@ -285,5 +287,3 @@ jobs:
                   done
               env:
                   VERSION: ${{ github.event.release.tag_name }}
-                  # Workaround for https://www.cloudflarestatus.com/incidents/t5nrjmpxc1cj
-                  AWS_REQUEST_CHECKSUM_CALCULATION: when_required