diff --git a/src/services/ProcessorService.js b/src/services/ProcessorService.js
index 9dcf1fc..79527ff 100755
--- a/src/services/ProcessorService.js
+++ b/src/services/ProcessorService.js
@@ -28,6 +28,11 @@ function * getESData (id) {
  * @param {Object} message the message
  */
 function * create (message) {
+  if (message.payload.resource === 'submission') {
+    message.payload.challengeId = message.payload.v5ChallengeId
+    delete message.payload.v5ChallengeId
+  }
+
   yield client.create({
     index: config.get('esConfig.ES_INDEX'),
     type: config.get('esConfig.ES_TYPE'),
@@ -83,6 +88,13 @@ create.schema = {
  * @param {Object} message the message
  */
 function * update (message) {
+  if (message.payload.resource === 'submission') {
+    const legacyChallengeId = message.payload.challengeId
+    message.payload.challengeId = message.payload.v5ChallengeId
+    message.payload.legacyChallengeId = legacyChallengeId
+    delete message.payload.v5ChallengeId
+  }
+
   yield client.update({
     index: config.get('esConfig.ES_INDEX'),
     type: config.get('esConfig.ES_TYPE'),