diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index ca90110..c5d1e8e 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -9,20 +9,32 @@ jobs:
   pre-commit:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v3
-      - uses: actions/setup-python@v3
-      - uses: pre-commit/action@v3.0.0
+      - uses: actions/checkout@v4
+      - uses: actions/setup-python@v5
+      - uses: pre-commit/action@v3.0.1
   build:
 
-    runs-on: ubuntu-20.04 # 3.6 is not supported by Ubuntu 22.04
+    runs-on: ubuntu-latest
+    container: ${{ matrix.container }}
     strategy:
-      fail-fast: false
       matrix:
-        python-version: ["3.6", "3.7", "3.8", "3.9", "3.10", "3.11", "3.12", "3.13"]
+        include:
+          - python-version: "3.6"
+            container: "python:3.6"
+          - python-version: "3.7"
+            container: "python:3.7"
+          - python-version: "3.8"
+          - python-version: "3.9"
+          - python-version: "3.10"
+          - python-version: "3.11"
+          - python-version: "3.12"
+          - python-version: "3.13"
+          - python-version: "3.14"
 
     steps:
     - uses: actions/checkout@v4
     - name: Set up Python ${{ matrix.python-version }}
+      if: ${{ !matrix.container }}
       uses: actions/setup-python@v5
       with:
         python-version: ${{ matrix.python-version }}
@@ -30,14 +42,13 @@ jobs:
       run: |
         python -m pip install --upgrade pip
         python -m pip install .
-  test:
 
+  test:
     runs-on: ubuntu-latest
     strategy:
       fail-fast: false
       matrix:
         python-version: ["3.9", "3.10", "3.11", "3.12", "3.13"] # testcontainers is not supported on <3.9
-    needs: build
     steps:
     - uses: actions/checkout@v4
     - name: Set up Python ${{ matrix.python-version }}
diff --git a/test/docker-compose.yml b/test/docker-compose.yml
index dc9b22d..cafd9f4 100644
--- a/test/docker-compose.yml
+++ b/test/docker-compose.yml
@@ -19,7 +19,7 @@
 version: "3.7"
 services:
   channelfinder:
-    image: ghcr.io/channelfinder/channelfinderservice:master
+    image: ghcr.io/channelfinder/channelfinderservice:ChannelFinder-4.7.3
     hostname: channelfinder
     networks:
       - channelfinder-net