diff --git a/.ci/deploy.bat b/.ci/deploy.bat
index 3461a9e07..0466dd830 100644
--- a/.ci/deploy.bat
+++ b/.ci/deploy.bat
@@ -1,29 +1,9 @@
 @ECHO OFF
 SETLOCAL ENABLEEXTENSIONS ENABLEDELAYEDEXPANSION
 cd ..
+set BUCKET=qb64-dev-builds
 set TIMEX=%TIME: =0%
 set archive=qb64_%DATE:~10,4%-%DATE:~4,2%-%DATE:~7,2%-%TIMEX:~0,2%-%TIMEX:~3,2%-%TIMEX:~6,2%_%GITHUB_SHA:~0,7%_win-%PLATFORM%.7z
 7z a -xr@qb64\.ci\common-exclusion.list -xr@qb64\.ci\win-exclusion.list %archive% qb64
 
-FOR /L %%i IN (1,1,10) DO (
-    scp %archive% remote-server:autobuilds/development/
-    IF ERRORLEVEL 1 (
-        ECHO scp %archive% failed - attempt %%i/10
-    ) ELSE (
-        GOTO :doversion
-    )
-)
-
-:doversion
-
-set archive=versioninfo.txt
-echo Dev build generated on %DATE:~10,4%-%DATE:~4,2%-%DATE:~7,2%, from git ^<a href="https://github.com/QB64Team/qb64/commits/development" target="_blank"^>%GITHUB_SHA:~0,7%^</a^> > %archive%
-
-FOR /L %%i IN (1,1,10) DO (
-    scp %archive% remote-server:autobuilds/development/
-    IF ERRORLEVEL 1 (
-        ECHO scp %archive% failed - attempt %%i/10
-    ) ELSE (
-        EXIT /B 0
-    )
-)
+aws s3 cp %archive% s3://%BUCKET%/win-%PLATFORM%/
diff --git a/.github/workflows/run.yml b/.github/workflows/run.yml
index 6d36c81e1..0cd780ed8 100644
--- a/.github/workflows/run.yml
+++ b/.github/workflows/run.yml
@@ -58,7 +58,7 @@ jobs:
 
   windows-x86-build:
     runs-on: windows-latest
-    if: "contains(github.event.head_commit.message, 'ci-skip')"
+    if: "!contains(github.event.head_commit.message, 'ci-skip')"
     env:
       PLATFORM: x86
     steps:
@@ -67,17 +67,14 @@ jobs:
       run: .ci/bootstrap.bat
     - name: Compile
       run: .ci/compile.bat
-    - name: Set deployment SSH key
+    - name: Setup aws
       if: github.event_name == 'push'
-      uses: shimataro/ssh-key-action@v2.1.0
+      uses: aws-actions/configure-aws-credentials@v1
       with:
-        key: ${{ secrets.SSH_KEY }}
-        known_hosts: ${{ secrets.KNOWN_HOSTS }}
-        config: |
-          Host remote-server
-          HostName qb64.org
-          User m6rosupy1q2t
-    - name: Package and deploy
+        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.bat