diff --git a/.github/workflows/kanidm_individual_book.yml b/.github/workflows/kanidm_individual_book.yml
index 4e500c1e0..b1e64171e 100644
--- a/.github/workflows/kanidm_individual_book.yml
+++ b/.github/workflows/kanidm_individual_book.yml
@@ -53,7 +53,7 @@ jobs:
           mdbook build *book
           rm -rf ./docs/
           mkdir -p ./docs/${{ inputs.tag }}/rustdoc/
-          mv ./*book/book/ ./docs/${{ inputs.tag }}
+          mv ./*book/book/* ./docs/${{ inputs.tag }}
           mv ./target/doc/* ./docs/${{ inputs.tag }}/rustdoc/
 
       - name: pykanidm docs
diff --git a/.github/workflows/pykanidm_mypy.yml b/.github/workflows/pykanidm.yml
similarity index 67%
rename from .github/workflows/pykanidm_mypy.yml
rename to .github/workflows/pykanidm.yml
index 6c1c21118..a07914289 100644
--- a/.github/workflows/pykanidm_mypy.yml
+++ b/.github/workflows/pykanidm.yml
@@ -1,14 +1,16 @@
 ---
-name: pykanidm - mypy
+name: PyKanidm tests
 
 "on":
   push:
+    branches:
+      - "master"
   pull_request:
 concurrency:
   group: ${{ github.workflow }}-${{ github.ref }}
   cancel-in-progress: true
 jobs:
-  pykanidm_mypy:
+  tests:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v3
@@ -25,6 +27,15 @@ jobs:
         run: |
           cd pykanidm
           python --version
-          python -m pip install --quiet --no-cache-dir --upgrade poetry
           poetry install
           poetry run mypy --strict kanidm tests
+      - name: Running Linting
+        run: |
+          cd pykanidm
+          poetry install
+          poetry run ruff kanidm tests
+      - name: Running pytest
+        run: |
+          cd pykanidm
+          poetry install
+          poetry run pytest -v
diff --git a/.github/workflows/pykanidm_pylint.yml b/.github/workflows/pykanidm_pylint.yml
deleted file mode 100644
index 8de83923f..000000000
--- a/.github/workflows/pykanidm_pylint.yml
+++ /dev/null
@@ -1,29 +0,0 @@
----
-name: pykanidm - Python Linting
-
-"on":
-  push:
-  pull_request:
-concurrency:
-  group: ${{ github.workflow }}-${{ github.ref }}
-  cancel-in-progress: true
-jobs:
-  pykanidm_lint:
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@v3
-        with:
-          fetch-depth: 0    # Fetch all history for .GitInfo and .Lastmod
-      - name: Install poetry
-        run: pipx install poetry
-      - name: Set up Python 3.10
-        uses: actions/setup-python@v4
-        with:
-          python-version: '3.10'
-          cache: 'poetry'
-      - name: Running tests
-        run: |
-          cd pykanidm
-          python -m pip install --quiet --no-cache-dir --upgrade poetry
-          poetry install
-          poetry run ruff tests kanidm
diff --git a/.github/workflows/pykanidm_pytest.yml b/.github/workflows/pykanidm_pytest.yml
deleted file mode 100644
index 97409e8b6..000000000
--- a/.github/workflows/pykanidm_pytest.yml
+++ /dev/null
@@ -1,35 +0,0 @@
----
-name: pykanidm - pytest
-
-"on":
-  push:
-  pull_request:
-
-concurrency:
-  group: ${{ github.workflow }}-${{ github.ref }}
-  cancel-in-progress: true
-jobs:
-  pykanidm_pytest:
-    strategy:
-      matrix:
-        python_version:
-          - "3.9"
-          - "3.10"
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@v3
-        with:
-          fetch-depth: 0    # Fetch all history for .GitInfo and .Lastmod
-      - name: Install poetry
-        run: pipx install poetry
-      - name: Set up Python ${{matrix.python_version}}
-        uses: actions/setup-python@v4
-        with:
-          python-version: ${{matrix.python_version}}
-          cache: 'poetry'
-      - name: Running pytest
-        run: |
-          cd pykanidm
-          python -m pip install --quiet --no-cache-dir --upgrade poetry
-          poetry install
-          poetry run pytest -v
diff --git a/.github/workflows/wasm_test.yml b/.github/workflows/wasm_test.yml
index 66edbab4f..f8422e246 100644
--- a/.github/workflows/wasm_test.yml
+++ b/.github/workflows/wasm_test.yml
@@ -8,6 +8,9 @@ env:
   SCCACHE_GHA_ENABLED: "true"
   RUSTC_WRAPPER: "sccache"
 
+concurrency:
+  group: ${{ github.workflow }}-${{ github.ref }}
+  cancel-in-progress: true
 jobs:
   wasm_test:
     runs-on: ubuntu-latest
diff --git a/.github/workflows/windows_build.yml b/.github/workflows/windows_build.yml
index dbe734164..41a5c8e87 100644
--- a/.github/workflows/windows_build.yml
+++ b/.github/workflows/windows_build.yml
@@ -17,6 +17,10 @@ env:
   SCCACHE_GHA_ENABLED: "true"
   RUSTC_WRAPPER: "sccache"
 
+concurrency:
+  group: ${{ github.workflow }}-${{ github.ref }}
+  cancel-in-progress: true
+
 jobs:
   windows_build_kanidm:
     runs-on: windows-latest