diff --git a/backend/src/models/machineIdentityClientSecretData.ts b/backend/src/models/machineIdentityClientSecretData.ts
index 9bdf950bb..fbcd46606 100644
--- a/backend/src/models/machineIdentityClientSecretData.ts
+++ b/backend/src/models/machineIdentityClientSecretData.ts
@@ -71,4 +71,8 @@ const machineIdentityClientSecretDataSchema = new Schema(
     }
 );
 
+machineIdentityClientSecretDataSchema.index(
+    { machineIdentity: 1, isActive: 1 }
+)
+
 export const MachineIdentityClientSecretData = model<IMachineIdentityClientSecretData>("MachineIdentityClientSecretData", machineIdentityClientSecretDataSchema);
\ No newline at end of file
diff --git a/backend/src/models/machineMembership.ts b/backend/src/models/machineMembership.ts
index ab0859e8d..2463009b3 100644
--- a/backend/src/models/machineMembership.ts
+++ b/backend/src/models/machineMembership.ts
@@ -18,7 +18,8 @@ const machineMembershipSchema = new Schema<IMachineMembership>(
     workspace: {
       type: Schema.Types.ObjectId,
       ref: "Workspace",
-      required: true
+      required: true,
+      index: true,
     },
     role: {
       type: String,