diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index 9e6432f2..09833dd3 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -27,16 +27,3 @@ 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/.github/workflows/nightly.yml b/.github/workflows/nightly.yml
new file mode 100644
index 00000000..8c2021df
--- /dev/null
+++ b/.github/workflows/nightly.yml
@@ -0,0 +1,32 @@
+name: Nightly
+
+on:
+  push:
+    branches:
+      - 'master'
+
+jobs:
+  build:
+    name: Publish escript for every merge to master
+    runs-on: ubuntu-latest
+
+    container:
+      image: erlang:19
+
+    steps:
+    - uses: actions/checkout@v1
+    - name: Compile
+      run: ./bootstrap
+    - name: CT tests
+      run: ./rebar3 ct
+
+    - name: Configure AWS credentials
+      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
+      run: |
+        aws s3 sync ./rebar3 s3://rebar3-nightly