diff --git a/.github/workflows/account-data-deleter.yml b/.github/workflows/account-data-deleter.yml
index c336c61cd..15d675ab0 100644
--- a/.github/workflows/account-data-deleter.yml
+++ b/.github/workflows/account-data-deleter.yml
@@ -40,7 +40,7 @@ jobs:
     secrets: inherit
 
   # Let's try building and conidtionally pushing our docker image to the necessary account.
-  build-and-push-image:
+  api:
     uses: ./.github/workflows/reuse-build-and-push-image.yml
     needs: [infrastructure]
     with:
@@ -52,7 +52,7 @@ jobs:
     # Ensure the re-usable workflow is allowed to access the secrets
     secrets: inherit
 
-  build-and-push-lambda-events:
+  events-lambda:
     uses: ./.github/workflows/reuse-build-and-push-lambda.yml
     needs: [infrastructure]
     with:
@@ -62,7 +62,7 @@ jobs:
     # Ensure the re-usable workflow is allowed to access the secrets
     secrets: inherit
 
-  build-and-push-lambda-batch-delete:
+  batch-delete-lambda:
     uses: ./.github/workflows/reuse-build-and-push-lambda.yml
     needs: [infrastructure]
     with:
diff --git a/.github/workflows/list-api.yml b/.github/workflows/list-api.yml
index f7c2b5a97..679a7969b 100644
--- a/.github/workflows/list-api.yml
+++ b/.github/workflows/list-api.yml
@@ -33,7 +33,7 @@ jobs:
     # Ensure the re-usable workflow is allowed to access the secrets
     secrets: inherit
 
-  build-and-push-image:
+  api:
     uses: ./.github/workflows/reuse-build-and-push-image.yml
     with:
       scope: list-api
diff --git a/.github/workflows/user-api.yml b/.github/workflows/user-api.yml
index 5cb9f464c..546579a87 100644
--- a/.github/workflows/user-api.yml
+++ b/.github/workflows/user-api.yml
@@ -38,7 +38,7 @@ jobs:
     secrets: inherit
 
   # Let's try building and conidtionally pushing our docker image to the necessary account.
-  build-and-push-image:
+  api:
     uses: ./.github/workflows/reuse-build-and-push-image.yml
     needs: [infrastructure]
     with: