diff --git a/.github/workflows/publish-assets.yml b/.github/workflows/publish-assets-develop.yml
similarity index 65%
rename from .github/workflows/publish-assets.yml
rename to .github/workflows/publish-assets-develop.yml
index 8155d36f35..f13d98e6a5 100644
--- a/.github/workflows/publish-assets.yml
+++ b/.github/workflows/publish-assets-develop.yml
@@ -3,9 +3,6 @@ name: Build and Publish Assets
 on:
   push:
     branches: [ develop ]
-  release:
-    types:
-      - published
 
 jobs:
   build:
@@ -34,7 +31,6 @@ jobs:
           tar -cvpzf $GITHUB_WORKSPACE/build/$GITHUB_SHA.tar.gz ./frappe-bench/sites/assets/js ./frappe-bench/sites/assets/css
 
       - name: Publish assets to S3
-        if: github.event == 'pull_request'
         uses: jakejarvis/s3-sync-action@master
         with:
           args: --acl public-read
@@ -45,21 +41,3 @@ jobs:
           AWS_S3_ENDPOINT: 'http://s3.fr-par.scw.cloud'
           AWS_REGION: 'fr-par'
           SOURCE_DIR: '$GITHUB_WORKSPACE/build'
-
-      - name: Attach Assets to Release
-        if: github.event == 'release'
-        uses: svenstaro/upload-release-action@v2
-        with:
-          repo_token: ${{ secrets.GITHUB_TOKEN }}
-          file: $GITHUB_WORKSPACE/build/$GITHUB_SHA.tar.gz
-          asset_name: assets.tar.gz
-          tag: ${{ github.ref }}
-          overwrite: true
-          body: "Assets automatically generated which may be used to avoid re-building on local benches"
-
-      - name: Generate Action Artifacts
-        if: always()
-        uses: actions/upload-artifact@v2
-        with:
-          name: assets
-          path: $GITHUB_WORKSPACE/build/$GITHUB_SHA.tar.gz
diff --git a/.github/workflows/publish-assets-releases.yml b/.github/workflows/publish-assets-releases.yml
new file mode 100644
index 0000000000..faeba15af4
--- /dev/null
+++ b/.github/workflows/publish-assets-releases.yml
@@ -0,0 +1,42 @@
+name: Build and Publish Assets built for releases
+
+on:
+  release:
+    types:
+      - created
+
+jobs:
+  build:
+    runs-on: ubuntu-latest
+
+    steps:
+      - uses: actions/checkout@v2
+        with:
+          path: 'frappe'
+      - uses: actions/setup-node@v1
+        with:
+          python-version: '12.x'
+      - uses: actions/setup-python@v2
+        with:
+          python-version: '3.6'
+      - name: Set up bench for current push
+        run: |
+          npm install -g yarn
+          pip3 install -U frappe-bench
+          bench init frappe-bench --no-procfile --no-backups --skip-assets --skip-redis-config-generation --python $(which python) --frappe-path $GITHUB_WORKSPACE/frappe
+          cd frappe-bench && bench build
+
+      - name: Package assets
+        run: |
+          mkdir -p $GITHUB_WORKSPACE/build
+          tar -cvpzf $GITHUB_WORKSPACE/build/$GITHUB_SHA.tar.gz ./frappe-bench/sites/assets/js ./frappe-bench/sites/assets/css
+
+      - name: Attach Assets to Release
+        uses: svenstaro/upload-release-action@v2
+        with:
+          repo_token: ${{ secrets.GITHUB_ASSETS_TOKEN }}
+          file: $GITHUB_WORKSPACE/build/$GITHUB_SHA.tar.gz
+          asset_name: assets.tar.gz
+          tag: ${{ github.ref }}
+          overwrite: true
+          body: "Assets automatically generated which may be used to avoid re-building on local benches"