diff --git a/.ci/deploy.ps1 b/.ci/deploy.ps1
index 4981faa98..b326a8afb 100644
--- a/.ci/deploy.ps1
+++ b/.ci/deploy.ps1
@@ -4,7 +4,7 @@ $Filename = "qb64_${Timestamp}_$($Env:GITHUB_SHA.substring(0,7))_win-${Env:PLATF
 
 Set-Location ..
 7z a '-xr@qb64\.ci\common-exclusion.list' '-xr@qb64\.ci\win-exclusion.list' $Filename qb64
-$OldFiles = aws --output json --query Contents[].Key s3api list-objects --bucket $Bucket --prefix win-$Env:PLATFORM | ConvertFrom-Json
+$OldFiles = aws ${Env:S3_ENDPOINT} --output json --query Contents[].Key s3api list-objects --bucket $Bucket --prefix win-${Env:PLATFORM} | ConvertFrom-Json
 aws s3 cp $Filename "s3://${Bucket}/win-${Env:PLATFORM}/"
 Set-Content -Path latest.txt -NoNewline -Value $Filename
 foreach ($f in $OldFiles) {
diff --git a/.ci/deploy.sh b/.ci/deploy.sh
index d9c374069..03174d474 100755
--- a/.ci/deploy.sh
+++ b/.ci/deploy.sh
@@ -8,7 +8,7 @@ cd ..
 tar --create --auto-compress --file ${filename} --exclude-from=qb64/.ci/common-exclusion.list --exclude-from=qb64/.ci/$OS-exclusion.list qb64
 
 current_files=$(aws --output text --query 'Contents[].Key' s3api list-objects --bucket ${BUCKET} --prefix ${OS})
-aws s3 cp ${filename} s3://${BUCKET}/${OS}/
+aws s3 ${S3_ENDPOINT} cp ${filename} s3://${BUCKET}/${OS}/
 echo -n $(basename "${filename}") > latest.txt
 for f in $current_files; do
     aws s3 rm s3://${BUCKET}/$f
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index 7c9b7a5a8..4c33e0bca 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -15,16 +15,12 @@ jobs:
       run: .ci/bootstrap.sh lnx
     - name: Compile
       run: .ci/compile.sh
-    - name: Setup aws
-      if: github.event_name == 'push'
-      uses: aws-actions/configure-aws-credentials@v1
-      with:
-        aws-access-key-id: ${{ secrets.AWS_ACCESS_KEY_ID }}
-        aws-secret-access-key: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
-        aws-region: us-east-2
     - name: Publish to S3
       if: github.event_name == 'push'
       run: .ci/deploy.sh lnx
+      env:
+        AWS_ACCESS_KEY_ID: ${{ secrets.AWS_ACCESS_KEY_ID }}
+        AWS_SECRET_ACCESS_KEY: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
 
   macos-build:
     runs-on: macos-latest
@@ -35,16 +31,12 @@ jobs:
       run: .ci/bootstrap.sh osx
     - name: Compile
       run: .ci/compile.sh
-    - name: Setup aws
-      if: github.event_name == 'push'
-      uses: aws-actions/configure-aws-credentials@v1
-      with:
-        aws-access-key-id: ${{ secrets.AWS_ACCESS_KEY_ID }}
-        aws-secret-access-key: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
-        aws-region: us-east-2
     - name: Publish to S3
       if: github.event_name == 'push'
       run: .ci/deploy.sh osx
+      env:
+        AWS_ACCESS_KEY_ID: ${{ secrets.AWS_ACCESS_KEY_ID }}
+        AWS_SECRET_ACCESS_KEY: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
 
   windows-x86-build:
     runs-on: windows-latest
@@ -57,16 +49,12 @@ jobs:
       run: .ci/bootstrap.bat
     - name: Compile
       run: .ci/compile.bat
-    - name: Setup aws
-      if: github.event_name == 'push'
-      uses: aws-actions/configure-aws-credentials@v1
-      with:
-        aws-access-key-id: ${{ secrets.AWS_ACCESS_KEY_ID }}
-        aws-secret-access-key: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
-        aws-region: us-east-2
     - name: Publish to S3
       if: github.event_name == 'push'
       run: .ci/deploy.ps1
+      env:
+        AWS_ACCESS_KEY_ID: ${{ secrets.AWS_ACCESS_KEY_ID }}
+        AWS_SECRET_ACCESS_KEY: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
 
   windows-x64-build:
     runs-on: windows-latest
@@ -79,14 +67,10 @@ jobs:
       run: .ci/bootstrap.bat
     - name: Compile
       run: .ci/compile.bat
-    - name: Setup aws
-      if: github.event_name == 'push'
-      uses: aws-actions/configure-aws-credentials@v1
-      with:
-        aws-access-key-id: ${{ secrets.AWS_ACCESS_KEY_ID }}
-        aws-secret-access-key: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
-        aws-region: us-east-2
     - name: Publish to S3
       if: github.event_name == 'push'
       run: .ci/deploy.ps1
+      env:
+        AWS_ACCESS_KEY_ID: ${{ secrets.AWS_ACCESS_KEY_ID }}
+        AWS_SECRET_ACCESS_KEY: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
 
diff --git a/.github/workflows/run.yml b/.github/workflows/run.yml
index 992417df8..f06f53d5e 100644
--- a/.github/workflows/run.yml
+++ b/.github/workflows/run.yml
@@ -24,16 +24,12 @@ jobs:
       with:
         github_token: ${{ secrets.GITHUB_TOKEN }}
         branch: development
-    - name: Setup aws
-      if: github.event_name == 'push'
-      uses: aws-actions/configure-aws-credentials@v1
-      with:
-        aws-access-key-id: ${{ secrets.AWS_ACCESS_KEY_ID }}
-        aws-secret-access-key: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
-        aws-region: us-east-2
     - name: Publish to S3
       if: github.event_name == 'push'
       run: .ci/deploy.sh lnx
+      env:
+        AWS_ACCESS_KEY_ID: ${{ secrets.AWS_ACCESS_KEY_ID }}
+        AWS_SECRET_ACCESS_KEY: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
 
   macos-build:
     runs-on: macos-latest
@@ -44,16 +40,12 @@ jobs:
       run: .ci/bootstrap.sh osx
     - name: Compile
       run: .ci/compile.sh
-    - name: Setup aws
-      if: github.event_name == 'push'
-      uses: aws-actions/configure-aws-credentials@v1
-      with:
-        aws-access-key-id: ${{ secrets.AWS_ACCESS_KEY_ID }}
-        aws-secret-access-key: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
-        aws-region: us-east-2
     - name: Publish to S3
       if: github.event_name == 'push'
       run: .ci/deploy.sh osx
+      env:
+        AWS_ACCESS_KEY_ID: ${{ secrets.AWS_ACCESS_KEY_ID }}
+        AWS_SECRET_ACCESS_KEY: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
 
   windows-x86-build:
     runs-on: windows-latest
@@ -66,16 +58,12 @@ jobs:
       run: .ci/bootstrap.bat
     - name: Compile
       run: .ci/compile.bat
-    - name: Setup aws
-      if: github.event_name == 'push'
-      uses: aws-actions/configure-aws-credentials@v1
-      with:
-        aws-access-key-id: ${{ secrets.AWS_ACCESS_KEY_ID }}
-        aws-secret-access-key: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
-        aws-region: us-east-2
     - name: Publish to S3
       if: github.event_name == 'push'
       run: .ci/deploy.ps1
+      env:
+        AWS_ACCESS_KEY_ID: ${{ secrets.AWS_ACCESS_KEY_ID }}
+        AWS_SECRET_ACCESS_KEY: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
 
   windows-x64-build:
     runs-on: windows-latest
@@ -88,13 +76,9 @@ jobs:
       run: .ci/bootstrap.bat
     - name: Compile
       run: .ci/compile.bat
-    - name: Setup aws
-      if: github.event_name == 'push'
-      uses: aws-actions/configure-aws-credentials@v1
-      with:
-        aws-access-key-id: ${{ secrets.AWS_ACCESS_KEY_ID }}
-        aws-secret-access-key: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
-        aws-region: us-east-2
     - name: Publish to S3
       if: github.event_name == 'push'
       run: .ci/deploy.ps1
+      env:
+        AWS_ACCESS_KEY_ID: ${{ secrets.AWS_ACCESS_KEY_ID }}
+        AWS_SECRET_ACCESS_KEY: ${{ secrets.AWS_SECRET_ACCESS_KEY }}