diff --git a/.github/workflows/publish-addon.yml b/.github/workflows/publish-addon.yml
index dc25dda..fc539f2 100644
--- a/.github/workflows/publish-addon.yml
+++ b/.github/workflows/publish-addon.yml
@@ -22,7 +22,31 @@ jobs:
       run: |
         kodi-addon-checker --branch $TARGET_KODI_VER --allow-folder-id-mismatch $ADDON_NAME
 
-  publish:
+  github_release:
+    runs-on: ubuntu-latest
+    permissions:
+      contents: write
+
+    needs: check
+    if: github.ref_type == 'tag'
+    steps:
+    - uses: actions/checkout@v3
+    - name: Set up Python 3.11
+      uses: actions/setup-python@v4
+      with:
+        python-version: "3.11"
+    - name: Install addon submitter
+      run: |
+        pip install -q git+https://github.com/xbmc/kodi-addon-submitter.git
+    - name: Package addon
+      run: |
+        submit-addon -s -z $ADDON_NAME
+    - name: Publish release
+      uses: ncipollo/release-action@v1
+      with:
+        artifacts: "*.zip"
+
+  kodi_publish:
     runs-on: ubuntu-latest
 
     needs: check