diff --git a/.github/workflows/docker-image-build.yml b/.github/workflows/build-docker-image.yml
similarity index 100%
rename from .github/workflows/docker-image-build.yml
rename to .github/workflows/build-docker-image.yml
diff --git a/.github/workflows/cd.yml b/.github/workflows/continous-delivery.yml
similarity index 98%
rename from .github/workflows/cd.yml
rename to .github/workflows/continous-delivery.yml
index 448bc8b81..665bf8f20 100644
--- a/.github/workflows/cd.yml
+++ b/.github/workflows/continous-delivery.yml
@@ -24,7 +24,7 @@ env:
 
 jobs:
   build:
-    uses: ./.github/workflows/docker-image-build.yml
+    uses: ./.github/workflows/build-docker-image.yml
     with:
       dockerfile_path: ./docker/Dockerfile
       dockerfile_target: runtime
diff --git a/.github/workflows/test.patch.yml b/.github/workflows/continous-integration-docker.patch.yml
similarity index 87%
rename from .github/workflows/test.patch.yml
rename to .github/workflows/continous-integration-docker.patch.yml
index 9f2199c3f..85411a607 100644
--- a/.github/workflows/test.patch.yml
+++ b/.github/workflows/continous-integration-docker.patch.yml
@@ -1,4 +1,4 @@
-name: Test
+name: CI Docker
 
 on:
   pull_request:
@@ -16,9 +16,9 @@ on:
       - '**/Cargo.lock'
       # workflow definitions
       - 'docker/**'
-      - '.github/workflows/test.yml'
-      - '.github/workflows/gcp-test-deploy.yml'
-      - '.github/workflows/docker-image-build.yml'
+      - '.github/workflows/continous-integration-docker.yml'
+      - '.github/workflows/deploy-gcp-tests.yml'
+      - '.github/workflows/build-docker-image.yml'
 
   push:
     branches:
@@ -35,9 +35,9 @@ on:
       - '**/Cargo.lock'
       # workflow definitions
       - 'docker/**'
-      - '.github/workflows/test.yml'
-      - '.github/workflows/gcp-test-deploy.yml'
-      - '.github/workflows/docker-image-build.yml'
+      - '.github/workflows/continous-integration-docker.yml'
+      - '.github/workflows/deploy-gcp-tests.yml'
+      - '.github/workflows/build-docker-image.yml'
 
 jobs:
   build:
diff --git a/.github/workflows/test.yml b/.github/workflows/continous-integration-docker.yml
similarity index 94%
rename from .github/workflows/test.yml
rename to .github/workflows/continous-integration-docker.yml
index 186f40088..6cc703770 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/continous-integration-docker.yml
@@ -1,4 +1,4 @@
-name: Test
+name: CI Docker
 
 on:
   workflow_dispatch:
@@ -37,9 +37,9 @@ on:
       - '**/Cargo.lock'
       # workflow definitions
       - 'docker/**'
-      - '.github/workflows/test.yml'
-      - '.github/workflows/gcp-test-deploy.yml'
-      - '.github/workflows/docker-image-build.yml'
+      - '.github/workflows/continous-integration-docker.yml'
+      - '.github/workflows/deploy-gcp-tests.yml'
+      - '.github/workflows/build-docker-image.yml'
 
   push:
     branches:
@@ -56,12 +56,12 @@ on:
       - '**/Cargo.lock'
       # workflow definitions
       - 'docker/**'
-      - '.github/workflows/test.yml'
-      - '.github/workflows/gcp-test-deploy.yml'
-      - '.github/workflows/docker-image-build.yml'
+      - '.github/workflows/continous-integration-docker.yml'
+      - '.github/workflows/deploy-gcp-tests.yml'
+      - '.github/workflows/build-docker-image.yml'
 
 env:
-  # TODO: use the output from ./.github/workflows/docker-image-build.yml
+  # TODO: use the output from ./.github/workflows/build-docker-image.yml
   IMAGE_NAME: zebrad-test
   GAR_BASE: us-docker.pkg.dev/zealous-zebra/zebra
 
@@ -85,7 +85,7 @@ jobs:
             zebra-state/**/constants.rs
 
   build:
