diff --git a/.github/workflows/android_intent_plus.yaml b/.github/workflows/android_intent_plus.yaml
index 60fc045b16..99352f7f28 100644
--- a/.github/workflows/android_intent_plus.yaml
+++ b/.github/workflows/android_intent_plus.yaml
@@ -58,7 +58,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        android-api-level: [ 22, 26, 31, 34 ]
+        android-api-level: [ 24, 29, 32, 36 ]
 
     steps:
       - name: "Checkout repository"
diff --git a/.github/workflows/battery_plus.yaml b/.github/workflows/battery_plus.yaml
index bb44d444ae..e1e7ae55ba 100644
--- a/.github/workflows/battery_plus.yaml
+++ b/.github/workflows/battery_plus.yaml
@@ -62,7 +62,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        android-api-level: [ 22, 26, 31, 34 ]
+        android-api-level: [ 24, 29, 32, 36 ]
 
     steps:
       - name: "Checkout repository"
diff --git a/.github/workflows/device_info_plus.yaml b/.github/workflows/device_info_plus.yaml
index cf2bf25765..9c34e2e300 100644
--- a/.github/workflows/device_info_plus.yaml
+++ b/.github/workflows/device_info_plus.yaml
@@ -62,7 +62,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        android-api-level: [ 22, 26, 31, 34 ]
+        android-api-level: [ 24, 29, 32, 36 ]
 
     steps:
       - name: "Checkout repository"
diff --git a/.github/workflows/network_info_plus.yaml b/.github/workflows/network_info_plus.yaml
index b80d549d5c..887dce82c8 100644
--- a/.github/workflows/network_info_plus.yaml
+++ b/.github/workflows/network_info_plus.yaml
@@ -61,7 +61,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        android-api-level: [ 22, 26, 31, 34 ]
+        android-api-level: [ 24, 29, 32, 36 ]
 
     steps:
       - name: "Checkout repository"
diff --git a/.github/workflows/package_info_plus.yaml b/.github/workflows/package_info_plus.yaml
index 5bf0ab7289..bb231c4bbe 100644
--- a/.github/workflows/package_info_plus.yaml
+++ b/.github/workflows/package_info_plus.yaml
@@ -62,7 +62,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        android-api-level: [ 22, 26, 31, 34 ]
+        android-api-level: [ 24, 29, 32, 36 ]
 
     steps:
       - name: "Checkout repository"
diff --git a/.github/workflows/sensors_plus.yaml b/.github/workflows/sensors_plus.yaml
index 9fc529aeeb..b9dc4e4f46 100644
--- a/.github/workflows/sensors_plus.yaml
+++ b/.github/workflows/sensors_plus.yaml
@@ -58,7 +58,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        android-api-level: [ 22, 26, 31, 34 ]
+        android-api-level: [ 24, 29, 32, 36 ]
 
     steps:
       - name: "Checkout repository"
diff --git a/.github/workflows/share_plus.yaml b/.github/workflows/share_plus.yaml
index f32be1e469..5a80efb26d 100644
--- a/.github/workflows/share_plus.yaml
+++ b/.github/workflows/share_plus.yaml
@@ -61,7 +61,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        android-api-level: [ 22, 26, 31, 34 ]
+        android-api-level: [ 24, 29, 32, 36 ]
 
     steps:
       - name: "Checkout repository"