diff --git a/.github/workflows/compose-test_airdcpp.yml b/.github/workflows/compose-test_airdcpp.yml
index 0020fbd..4a3515b 100644
--- a/.github/workflows/compose-test_airdcpp.yml
+++ b/.github/workflows/compose-test_airdcpp.yml
@@ -14,7 +14,10 @@ env:
 
 jobs:
   test:
-    runs-on: ubuntu-latest
+    strategy:
+      matrix:
+        platform: [ ubuntu-24.04 , ubuntu-24.04-arm ]
+    runs-on: ${{ matrix.platform }}
     steps:
       -
         name: "Git: Checkout"
diff --git a/.github/workflows/compose-test_certbot.yml b/.github/workflows/compose-test_certbot.yml
index 19222be..12f1776 100644
--- a/.github/workflows/compose-test_certbot.yml
+++ b/.github/workflows/compose-test_certbot.yml
@@ -14,7 +14,10 @@ env:
 
 jobs:
   test:
-    runs-on: ubuntu-latest
+    strategy:
+      matrix:
+        platform: [ ubuntu-24.04 , ubuntu-24.04-arm ]
+    runs-on: ${{ matrix.platform }}
     steps:
       -
         name: "Git: Checkout"
diff --git a/.github/workflows/compose-test_docker_sock.yml b/.github/workflows/compose-test_docker_sock.yml
index e96f669..47a8de4 100644
--- a/.github/workflows/compose-test_docker_sock.yml
+++ b/.github/workflows/compose-test_docker_sock.yml
@@ -14,7 +14,10 @@ env:
 
 jobs:
   test:
-    runs-on: ubuntu-latest
+    strategy:
+      matrix:
+        platform: [ ubuntu-24.04 , ubuntu-24.04-arm ]
+    runs-on: ${{ matrix.platform }}
     steps:
       -
         name: "Git: Checkout"
diff --git a/.github/workflows/compose-test_gitea.yml b/.github/workflows/compose-test_gitea.yml
index 8214365..54e5674 100644
--- a/.github/workflows/compose-test_gitea.yml
+++ b/.github/workflows/compose-test_gitea.yml
@@ -14,7 +14,10 @@ env:
 
 jobs:
   test:
-    runs-on: ubuntu-latest
+    strategy:
+      matrix:
+        platform: [ ubuntu-24.04 , ubuntu-24.04-arm ]
+    runs-on: ${{ matrix.platform }}
     steps:
       -
         name: "Git: Checkout"
diff --git a/.github/workflows/compose-test_hass.yml b/.github/workflows/compose-test_hass.yml
index 1be9458..e7b58c7 100644
--- a/.github/workflows/compose-test_hass.yml
+++ b/.github/workflows/compose-test_hass.yml
@@ -14,7 +14,10 @@ env:
 
 jobs:
   test:
-    runs-on: ubuntu-latest
+    strategy:
+      matrix:
+        platform: [ ubuntu-24.04 , ubuntu-24.04-arm ]
+    runs-on: ${{ matrix.platform }}
     steps:
       -
         name: "Git: Checkout"
diff --git a/.github/workflows/compose-test_indexarr.yml b/.github/workflows/compose-test_indexarr.yml
index 2e6f247..d93fbd3 100644
--- a/.github/workflows/compose-test_indexarr.yml
+++ b/.github/workflows/compose-test_indexarr.yml
@@ -14,7 +14,10 @@ env:
 
 jobs:
   test:
-    runs-on: ubuntu-latest
+    strategy:
+      matrix:
+        platform: [ ubuntu-24.04 , ubuntu-24.04-arm ]
+    runs-on: ${{ matrix.platform }}
     steps:
       -
         name: "Git: Checkout"
diff --git a/.github/workflows/compose-test_influxdb.yml b/.github/workflows/compose-test_influxdb.yml
index 41b31e6..4e3448b 100644
--- a/.github/workflows/compose-test_influxdb.yml
+++ b/.github/workflows/compose-test_influxdb.yml
@@ -14,7 +14,10 @@ env:
 
 jobs:
   test:
-    runs-on: ubuntu-latest
+    strategy:
+      matrix:
+        platform: [ ubuntu-24.04 , ubuntu-24.04-arm ]
+    runs-on: ${{ matrix.platform }}
     steps:
       -
         name: "Git: Checkout"
