diff --git a/.gitattributes b/.gitattributes
new file mode 100644
index 0000000..8397117
--- /dev/null
+++ b/.gitattributes
@@ -0,0 +1,4 @@
+.gitignore export-ignore
+.gitattributes export-ignore
+.github export-ignore
+tests/ export-ignore
\ No newline at end of file
diff --git a/.github/workflows/addon-check.yml b/.github/workflows/addon-check.yml
index 6f266f1..7138c09 100644
--- a/.github/workflows/addon-check.yml
+++ b/.github/workflows/addon-check.yml
@@ -1,29 +1,16 @@
-name: Addon Checker
+name: Kodi Addon-Check
 
 on: [push]
 
 jobs:
-  build:
-
-    env:
-      BRANCH: gotham # Replace to match your case
-
+  kodi-addon-checker:
     runs-on: ubuntu-latest
-    strategy:
-      max-parallel: 4
-      matrix:
-        python-version: [3.7]
-
+    name: Kodi addon checker
     steps:
-    - uses: actions/checkout@v1
-    - name: Set up Python ${{ matrix.python-version }}
-      uses: actions/setup-python@v1
+    - name: Checkout
+      uses: actions/checkout@v1
+    - name: Kodi addon checker validation
+      id: kodi-addon-checker
+      uses: xbmc/action-kodi-addon-checker@v1.0
       with:
-        python-version: ${{ matrix.python-version }}
-    - name: Install dependencies
-      run: |
-        python -m pip install --upgrade pip
-        pip install kodi-addon-checker
-    - name: Addon check
-      run: |
-        kodi-addon-checker --branch=${{env.BRANCH}} .
+        kodi-version: gotham
\ No newline at end of file
diff --git a/.github/workflows/addon-submitter.yml b/.github/workflows/addon-submitter.yml
new file mode 100644
index 0000000..86105f7
--- /dev/null
+++ b/.github/workflows/addon-submitter.yml
@@ -0,0 +1,45 @@
+name: Kodi Addon-Submitter
+
+on:
+  create:
+    tags:
+      - v*
+
+jobs:
+  kodi-addon-submitter:
+    runs-on: ubuntu-latest
+    name: Kodi addon submitter
+    steps:
+    - name: Checkout
+      uses: actions/checkout@v1
+    - name: Generate distribution zip and submit to official kodi repository
+      id: kodi-addon-submitter
+      uses: xbmc/action-kodi-addon-submitter@v1.0
+      with: # Replace all the below values
+        kodi-repository: repo-plugins
+        kodi-version: gotham
+        addon-id: plugin.video.vimcasts
+      env: # Make sure you create the below secrets (GH_TOKEN and EMAIL)
+        GH_USERNAME: enenbot
+        GH_TOKEN: ${{secrets.GH_TOKEN}}
+        EMAIL: ${{secrets.EMAIL}}
+    - name: Create Github Release
+      id: create_release
+      uses: actions/create-release@v1.0.0
+      env:
+        GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+      with:
+        tag_name: ${{ github.ref }}
+        release_name: Release ${{ github.ref }}
+        draft: false
+        prerelease: false
+    - name: Upload Addon zip to github release
+      id: upload-release-asset
+      uses: actions/upload-release-asset@v1.0.1
+      env:
+        GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+      with:
+        upload_url: ${{ steps.create_release.outputs.upload_url }}
+        asset_path: ${{ steps.kodi-addon-submitter.outputs.addon-zip }}
+        asset_name: ${{ steps.kodi-addon-submitter.outputs.addon-zip }}
+        asset_content_type: application/zip
\ No newline at end of file