-    uses: ./.github/workflows/docker-image-build.yml
+    uses: ./.github/workflows/build-docker-image.yml
     with:
       dockerfile_path: ./docker/Dockerfile
       dockerfile_target: tester
@@ -182,7 +182,7 @@ jobs:
   # - on request
   regenerate-stateful-disks:
     needs: [ build, changed-files]
-    uses: ./.github/workflows/gcp-test-deploy.yml
+    uses: ./.github/workflows/deploy-gcp-tests.yml
     # Only run this job if the database format version has (likely) changed.
     if: ${{ (needs.changed-files.outputs.rebuild == 'true' && github.event_name == 'push') || github.event.inputs.regenerate-disks == 'true' }}
     with:
@@ -214,7 +214,7 @@ jobs:
   # - on request
   test-full-sync:
     needs: build
-    uses: ./.github/workflows/gcp-test-deploy.yml
+    uses: ./.github/workflows/deploy-gcp-tests.yml
     # TODO change `github.ref_name == 'main'` to `startsWith(github.head_ref, 'mergify/merge-queue/')`
     # to only run on Mergify head branches, and on manual dispatch:
     # https://docs.github.com/en/actions/using-workflows/events-that-trigger-workflows#running-your-workflow-based-on-the-head-or-base-branch-of-a-pull-request-1
diff --git a/.github/workflows/ci.patch.yml b/.github/workflows/continous-integration-os.patch.yml
similarity index 96%
rename from .github/workflows/ci.patch.yml
rename to .github/workflows/continous-integration-os.patch.yml
index 51c7b2a01..965b9411d 100644
--- a/.github/workflows/ci.patch.yml
+++ b/.github/workflows/continous-integration-os.patch.yml
@@ -1,4 +1,4 @@
-name: CI
+name: CI OSes
 
 on:
   pull_request:
@@ -9,7 +9,7 @@ on:
       - '**/Cargo.toml'
       - '**/Cargo.lock'
       - '**/deny.toml'
-      - '.github/workflows/ci.yml'
+      - '.github/workflows/continous-integration-os.yml'
 
 jobs:
   test:
diff --git a/.github/workflows/ci.yml b/.github/workflows/continous-integration-os.yml
similarity index 99%
rename from .github/workflows/ci.yml
rename to .github/workflows/continous-integration-os.yml
index ea81c9b3b..4ef23c63f 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/continous-integration-os.yml
@@ -1,4 +1,4 @@
-name: CI
+name: CI OSes
 
 on:
   workflow_dispatch:
@@ -32,7 +32,7 @@ on:
       - '**/Cargo.lock'
       - '**/deny.toml'
       # workflow definitions
-      - '.github/workflows/ci.yml'
+      - '.github/workflows/continous-integration-os.yml'
 
 env:
   CARGO_INCREMENTAL: 0
diff --git a/.github/workflows/gcp-test-deploy.yml b/.github/workflows/deploy-gcp-tests.yml
similarity index 99%
rename from .github/workflows/gcp-test-deploy.yml
rename to .github/workflows/deploy-gcp-tests.yml
index 27d488f08..8e6e1c725 100644
--- a/.github/workflows/gcp-test-deploy.yml
+++ b/.github/workflows/deploy-gcp-tests.yml
@@ -1,4 +1,4 @@
-name: Test instance deployment
+name: Deploy GCP tests
 
 on:
   workflow_call:
diff --git a/.github/workflows/zcash-params.yml b/.github/workflows/zcash-params.yml
index b550f51e3..e1ba26c86 100644
--- a/.github/workflows/zcash-params.yml
+++ b/.github/workflows/zcash-params.yml
@@ -13,11 +13,11 @@ on:
       # workflow definitions
       - 'docker/zcash-params/Dockerfile'
       - '.github/workflows/zcash-params.yml'
-      - '.github/workflows/docker-image-build.yml'
+      - '.github/workflows/build-docker-image.yml'
 
 jobs:
   build:
-    uses: ./.github/workflows/docker-image-build.yml
+    uses: ./.github/workflows/build-docker-image.yml
     with:
       dockerfile_path: ./docker/zcash-params/Dockerfile
       dockerfile_target: builder