diff --git a/.github/workflows/compose-test_kodi_db.yml b/.github/workflows/compose-test_kodi_db.yml
index 6cc5537..03c33f0 100644
--- a/.github/workflows/compose-test_kodi_db.yml
+++ b/.github/workflows/compose-test_kodi_db.yml
@@ -14,7 +14,10 @@ env:
 
 jobs:
   test:
-    runs-on: ubuntu-latest
+    strategy:
+      matrix:
+        platform: [ ubuntu-24.04 , ubuntu-24.04-arm ]
+    runs-on: ${{ matrix.platform }}
     steps:
       -
         name: "Git: Checkout"
diff --git a/.github/workflows/compose-test_monitarr.yml b/.github/workflows/compose-test_monitarr.yml
index b5db94a..60bffb9 100644
--- a/.github/workflows/compose-test_monitarr.yml
+++ b/.github/workflows/compose-test_monitarr.yml
@@ -14,7 +14,10 @@ env:
 
 jobs:
   test:
-    runs-on: ubuntu-latest
+    strategy:
+      matrix:
+        platform: [ ubuntu-24.04 , ubuntu-24.04-arm ]
+    runs-on: ${{ matrix.platform }}
     steps:
       -
         name: "Git: Checkout"
diff --git a/.github/workflows/compose-test_navidrome.yml b/.github/workflows/compose-test_navidrome.yml
index 7c243e0..985b2ee 100644
--- a/.github/workflows/compose-test_navidrome.yml
+++ b/.github/workflows/compose-test_navidrome.yml
@@ -14,7 +14,10 @@ env:
 
 jobs:
   test:
-    runs-on: ubuntu-latest
+    strategy:
+      matrix:
+        platform: [ ubuntu-24.04 , ubuntu-24.04-arm ]
+    runs-on: ${{ matrix.platform }}
     steps:
       -
         name: "Git: Checkout"
diff --git a/.github/workflows/compose-test_netbox.yml b/.github/workflows/compose-test_netbox.yml
index 14fa7f7..e7dad9b 100644
--- a/.github/workflows/compose-test_netbox.yml
+++ b/.github/workflows/compose-test_netbox.yml
@@ -14,7 +14,10 @@ env:
 
 jobs:
   test:
-    runs-on: ubuntu-latest
+    strategy:
+      matrix:
+        platform: [ ubuntu-24.04 , ubuntu-24.04-arm ]
+    runs-on: ${{ matrix.platform }}
     steps:
       -
         name: "Git: Checkout"
diff --git a/.github/workflows/compose-test_nextcloud.yml b/.github/workflows/compose-test_nextcloud.yml
index 7eed990..e28e5fa 100644
--- a/.github/workflows/compose-test_nextcloud.yml
+++ b/.github/workflows/compose-test_nextcloud.yml
@@ -14,7 +14,10 @@ env:
 
 jobs:
   test:
-    runs-on: ubuntu-latest
+    strategy:
+      matrix:
+        platform: [ ubuntu-24.04 , ubuntu-24.04-arm ]
+    runs-on: ${{ matrix.platform }}
     steps:
       -
         name: "Git: Checkout"
diff --git a/.github/workflows/compose-test_pihole.yml b/.github/workflows/compose-test_pihole.yml
index 62796b3..1dda19f 100644
--- a/.github/workflows/compose-test_pihole.yml
+++ b/.github/workflows/compose-test_pihole.yml
@@ -14,7 +14,10 @@ env:
 
 jobs:
   test:
-    runs-on: ubuntu-latest
+    strategy:
+      matrix:
+        platform: [ ubuntu-24.04 , ubuntu-24.04-arm ]
+    runs-on: ${{ matrix.platform }}
     steps:
       -
         name: "Git: Checkout"
diff --git a/.github/workflows/compose-test_qbittorrent.yml b/.github/workflows/compose-test_qbittorrent.yml
index 1980374..100de95 100644
--- a/.github/workflows/compose-test_qbittorrent.yml
+++ b/.github/workflows/compose-test_qbittorrent.yml
@@ -14,7 +14,10 @@ env:
 
 jobs:
   test:
-    runs-on: ubuntu-latest
+    strategy:
+      matrix:
+        platform: [ ubuntu-24.04 , ubuntu-24.04-arm ]
+    runs-on: ${{ matrix.platform }}
     steps:
       -
         name: "Git: Checkout"
