diff --git a/.github/workflows/test-python-client-on-many-python-versions.yml b/.github/workflows/test-python-client-on-many-python-versions.yml
deleted file mode 100644
index 7f61cb613..000000000
--- a/.github/workflows/test-python-client-on-many-python-versions.yml
+++ /dev/null
@@ -1,27 +0,0 @@
-name: Test Python Client on Many Python Versions
-on: [push]
-
-jobs:
-  image:
-    runs-on: ubuntu-latest
-    timeout-minutes: 15
-    strategy:
-      matrix:
-        python-version: ["3.8", "3.9", "3.10", "3.11"]
-    steps:
-      - name: Checkout
-        uses: actions/checkout@v4
-      - name: Set up QEMU
-        uses: docker/setup-qemu-action@v2
-      - name: Set up Docker Buildx
-        uses: docker/setup-buildx-action@v2
-      - name: Install Dependencies
-        working-directory: ${{github.workspace}}/python-client
-        run: |
-          sudo apt-get install -y openjdk-11-jdk
-          pip3 install .[test,dev]
-      - name: Running Tests
-        working-directory: ${{github.workspace}}/python-client
-        run: |
-          echo running on branch ${GITHUB_REF##*/}
-          pytest
diff --git a/.github/workflows/test-python-client.yml b/.github/workflows/test-python-client.yml
deleted file mode 100644
index e122df229..000000000
--- a/.github/workflows/test-python-client.yml
+++ /dev/null
@@ -1,20 +0,0 @@
-name: Test Python Client
-on: [push]
-
-jobs:
-  image:
-    runs-on: ubuntu-latest
-    timeout-minutes: 15
-    steps:
-      - name: Checkout
-        uses: actions/checkout@v3
-      - name: Set up QEMU
-        uses: docker/setup-qemu-action@v2
-      - name: Set up Docker Buildx
-        uses: docker/setup-buildx-action@v2
-      - name: Build Image
-        run: |
-          cd python-client
-          echo running on branch ${GITHUB_REF##*/}
-          make run-tests
-
diff --git a/.github/workflows/run-all-tests.yml b/.github/workflows/tests.yml
similarity index 57%
rename from .github/workflows/run-all-tests.yml
rename to .github/workflows/tests.yml
index f6ab23ff7..0f1499d66 100644
--- a/.github/workflows/run-all-tests.yml
+++ b/.github/workflows/tests.yml
@@ -9,7 +9,6 @@ jobs:
     strategy:
       matrix:
         python-version: ["3.9", "3.10"]
-
     steps:
       - uses: actions/checkout@v4
       - name: Set up Python ${{ matrix.python-version }}
@@ -33,10 +32,36 @@ jobs:
       - name: Setup Node.js
         uses: actions/setup-node@v4
         with:
-          node-version: 18.x
+          node-version: 20.x
       - name: Install dependencies
         working-directory: ${{github.workspace}}/frontend
         run: yarn --frozen-lockfile
       - name: Run frontend tests
         working-directory: ${{github.workspace}}/frontend
         run: yarn test
+
+  python-client-test:
+    runs-on: ubuntu-latest
+    timeout-minutes: 15
+    strategy:
+      matrix:
+        python-version: ["3.8", "3.9", "3.10", "3.11"]
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v4
+      - name: Set up Python ${{ matrix.python-version }}
+        uses: actions/setup-python@v4
+        with:
+          python-version: ${{ matrix.python-version }}
+      - name: Set up Docker Buildx
+        uses: docker/setup-buildx-action@v2
+      - name: Install Dependencies
+        working-directory: ${{github.workspace}}/python-client
+        run: |
+          sudo apt-get install -y openjdk-11-jdk
+          pip3 install .[test,dev]
+      - name: Running Tests
+        working-directory: ${{github.workspace}}/python-client
+        run: |
+          echo running on branch ${GITHUB_REF##*/}
+          pytest