diff --git a/.cirrus.yml b/.cirrus.yml
index 5309a502..6339a1ac 100644
--- a/.cirrus.yml
+++ b/.cirrus.yml
@@ -1,16 +1,3 @@
-test_task:
-  use_compute_credits: true
-  container:
-    matrix:
-      - image: erlang:23
-      - image: erlang:22
-      - image: erlang:21
-      - image: erlang:20
-      - image: erlang:19
-  test_script: |
-    ./bootstrap
-    ./rebar3 ct
-
 osx_test_task:
   osx_instance:
     image: mojave-base
@@ -19,53 +6,3 @@ osx_test_task:
     ./bootstrap
     ./rebar3 ct
 
-nightly_task:
-  container:
-    image: erlang:19
-  depends_on:
-    - test
-  only_if: $BRANCH == "master"
-  script: |
-    apt-get update
-    apt-get install -y s3cmd
-    ./bootstrap
-    s3cmd --access_key=$ACCESS_KEY --secret_key=$SECRET_KEY put ./rebar3 s3://rebar3-nightly
-  environment:
-    ACCESS_KEY: ENCRYPTED[86c639224b3cfc11ae5dbd48b13de5ff77dd5c75f1bf1808ddbbb5bc60049f16885b4e2e3a7981376cac562f7a2d176b]
-    SECRET_KEY: ENCRYPTED[189c3b982c2f846193bb34c3de86e0172b8a4c793699f64dc95bb9a1e6bbe83c252c77d37ea1503928aa9b41a3652ca3]
-
-# Removed while making pre-release -rc versions so they don't override the stable release in s3
-
-# release_task:
-#   container:
-#     image: erlang:18
-#   depends_on:
-#     - test
-#   only_if: $CIRRUS_TAG != ''
-#   script: |
-#     apt-get update
-#     apt-get install -y s3cmd
-#     ./bootstrap
-#     s3cmd --access_key=$ACCESS_KEY --secret_key=$SECRET_KEY put ./rebar3 s3://rebar3
-
-#     url_to_upload="https://uploads.github.com/repos/$CIRRUS_REPO_FULL_NAME/releases/$CIRRUS_RELEASE/assets?name=rebar3"
-#     curl -X POST \
-#     --data-binary @rebar3 \
-#     --header "Authorization: token $GITHUB_TOKEN" \
-#     --header "Content-Type: application/octet-stream" \
-#     $url_to_upload
-#   environment:
-#     ACCESS_KEY: ENCRYPTED[86c639224b3cfc11ae5dbd48b13de5ff77dd5c75f1bf1808ddbbb5bc60049f16885b4e2e3a7981376cac562f7a2d176b]
-#     SECRET_KEY: ENCRYPTED[189c3b982c2f846193bb34c3de86e0172b8a4c793699f64dc95bb9a1e6bbe83c252c77d37ea1503928aa9b41a3652ca3]
-#     GITUB_TOKEN: ENCRYPTED[ff884c4b0a4f2833b6c22c1fd6398879d58634d0f521e7efbd33f045fb785417f24da953cfbdaee563698501691e5970]
-
-
-# Windows CI appears broken for now and never passes
-#windows_test_task:
-#  windows_container:
-#    image: cirrusci/windowsservercore:2019
-#    os_version: 2019
-#  install_script: choco install -y erlang
-#  test_script: |
-#    ./bootstrap
-#    ./rebar3 ct
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index 09833dd3..9e6432f2 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -27,3 +27,16 @@ jobs:
       run: ./bootstrap
     - name: CT tests
       run: ./rebar3 ct
+
+    - name: Configure AWS credentials
+      if: matrix.otp_version == 19
+      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-1
+
+    - name: Copy rebar3 escript to S3
+      if: matrix.otp_version == 19
+      run: |
+        aws s3 sync ./rebar3 s3://rebar3-nightly
diff --git a/README.md b/README.md
index 6b448877..dfb99281 100644
--- a/README.md
+++ b/README.md
@@ -1,6 +1,6 @@
 # Rebar3
 
-[![Build Status](https://api.cirrus-ci.com/github/erlang/rebar3.svg)](https://cirrus-ci.com/github/erlang/rebar3) [![Windows build status](https://ci.appveyor.com/api/projects/status/yx4oitd9pvd2kab3?svg=true)](https://ci.appveyor.com/project/TristanSloughter/rebar3)
+![Build Status](https://github.com/erlang/rebar3/workflows/Common%20Test/badge.svg) [![OSX Build Status](https://api.cirrus-ci.com/github/erlang/rebar3.svg)](https://cirrus-ci.com/github/erlang/rebar3) [![Windows Build Status](https://ci.appveyor.com/api/projects/status/yx4oitd9pvd2kab3?svg=true)](https://ci.appveyor.com/project/TristanSloughter/rebar3)
 
 1. [What is Rebar3?](#what-is-rebar3)
 2. [Why Rebar3?](#why-rebar3)