diff --git a/.gitignore b/.gitignore
index 7d71a33..f00801a 100644
--- a/.gitignore
+++ b/.gitignore
@@ -5,3 +5,4 @@ coverage
 .DS_Store
 .env
 api.env
+.eslintrc.y*ml
diff --git a/src/scripts/createIndex.js b/src/scripts/createIndex.js
index fad96d3..33114fb 100644
--- a/src/scripts/createIndex.js
+++ b/src/scripts/createIndex.js
@@ -63,8 +63,8 @@ async function createIndex () {
             userId: { type: 'keyword' },
             jobId: { type: 'keyword' },
             status: { type: 'keyword' },
-            startDate: { type: 'date' },
-            endDate: { type: 'date' },
+            startDate: { type: 'date', format: 'yyyy-MM-dd' },
+            endDate: { type: 'date', format: 'yyyy-MM-dd' },
             memberRate: { type: 'float' },
             customerRate: { type: 'float' },
             rateType: { type: 'keyword' },
diff --git a/src/services/ResourceBookingProcessorService.js b/src/services/ResourceBookingProcessorService.js
index 4972afe..f507bde 100644
--- a/src/services/ResourceBookingProcessorService.js
+++ b/src/services/ResourceBookingProcessorService.js
@@ -37,8 +37,8 @@ processCreate.schema = {
       projectId: Joi.number().integer().required(),
       userId: Joi.string().uuid().required(),
       jobId: Joi.string().uuid().allow(null),
-      startDate: Joi.date().allow(null),
-      endDate: Joi.date().allow(null),
+      startDate: Joi.string().regex(/^(19|20)\d\d-(0[1-9]|1[012])-(0[1-9]|[12][0-9]|3[01])$/).allow(null),
+      endDate: Joi.string().regex(/^(19|20)\d\d-(0[1-9]|1[012])-(0[1-9]|[12][0-9]|3[01])$/).allow(null),
       memberRate: Joi.number().allow(null),
       customerRate: Joi.number().allow(null),
       rateType: Joi.rateType().required(),
diff --git a/test/messages/taas.resourcebooking.create.event.json b/test/messages/taas.resourcebooking.create.event.json
index 92ec817..31d6217 100644
--- a/test/messages/taas.resourcebooking.create.event.json
+++ b/test/messages/taas.resourcebooking.create.event.json
@@ -1 +1,20 @@
-{"topic":"taas.resourcebooking.create","originator":"taas-api","timestamp":"2020-11-05T19:00:25.038Z","mime-type":"application/json","payload":{"projectId":21,"userId":"a55fe1bc-1754-45fa-9adc-cf3d6d7c377a","jobId":"ffbc24f7-301e-48d3-bf01-c056916056a2","startDate":"2020-09-27T04:17:23.131Z","endDate":"2020-09-27T04:17:23.131Z","memberRate":13.23,"customerRate":13,"rateType":"hourly","id":"60d97713-8621-476e-b006-7cb9589c7777","createdAt":"2020-11-05T19:00:23.036Z","createdBy":"a55fe1bc-1754-45fa-9adc-cf3d6d7c377a","status":"assigned"}}
\ No newline at end of file
+{
+    "topic": "taas.resourcebooking.create",
+    "originator": "taas-api",
+    "timestamp": "2020-11-05T19:00:25.038Z",
+    "mime-type": "application/json",
+    "payload": {
+        "projectId": 21,
+        "userId": "a55fe1bc-1754-45fa-9adc-cf3d6d7c377a",
+        "jobId": "ffbc24f7-301e-48d3-bf01-c056916056a2",
+        "startDate": "2020-09-27",
+        "endDate": "2020-09-27",
+        "memberRate": 13.23,
+        "customerRate": 13,
+        "rateType": "hourly",
+        "id": "60d97713-8621-476e-b006-7cb9589c7777",
+        "createdAt": "2020-11-05T19:00:23.036Z",
+        "createdBy": "a55fe1bc-1754-45fa-9adc-cf3d6d7c377a",
+        "status": "assigned"
+    }
+}
\ No newline at end of file
diff --git a/test/messages/taas.resourcebooking.update.event.json b/test/messages/taas.resourcebooking.update.event.json
index 2c07a4e..e45fc86 100644
--- a/test/messages/taas.resourcebooking.update.event.json
+++ b/test/messages/taas.resourcebooking.update.event.json
@@ -1 +1,22 @@
-{"topic":"taas.resourcebooking.update","originator":"taas-api","timestamp":"2020-11-05T19:00:26.407Z","mime-type":"application/json","payload":{"id":"60d97713-8621-476e-b006-7cb9589c7777","projectId":21,"userId":"a55fe1bc-1754-45fa-9adc-cf3d6d7c377a","jobId":"ffbc24f7-301e-48d3-bf01-c056916056a2","startDate":"2020-09-27T04:17:23.131Z","endDate":"2020-09-27T04:17:23.131Z","memberRate":13.23,"customerRate":13,"rateType":"hourly","status":"assigned","updatedAt":"2020-11-05T19:00:25.062Z","updatedBy":"a55fe1bc-1754-45fa-9adc-cf3d6d7c377a","createdAt":"2020-11-05T19:00:16.268Z","createdBy":"a55fe1bc-1754-45fa-9adc-cf3d6d7c377a"}}
\ No newline at end of file
+{
+    "topic": "taas.resourcebooking.update",
+    "originator": "taas-api",
+    "timestamp": "2020-11-05T19:00:26.407Z",
+    "mime-type": "application/json",
+    "payload": {
+        "id": "60d97713-8621-476e-b006-7cb9589c7777",
+        "projectId": 21,
+        "userId": "a55fe1bc-1754-45fa-9adc-cf3d6d7c377a",
+        "jobId": "ffbc24f7-301e-48d3-bf01-c056916056a2",
+        "startDate": "2020-09-27",
+        "endDate": "2020-09-27",
+        "memberRate": 13.23,
+        "customerRate": 13,
+        "rateType": "hourly",
+        "status": "assigned",
+        "updatedAt": "2020-11-05T19:00:25.062Z",
+        "updatedBy": "a55fe1bc-1754-45fa-9adc-cf3d6d7c377a",
+        "createdAt": "2020-11-05T19:00:16.268Z",
+        "createdBy": "a55fe1bc-1754-45fa-9adc-cf3d6d7c377a"
+    }
+}
\ No newline at end of file