diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 648f165..8aa6caf 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -18,17 +18,12 @@ jobs:
         python-version: ["3.8", "3.9", "3.10"]
         include:
           # End-of-life Python versions are not available anymore with ubuntu-latest
-          - os: ubuntu-20.04
-            python-version: "2.7"
           - os: ubuntu-20.04
             python-version: "3.5"
           - os: ubuntu-20.04
             python-version: "3.6"
           - os: ubuntu-20.04
             python-version: "3.7"
-          # Kodi Leia on Windows uses a bundled Python 2.7.
-          - os: windows-latest
-            python-version: "2.7"
     steps:
       - name: Check out ${{ github.sha }} from repository ${{ github.repository }}
         uses: actions/checkout@v3
diff --git a/scripts/build.py b/scripts/build.py
index bb62c77..a028c67 100755
--- a/scripts/build.py
+++ b/scripts/build.py
@@ -107,9 +107,9 @@ def modify_xml(file, version, news, python=None):
             shutil.copytree(os.path.join(BRANDS_DIR, brand), dest, dirs_exist_ok=True)
 
             # Update addon.xml for matrix and create zip
-            modify_xml(os.path.join(dest, 'addon.xml'), addon_info['version'] + '+matrix.1', addon_info['news'])
+            modify_xml(os.path.join(dest, 'addon.xml'), addon_info['version'] + '+matrix.1', addon_info['news'], '3.0.0')
             shutil.make_archive(os.path.join(DIST_DIR, "%s-%s+matrix.1" % (brand, addon_info['version'])), 'zip', DIST_DIR, brand)
 
             # Modify addon.xml for leia and create zip
-            modify_xml(os.path.join(dest, 'addon.xml'), addon_info['version'], addon_info['news'], '2.26.0')
-            shutil.make_archive(os.path.join(DIST_DIR, "%s-%s" % (brand, addon_info['version'])), 'zip', DIST_DIR, brand)
+            # modify_xml(os.path.join(dest, 'addon.xml'), addon_info['version'], addon_info['news'], '2.26.0')
+            # shutil.make_archive(os.path.join(DIST_DIR, "%s-%s" % (brand, addon_info['version'])), 'zip', DIST_DIR, brand)
diff --git a/scripts/publish.py b/scripts/publish.py
index be26674..f7b7b4c 100755
--- a/scripts/publish.py
+++ b/scripts/publish.py
@@ -99,7 +99,7 @@ def create_addon_branch(repo, branch, source, addon_info, gh_username, gh_token,
         shell('git', 'fetch', '-f', 'upstream', branch)  # Fetch upstream
     else:
         # Clone the upstream repo
-        shell('git', 'clone', '--branch', branch, '--origin', 'upstream', '--single-branch', 'git://github.com/xbmc/{}.git'.format(repo))
+        shell('git', 'clone', '--branch', branch, '--origin', 'upstream', '--single-branch', 'https://github.com/xbmc/{}.git'.format(repo))
         os.chdir(repo)
 
     # Create local branch