diff --git a/.github/workflows/addon-validations.yml b/.github/workflows/addon-validations.yml
index 19ff0d110..5c6225afe 100644
--- a/.github/workflows/addon-validations.yml
+++ b/.github/workflows/addon-validations.yml
@@ -12,7 +12,12 @@ jobs:
     if: github.repository == 'anxdpanic/plugin.video.youtube'
 
     name: Add-on Validations
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-latest
+
+    strategy:
+      fail-fast: false
+      matrix:
+        python-version: [ '3.x' ]
 
     steps:
       - name: Checkout Add-on
@@ -20,6 +25,11 @@ jobs:
         with:
           path: ${{ github.event.repository.name }}
 
+      - name: Set up Python ${{ matrix.python-version }}
+        uses: actions/setup-python@v5
+        with:
+          python-version: ${{ matrix.python-version }}
+
       - name: Install dependencies
         run: |
           python -m pip install --upgrade pip
diff --git a/.github/workflows/make-release.yml b/.github/workflows/make-release.yml
index 5c1ccbd06..2595f53f0 100644
--- a/.github/workflows/make-release.yml
+++ b/.github/workflows/make-release.yml
@@ -11,7 +11,7 @@ jobs:
   release:
     if: github.repository == 'anxdpanic/plugin.video.youtube' || github.event_name == 'workflow_dispatch'
     name: Make Release
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-latest
     permissions:
       contents: write
 
diff --git a/.github/workflows/release-development-repository.yml b/.github/workflows/release-development-repository.yml
index 6a7a29fd2..be5bb6986 100644
--- a/.github/workflows/release-development-repository.yml
+++ b/.github/workflows/release-development-repository.yml
@@ -20,6 +20,11 @@ jobs:
     permissions:
       contents: write
 
+    strategy:
+      fail-fast: false
+      matrix:
+        python-version: [ '3.x' ]
+
     steps:
       - name: Get and set release status
         # workflow_dispatch: use pre-release variable for release status
@@ -38,10 +43,10 @@ jobs:
             echo "pre-release=false" >> $GITHUB_OUTPUT
           fi
 
-      - name: Setup Python
+      - name: Set up Python ${{ matrix.python-version }}
         uses: actions/setup-python@v5
         with:
-          python-version: '3.x'
+          python-version: ${{ matrix.python-version }}
 
       - name: Install dependencies
         # install lftp for mirroring repository
diff --git a/.github/workflows/submit-release.yml b/.github/workflows/submit-release.yml
index c8e64b499..b6b784e79 100644
--- a/.github/workflows/submit-release.yml
+++ b/.github/workflows/submit-release.yml
@@ -12,12 +12,12 @@ jobs:
   release:
     if: github.repository == 'anxdpanic/plugin.video.youtube' || github.event_name == 'workflow_dispatch'
     name: Submit Release
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-latest
 
     strategy:
       fail-fast: false
       matrix:
-        python-version: [ 3.9 ]
+        python-version: [ '3.x' ]
 
     steps:
       - name: Checkout Add-on
diff --git a/.github/workflows/sync-addon-metadata-translations.yml b/.github/workflows/sync-addon-metadata-translations.yml
index 8ce360ed1..ea1a10b79 100644
--- a/.github/workflows/sync-addon-metadata-translations.yml
+++ b/.github/workflows/sync-addon-metadata-translations.yml
@@ -14,10 +14,9 @@ jobs:
     runs-on: ubuntu-latest
 
     strategy:
-
       fail-fast: false
       matrix:
-        python-version: [ 3.9 ]
+        python-version: [ '3.x' ]
 
     steps: