diff --git a/.github/workflows/fossa.yml b/.github/workflows/fossa.yml
new file mode 100644
index 000000000..94ad93728
--- /dev/null
+++ b/.github/workflows/fossa.yml
@@ -0,0 +1,6 @@
+name: Fossa OSS Scan
+on: [push]
+jobs:
+  fossa-scan:
+    uses: splunk/oss-scanning-public/.github/workflows/oss-scan.yml@main
+    secrets: inherit
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index fe8c4831e..7073688d6 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -6,7 +6,8 @@ on:
 jobs:
   publish:
     name: Deploy Release to PyPI
-    runs-on: ubuntu-latest
+    # Last version with Python 3.7 binaries available
+    runs-on: ubuntu-22.04
     steps:
       - name: Checkout source
         uses: actions/checkout@ff7abcd0c3c05ccf6adc123a8cd1fd4fb30fb493
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index 8a9056e2b..4a895c54b 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -1,49 +1,35 @@
 name: Python CI
-
 on: [push, workflow_dispatch]
 
 jobs:
   build:
     runs-on: ${{ matrix.os }}
     strategy:
+      fail-fast: false
       matrix:
-        os:
-          - ubuntu-latest
-        python: [3.9, 3.13]
-        splunk-version:
-          - "8.1"
-          - "8.2"
-          - "latest"
+        os: [ubuntu-latest]
+        python-version: [3.9]
+        splunk-version: [9.4, latest]
         include:
+          # Oldest possible configuration
+          # Last Ubuntu version with Python 3.7 binaries available
           - os: ubuntu-22.04
-            python: 3.7
-            splunk-version: "8.1"
-          - os: ubuntu-22.04
-            python: 3.7
-            splunk-version: "8.2"
-          - os: ubuntu-22.04
-            python: 3.7
-            splunk-version: "latest"
-
-      fail-fast: false
-
+            python-version: 3.7
+            splunk-version: 9.1
+          # Latest possible configuration
+          - os: ubuntu-latest
+            python-version: 3.13
+            splunk-version: latest
     steps:
       - name: Checkout code
         uses: actions/checkout@ff7abcd0c3c05ccf6adc123a8cd1fd4fb30fb493
-
       - name: Run docker compose
         run: SPLUNK_VERSION=${{ matrix.splunk-version }} docker compose up -d
-
       - name: Setup Python
         uses: actions/setup-python@9322b3ca74000aeb2c01eb777b646334015ddd72
         with:
-          python-version: ${{ matrix.python }}
-
+          python-version: ${{ matrix.python-version }}
       - name: Install tox
         run: pip install tox
-
       - name: Test Execution
         run: tox -e py
-  fossa-scan:
-    uses: splunk/oss-scanning-public/.github/workflows/oss-scan.yml@main
-    secrets: inherit