diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml
index d19aba5..704d6a7 100644
--- a/.github/workflows/lint.yml
+++ b/.github/workflows/lint.yml
@@ -1,5 +1,13 @@
 name: Lint
-on: [push, pull_request_target]
+on:
+  push:
+    paths:
+      - '*.lua'
+      - '.github/workflows/lint.yml'
+  pull_request_target:
+    paths:
+      - '*.lua'
+      - '.github/workflows/lint.yml'
 jobs:
   lint:
     name: Lint Resource
diff --git a/.github/workflows/release-action.yml b/.github/workflows/release-action.yml
index e8b7c54..b1e3196 100644
--- a/.github/workflows/release-action.yml
+++ b/.github/workflows/release-action.yml
@@ -34,10 +34,24 @@ jobs:
                 app-id: ${{ secrets.APP_ID }}
                 private-key: ${{ secrets.PRIVATE_KEY }}
 
+            - name: Update CHANGELOG
+              id: changelog
+              uses: requarks/changelog-action@v1
+              with:
+                token: ${{ steps.generate_token.outputs.token }}
+                tag: ${{ github.ref_name }}
+                includeInvalidCommits: true
+                useGitmojis: false
+                writeToFile: false
+
             - name: Create Release
-              uses: marvinpinto/action-automatic-releases@latest
+              uses: ncipollo/release-action@v1.14.0
               with:
-                title: ${{ github.ref_name }}
-                repo_token: '${{ steps.generate_token.outputs.token }}'
-                prerelease: false
-                files: ${{ github.event.repository.name }}.zip
+                allowUpdates: true
+                draft: false
+                makeLatest: true
+                name: ${{ github.ref_name }}
+                tag: ${{ github.ref_name }}
+                body: ${{ steps.changelog.outputs.changes }}
+                artifacts: ${{ github.event.repository.name }}.zip
+                token: ${{ steps.generate_token.outputs.token }}
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index 0fe126a..f5cc276 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -39,8 +39,4 @@ jobs:
           add: fxmanifest.lua
           push: true
           message: 'chore: bump manifest version to ${{ inputs.version }}'
-
-      - name: Push Git Tag
-        run: |
-          git tag ${{ inputs.version }}
-          git push origin ${{ inputs.version }}
+          tag: ${{ inputs.version }}