diff --git a/.github/workflows/compose-test_tang.yml b/.github/workflows/compose-test_tang.yml
index ba52ef1..9226bf9 100644
--- a/.github/workflows/compose-test_tang.yml
+++ b/.github/workflows/compose-test_tang.yml
@@ -14,7 +14,10 @@ env:
 
 jobs:
   test:
-    runs-on: ubuntu-latest
+    strategy:
+      matrix:
+        platform: [ ubuntu-24.04 , ubuntu-24.04-arm ]
+    runs-on: ${{ matrix.platform }}
     steps:
       -
         name: "Git: Checkout"
diff --git a/.github/workflows/compose-test_telegraf.yml b/.github/workflows/compose-test_telegraf.yml
index d2a0771..315abfc 100644
--- a/.github/workflows/compose-test_telegraf.yml
+++ b/.github/workflows/compose-test_telegraf.yml
@@ -14,7 +14,10 @@ env:
 
 jobs:
   test:
-    runs-on: ubuntu-latest
+    strategy:
+      matrix:
+        platform: [ ubuntu-24.04 , ubuntu-24.04-arm ]
+    runs-on: ${{ matrix.platform }}
     steps:
       -
         name: "Git: Checkout"
diff --git a/.github/workflows/compose-test_teslamate.yml b/.github/workflows/compose-test_teslamate.yml
index 0a2507c..76e465b 100644
--- a/.github/workflows/compose-test_teslamate.yml
+++ b/.github/workflows/compose-test_teslamate.yml
@@ -14,7 +14,10 @@ env:
 
 jobs:
   test:
-    runs-on: ubuntu-latest
+    strategy:
+      matrix:
+        platform: [ ubuntu-24.04 , ubuntu-24.04-arm ]
+    runs-on: ${{ matrix.platform }}
     steps:
       -
         name: "Git: Checkout"
diff --git a/.github/workflows/compose-test_tiny_httpd.yml b/.github/workflows/compose-test_tiny_httpd.yml
index 4b0f531..a2aa34f 100644
--- a/.github/workflows/compose-test_tiny_httpd.yml
+++ b/.github/workflows/compose-test_tiny_httpd.yml
@@ -14,7 +14,10 @@ env:
 
 jobs:
   test:
-    runs-on: ubuntu-latest
+    strategy:
+      matrix:
+        platform: [ ubuntu-24.04 , ubuntu-24.04-arm ]
+    runs-on: ${{ matrix.platform }}
     steps:
       -
         name: "Git: Checkout"
diff --git a/.github/workflows/compose-test_traefik.yml b/.github/workflows/compose-test_traefik.yml
index 4360c59..b624d7b 100644
--- a/.github/workflows/compose-test_traefik.yml
+++ b/.github/workflows/compose-test_traefik.yml
@@ -14,7 +14,10 @@ env:
 
 jobs:
   test:
-    runs-on: ubuntu-latest
+    strategy:
+      matrix:
+        platform: [ ubuntu-24.04 , ubuntu-24.04-arm ]
+    runs-on: ${{ matrix.platform }}
     steps:
       -
         name: "Git: Checkout"
diff --git a/.github/workflows/compose-test_unifi.yml b/.github/workflows/compose-test_unifi.yml
index d0419d8..b9193ed 100644
--- a/.github/workflows/compose-test_unifi.yml
+++ b/.github/workflows/compose-test_unifi.yml
@@ -14,7 +14,10 @@ env:
 
 jobs:
   test:
-    runs-on: ubuntu-latest
+    strategy:
+      matrix:
+        platform: [ ubuntu-24.04 , ubuntu-24.04-arm ]
+    runs-on: ${{ matrix.platform }}
     steps:
       -
         name: "Git: Checkout"
diff --git a/.github/workflows/self_test.yml b/.github/workflows/self_test.yml
index 0c6795f..3c270ad 100644
--- a/.github/workflows/self_test.yml
+++ b/.github/workflows/self_test.yml
@@ -11,7 +11,10 @@ env:
 
 jobs:
   test:
-    runs-on: ubuntu-latest
+    strategy:
+      matrix:
+        platform: [ ubuntu-24.04 , ubuntu-24.04-arm ]
+    runs-on: ${{ matrix.platform }}
     steps:
       -
         name: "Git: Checkout"