diff --git a/.github/workflows/generate_workflows_lib/pyproject.toml b/.github/workflows/generate_workflows_lib/pyproject.toml
index 7c891ee200..314d079686 100644
--- a/.github/workflows/generate_workflows_lib/pyproject.toml
+++ b/.github/workflows/generate_workflows_lib/pyproject.toml
@@ -3,7 +3,7 @@ requires = ["hatchling"]
 build-backend = "hatchling.build"
 
 [project]
-name = "generate_workflows_lib"
+name = "generate-workflows-lib"
 dynamic = ["version"]
 description = "A library to generate workflows"
 license = "Apache-2.0"
diff --git a/.github/workflows/generate_workflows_lib/src/generate_workflows_lib/contrib.yml.j2 b/.github/workflows/generate_workflows_lib/src/generate_workflows_lib/contrib.yml.j2
index 5f94663943..e3ce131caa 100644
--- a/.github/workflows/generate_workflows_lib/src/generate_workflows_lib/contrib.yml.j2
+++ b/.github/workflows/generate_workflows_lib/src/generate_workflows_lib/contrib.yml.j2
@@ -1,5 +1,5 @@
 # Do not edit this file.
-# This file is generated automatically by executing tox -e generate_workflows
+# This file is generated automatically by executing tox -e generate-workflows
 
 name: Contrib {{ file_number }}
 
diff --git a/.github/workflows/generate_workflows_lib/src/generate_workflows_lib/lint.yml.j2 b/.github/workflows/generate_workflows_lib/src/generate_workflows_lib/lint.yml.j2
index fdecc705f7..593f42ceba 100644
--- a/.github/workflows/generate_workflows_lib/src/generate_workflows_lib/lint.yml.j2
+++ b/.github/workflows/generate_workflows_lib/src/generate_workflows_lib/lint.yml.j2
@@ -1,5 +1,5 @@
 # Do not edit this file.
-# This file is generated automatically by executing tox -e generate_workflows
+# This file is generated automatically by executing tox -e generate-workflows
 
 name: Lint {{ file_number }}
 
diff --git a/.github/workflows/generate_workflows_lib/src/generate_workflows_lib/misc.yml.j2 b/.github/workflows/generate_workflows_lib/src/generate_workflows_lib/misc.yml.j2
index babf23b9d0..74300c563a 100644
--- a/.github/workflows/generate_workflows_lib/src/generate_workflows_lib/misc.yml.j2
+++ b/.github/workflows/generate_workflows_lib/src/generate_workflows_lib/misc.yml.j2
@@ -1,5 +1,5 @@
 # Do not edit this file.
-# This file is generated automatically by executing tox -e generate_workflows
+# This file is generated automatically by executing tox -e generate-workflows
 
 name: Misc {{ file_number }}
 
@@ -35,10 +35,10 @@ jobs:
 
       - name: Run tests
         run: tox -e {{ job_data }} -- -ra
-      {%- if job_data == "generate_workflows" %}
+      {%- if job_data == "generate-workflows" %}
 
       - name: Check workflows are up to date
-        run: git diff --exit-code || (echo 'Generated workflows are out of date, run "tox -e generate_workflows" and commit the changes in this PR.' && exit 1)
+        run: git diff --exit-code || (echo 'Generated workflows are out of date, run "tox -e generate-workflows" and commit the changes in this PR.' && exit 1)
       {%- endif %}
       {%- if job_data == "generate" %}
 
diff --git a/.github/workflows/generate_workflows_lib/src/generate_workflows_lib/test.yml.j2 b/.github/workflows/generate_workflows_lib/src/generate_workflows_lib/test.yml.j2
index 444ba75af9..8e08c89f20 100644
--- a/.github/workflows/generate_workflows_lib/src/generate_workflows_lib/test.yml.j2
+++ b/.github/workflows/generate_workflows_lib/src/generate_workflows_lib/test.yml.j2
@@ -1,5 +1,5 @@
 # Do not edit this file.
-# This file is generated automatically by executing tox -e generate_workflows
+# This file is generated automatically by executing tox -e generate-workflows
 
 name: Test {{ file_number }}
 
