diff --git a/src/common/helper.js b/src/common/helper.js
index 60f398c2..3f0cb27a 100644
--- a/src/common/helper.js
+++ b/src/common/helper.js
@@ -953,8 +953,8 @@ async function postEvent (topic, payload, options = {}) {
     payload
   }
   if (options.key) {
-   message.key = options.key
-   }
+    message.key = options.key
+  }
   await client.postEvent(message)
   await eventDispatcher.handleEvent(topic, { value: payload, options })
 }
diff --git a/src/services/WorkPeriodPaymentService.js b/src/services/WorkPeriodPaymentService.js
index c6ce3982..1040b056 100644
--- a/src/services/WorkPeriodPaymentService.js
+++ b/src/services/WorkPeriodPaymentService.js
@@ -96,7 +96,7 @@ async function _createSingleWorkPeriodPaymentWithWorkPeriodAndResourceBooking (w
     }
   }
 
-  await helper.postEvent(config.TAAS_WORK_PERIOD_PAYMENT_CREATE_TOPIC, created.toJSON())
+  await helper.postEvent(config.TAAS_WORK_PERIOD_PAYMENT_CREATE_TOPIC, created.toJSON(), { key: `workPeriodPayment.billingAccountId:${workPeriodPayment.billingAccountId}` })
   return created.dataValues
 }
 
@@ -234,7 +234,7 @@ async function updateWorkPeriodPayment (currentUser, id, data) {
     }
   }
 
-  await helper.postEvent(config.TAAS_WORK_PERIOD_PAYMENT_UPDATE_TOPIC, updated.toJSON(), { oldValue: oldValue })
+  await helper.postEvent(config.TAAS_WORK_PERIOD_PAYMENT_UPDATE_TOPIC, updated.toJSON(), { oldValue: oldValue, key: `workPeriodPayment.billingAccountId:${updated.billingAccountId}` })
   return updated.dataValues
 }
 
diff --git a/src/services/WorkPeriodService.js b/src/services/WorkPeriodService.js
index e16ce290..4070d88d 100644
--- a/src/services/WorkPeriodService.js
+++ b/src/services/WorkPeriodService.js
@@ -235,7 +235,7 @@ async function createWorkPeriod (currentUser, workPeriod) {
     }
   }
 
-  await helper.postEvent(config.TAAS_WORK_PERIOD_CREATE_TOPIC, created.toJSON(),{"key":workPeriod.resourceBookingId})
+  await helper.postEvent(config.TAAS_WORK_PERIOD_CREATE_TOPIC, created.toJSON(), { key: `resourceBooking.id:${workPeriod.resourceBookingId}` })
   return created.dataValues
 }
 
@@ -289,8 +289,8 @@ async function updateWorkPeriod (currentUser, id, data) {
     }
   }
 
-  //await helper.postEvent(config.TAAS_WORK_PERIOD_UPDATE_TOPIC, updated.toJSON(), { oldValue: oldValue })
-  await helper.postEvent(config.TAAS_WORK_PERIOD_UPDATE_TOPIC, updated.toJSON(), {oldValue: oldValue, "key":data.resourceBookingId})
+  // await helper.postEvent(config.TAAS_WORK_PERIOD_UPDATE_TOPIC, updated.toJSON(), { oldValue: oldValue })
+  await helper.postEvent(config.TAAS_WORK_PERIOD_UPDATE_TOPIC, updated.toJSON(), { oldValue: oldValue, key: `resourceBooking.id:${data.resourceBookingId}` })
   return updated.dataValues
 }
 
@@ -364,9 +364,9 @@ async function deleteWorkPeriod (currentUser, id) {
       workPeriodId: id
     }
   })
-  await Promise.all(workPeriod.payments.map(({ id }) => helper.postEvent(config.TAAS_WORK_PERIOD_PAYMENT_DELETE_TOPIC, { id })))
+  await Promise.all(workPeriod.payments.map(({ id, billingAccountId }) => helper.postEvent(config.TAAS_WORK_PERIOD_PAYMENT_DELETE_TOPIC, { id }, { key: `workPeriodPayment.billingAccountId:${billingAccountId}` })))
   await workPeriod.destroy()
-  await helper.postEvent(config.TAAS_WORK_PERIOD_DELETE_TOPIC, { id })
+  await helper.postEvent(config.TAAS_WORK_PERIOD_DELETE_TOPIC, { id }, { key: `resourceBooking.id:${workPeriod.resourceBookingId}` })
 }
 
 deleteWorkPeriod.schema = Joi.object().keys({