diff --git a/backend/src/keystore/keystore.ts b/backend/src/keystore/keystore.ts
index be63d03d9..5b2c7fba9 100644
--- a/backend/src/keystore/keystore.ts
+++ b/backend/src/keystore/keystore.ts
@@ -16,13 +16,9 @@ export const KeyStorePrefixes = {
   WaitUntilReadyKmsOrgKeyCreation: "wait-until-ready-kms-org-key-creation-",
   WaitUntilReadyKmsOrgDataKeyCreation: "wait-until-ready-kms-org-data-key-creation-",
 
-  ProjectEnvironmentCreate: "project-environment-creation-lock",
-  ProjectEnvironmentUpdate: "project-environment-update-lock",
-  ProjectEnvironmentDelete: "project-environment-delete-lock",
-
   WaitUntilReadyProjectEnvironmentOperation: (projectId: string) =>
     `wait-until-ready-project-environments-operation-${projectId}`,
-
+  ProjectEnvironmentLock: (projectId: string) => `project-environment-lock-${projectId}` as const,
   SyncSecretIntegrationLock: (projectId: string, environmentSlug: string, secretPath: string) =>
     `sync-integration-mutex-${projectId}-${environmentSlug}-${secretPath}` as const,
   SyncSecretIntegrationLastRunTimestamp: (projectId: string, environmentSlug: string, secretPath: string) =>
diff --git a/backend/src/services/project-env/project-env-service.ts b/backend/src/services/project-env/project-env-service.ts
index f74e7544a..645f34ade 100644
--- a/backend/src/services/project-env/project-env-service.ts
+++ b/backend/src/services/project-env/project-env-service.ts
@@ -50,7 +50,7 @@ export const projectEnvServiceFactory = ({
     ForbiddenError.from(permission).throwUnlessCan(ProjectPermissionActions.Create, ProjectPermissionSub.Environments);
 
     const lock = await keyStore
-      .acquireLock([KeyStorePrefixes.ProjectEnvironmentCreate, projectId], 5000)
+      .acquireLock([KeyStorePrefixes.ProjectEnvironmentLock(projectId)], 5000)
       .catch(() => null);
 
     try {
@@ -122,7 +122,7 @@ export const projectEnvServiceFactory = ({
     ForbiddenError.from(permission).throwUnlessCan(ProjectPermissionActions.Edit, ProjectPermissionSub.Environments);
 
     const lock = await keyStore
-      .acquireLock([KeyStorePrefixes.ProjectEnvironmentUpdate, projectId], 5000)
+      .acquireLock([KeyStorePrefixes.ProjectEnvironmentLock(projectId)], 5000)
       .catch(() => null);
 
     try {
@@ -178,7 +178,7 @@ export const projectEnvServiceFactory = ({
     ForbiddenError.from(permission).throwUnlessCan(ProjectPermissionActions.Delete, ProjectPermissionSub.Environments);
 
     const lock = await keyStore
-      .acquireLock([KeyStorePrefixes.ProjectEnvironmentDelete, projectId], 5000)
+      .acquireLock([KeyStorePrefixes.ProjectEnvironmentLock(projectId)], 5000)
       .catch(() => null);
 
     try {