diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index d9d38d51..f423fa2f 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -111,32 +111,17 @@ jobs:
           name: distribution
           path: build/distributions
 
-      - name: Create Draft Release
-        id: create_release
-        uses: actions/create-release@v1
+      - name: Create Release Draft
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-        with:
-          tag_name: ${{ github.ref_name }}
-          release_name: v${{ github.ref_name }}
-          draft: true
-          prerelease: false
-      - uses: actions/upload-release-asset@v1.0.2
-        env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-        with:
-          upload_url: ${{ steps.create_release.outputs.upload_url }}
-          asset_path: ./build/distributions/structurizr-site-generatr-${{ github.ref_name }}.tar.gz
-          asset_name: structurizr-site-generatr-${{ github.ref_name }}.tar.gz
-          asset_content_type: application/x-tar
-      - uses: actions/upload-release-asset@v1.0.2
+        run: |
+          gh release create v${{ github.ref_name }} \
+            --draft \
+            --title "v${{ github.ref_name }}"
+      - name: Upload Release Assets
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-        with:
-          upload_url: ${{ steps.create_release.outputs.upload_url }}
-          asset_path: ./build/distributions/structurizr-site-generatr-${{ github.ref_name }}.zip
-          asset_name: structurizr-site-generatr-${{ github.ref_name }}.zip
-          asset_content_type: application/zip
+        run: gh release upload v${{ github.ref_name }} ./build/distributions/*
 
   publish-example-site:
     runs-on: ubuntu-latest