diff --git a/bbb-webhooks/.dockerignore b/bbb-webhooks/.dockerignore
new file mode 100644
index 0000000000000000000000000000000000000000..c2658d7d1b31848c3b71960543cb0368e56cd4c7
--- /dev/null
+++ b/bbb-webhooks/.dockerignore
@@ -0,0 +1 @@
+node_modules/
diff --git a/bbb-webhooks/messageMapping.js b/bbb-webhooks/messageMapping.js
index 8bd3edef19fdf9593c6140d4d9bc17ab5f82071c..891dbc7741ecfd95cc75f8e9fb0dedab1a4c2200 100644
--- a/bbb-webhooks/messageMapping.js
+++ b/bbb-webhooks/messageMapping.js
@@ -259,12 +259,13 @@ module.exports = class MessageMapping {
     const data = messageObj.payload;
     this.mappedObject.data = {
       "type": "event",
-      "id": this.mapInternalMessage(messageObj.header.name),
+      "id": this.mapInternalMessage(messageObj),
       "attributes": {
         "meeting": {
           "internal-meeting-id": data.meeting_id,
           "external-meeting-id": data.external_meeting_id
         },
+        "record-id": data.record_id,
         "success": data.success,
         "step-time": data.step_time
       },
@@ -273,14 +274,18 @@ module.exports = class MessageMapping {
       }
     };
 
-    if (this.mappedObject.data["id"] == "rap-publish-ended") {
-      this.mappedObject.data["attributes"]["recording"] = {
+    if (data.workflow) {
+      this.mappedObject.data.attributes.workflow = data.workflow;
+    }
+
+    if (this.mappedObject.data.id === "rap-publish-ended") {
+      this.mappedObject.data.attributes.recording = {
         "name": data.metadata.meetingName,
-        "isBreakout": data.metadata.isBreakout,
-        "startTime": data.startTime,
-        "endTime": data.endTime,
+        "is-breakout": data.metadata.isBreakout,
+        "start-time": data.startTime,
+        "end-time": data.endTime,
         "size": data.playback.size,
-        "rawSize": data.rawSize,
+        "raw-size": data.rawSize,
         "metadata": data.metadata,
         "playback": data.playback,
         "download": data.download