diff --git a/.github/workflows/lint_0.yml b/.github/workflows/lint_0.yml
index 854d5f559a..65066df3ff 100644
--- a/.github/workflows/lint_0.yml
+++ b/.github/workflows/lint_0.yml
@@ -1,5 +1,5 @@
 # Do not edit this file.
-# This file is generated automatically by executing tox -e generate_workflows
+# This file is generated automatically by executing tox -e generate-workflows
 
 name: Lint 0
 
diff --git a/.github/workflows/misc.yml b/.github/workflows/misc.yml
deleted file mode 100644
index f475563fcb..0000000000
--- a/.github/workflows/misc.yml
+++ /dev/null
@@ -1,43 +0,0 @@
-name: Misc tests
-
-on:
-  push:
-    branches-ignore:
-    - 'release/*'
-  pull_request:
-env:
-  CORE_REPO_SHA: main
-
-jobs:
-  misc:
-    strategy:
-      fail-fast: false
-      matrix:
-        tox-environment: [ "docker-tests", "spellcheck", "docs", "generate", "generate_workflows" ]
-    name: ${{ matrix.tox-environment }}
-    runs-on: ubuntu-20.04
-    steps:
-      - name: Checkout Contrib Repo @ SHA - ${{ github.sha }}
-        uses: actions/checkout@v4
-      - name: Set up Python 3.10
-        uses: actions/setup-python@v5
-        with:
-          python-version: "3.10"
-      - name: Install tox
-        run: pip install tox
-      - name: Cache tox environment
-        # Preserves .tox directory between runs for faster installs
-        uses: actions/cache@v4
-        with:
-          path: |
-            .tox
-            ~/.cache/pip
-          key: v7-misc-tox-cache-${{ matrix.tox-environment }}-${{ hashFiles('tox.ini', 'dev-requirements.txt', 'gen-requirements.txt', 'docs-requirements.txt') }}
-      - name: run tox
-        run: tox -e ${{ matrix.tox-environment }}
-      - name: Ensure generated code is up to date
-        if: matrix.tox-environment == 'generate'
-        run: git diff --exit-code || (echo 'Generated code is out of date, please run "tox -e generate" and commit the changes in this PR.' && exit 1)
-      - name: Ensure workflows are up to date
-        if: matrix.tox-environment == 'generate_workflows'
-        run: git diff --exit-code || (echo 'Workflow files are out of date, please run "tox -e generate_workflows" and commit the changes in this PR.' && exit 1)
diff --git a/.github/workflows/misc_0.yml b/.github/workflows/misc_0.yml
index 46d9b1eae0..7881144aa9 100644
--- a/.github/workflows/misc_0.yml
+++ b/.github/workflows/misc_0.yml
@@ -1,5 +1,5 @@
 # Do not edit this file.
-# This file is generated automatically by executing tox -e generate_workflows
+# This file is generated automatically by executing tox -e generate-workflows
 
 name: Misc 0
 
@@ -108,6 +108,9 @@ jobs:
       - name: Run tests
         run: tox -e generate-workflows -- -ra
 
+      - name: Check workflows are up to date
+        run: git diff --exit-code || (echo 'Generated workflows are out of date, run "tox -e generate-workflows" and commit the changes in this PR.' && exit 1)
+
   shellcheck:
     name: shellcheck
     runs-on: ubuntu-latest
diff --git a/.github/workflows/test_0.yml b/.github/workflows/test_0.yml
index 05776f2dd6..bf9d66e4f4 100644
--- a/.github/workflows/test_0.yml
+++ b/.github/workflows/test_0.yml
@@ -1,5 +1,5 @@
 # Do not edit this file.
-# This file is generated automatically by executing tox -e generate_workflows
+# This file is generated automatically by executing tox -e generate-workflows
 
 name: Test 0
 
diff --git a/.github/workflows/test_1.yml b/.github/workflows/test_1.yml
index c92da89dca..55f56a0716 100644
--- a/.github/workflows/test_1.yml
+++ b/.github/workflows/test_1.yml
@@ -1,5 +1,5 @@
 # Do not edit this file.
-# This file is generated automatically by executing tox -e generate_workflows
+# This file is generated automatically by executing tox -e generate-workflows
 
 name: Test 1