diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 6b20465f7..f576a2e9b 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -94,6 +94,9 @@ jobs:
             buser: qfsbuild
     runs-on: ubuntu-latest
     env:
+      AWS_ACCESS_KEY_ID: ${{ github.secrets.AWS_ACCESS_KEY_ID }}
+      AWS_SECRET_ACCESS_KEY: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
+      AWS_DEFAULT_REGION: us-west-2
       BUILD_OS_NAME: linux
       BUILD_RUN_DOCKER: "yes"
       DISTRO: ${{ matrix.distro }}
@@ -117,16 +120,15 @@ jobs:
           && 'release' == matrix.btype
           && 'qfsbuild' == matrix.buser
           && 'yes' != matrix.codecov
-        env:
-          AWS_ACCESS_KEY_ID: ${{ github.secrets.AWS_ACCESS_KEY_ID }}
-          AWS_SECRET_ACCESS_KEY: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
-          AWS_DEFAULT_REGION: us-west-2
         run: aws s3 cp build/qfs-*.tgz s3://quantcast-qfs
 
   osx-build:
     runs-on: macos-latest
     env:
       BUILD_OS_NAME: osx
+      AWS_ACCESS_KEY_ID: ${{ secrets.AWS_ACCESS_KEY_ID }}
+      AWS_SECRET_ACCESS_KEY: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
+      AWS_DEFAULT_REGION: us-west-2
     steps:
       - name: Brew install
         run: |
@@ -143,10 +145,6 @@ jobs:
         if: |
           'refs/heads/master' == github.ref
           || startsWith(github.ref, 'refs/tags/')
-        env:
-          AWS_ACCESS_KEY_ID: ${{ secrets.AWS_ACCESS_KEY_ID }}
-          AWS_SECRET_ACCESS_KEY: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
-          AWS_DEFAULT_REGION: us-west-2
         run: aws s3 cp build/qfs-*.tgz s3://quantcast-qfs
 
   cygwin-build:
@@ -154,6 +152,9 @@ jobs:
     env:
       CYG_MIRROR: http://cygwin.mirror.constant.com
       DEPENDENCIES: gcc-g++,autoconf,automake,make,cmake,libboost-devel,libssl-devel,bzip2,python,git,libstdc++6-devel,libkrb5-devel,zlib-devel
+      AWS_ACCESS_KEY_ID: ${{ secrets.AWS_ACCESS_KEY_ID }}
+      AWS_SECRET_ACCESS_KEY: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
+      AWS_DEFAULT_REGION: us-west-2
     steps:
       - name: Set git to use LF
         run: |
@@ -233,10 +234,6 @@ jobs:
         if: |
           'refs/heads/master' == github.ref
           || startsWith(github.ref, 'refs/tags/')
-        env:
-          AWS_ACCESS_KEY_ID: ${{ secrets.AWS_ACCESS_KEY_ID }}
-          AWS_SECRET_ACCESS_KEY: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
-          AWS_DEFAULT_REGION: us-west-2
         shell: pwsh
         run: |
           aws s3 cp (Get-ChildItem "build\qfs-*.tgz").FullName `