diff --git a/.circleci/config.yml b/.circleci/config.yml
index 7d6f412..3479b2c 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -19,10 +19,10 @@ install_deploysuite: &install_deploysuite
             cp ./../buildscript/awsconfiguration.sh .
             
 restore_cache_settings_for_build: &restore_cache_settings_for_build
-  key: docker-tc-email-service-{{ checksum "package-lock.json" }}
+  key: circleci-tc-email-service-{{ checksum "package-lock.json" }}
 
 save_cache_settings: &save_cache_settings
-  key: docker-tc-email-service-{{ checksum "package-lock.json" }}
+  key: circleci-tc-email-service-{{ checksum "package-lock.json" }}
   paths:
     - node_modules
 
@@ -40,9 +40,9 @@ jobs:
       - setup_remote_docker
       - run: *install_dependency
       - run: *install_deploysuite
-     # - restore_cache: *restore_cache_settings_for_build
+      - restore_cache: *restore_cache_settings_for_build
       - run: *run_build
-     # - save_cache: *save_cache_settings
+      - save_cache: *save_cache_settings
       - deploy:
           name: Running Masterscript - deploy tc-email-service
           command: |    
@@ -60,9 +60,9 @@ jobs:
       - setup_remote_docker
       - run: *install_dependency
       - run: *install_deploysuite
-     # - restore_cache: *restore_cache_settings_for_build
+      - restore_cache: *restore_cache_settings_for_build
       - run: *run_build
-     # - save_cache: *save_cache_settings
+      - save_cache: *save_cache_settings
       - deploy:
           name: Running Masterscript - prod deploy tc-email-service
           command: |
diff --git a/config/default.js b/config/default.js
index be5e4ee..7a27aa0 100644
--- a/config/default.js
+++ b/config/default.js
@@ -21,6 +21,10 @@ module.exports = {
 
   VALID_ISSUERS: process.env.VALID_ISSUERS,
   KAFKA_URL: process.env.KAFKA_URL,
+
+  // max bytes 2MB
+  KAFKA_MAXBYTES: process.env.MAXBYTES || 2097152,
+
   KAFKA_GROUP_ID: process.env.KAFKA_GROUP_ID,
   KAFKA_CLIENT_CERT: process.env.KAFKA_CLIENT_CERT ? process.env.KAFKA_CLIENT_CERT.replace('\\n', '\n') : null,
   KAFKA_CLIENT_CERT_KEY: process.env.KAFKA_CLIENT_CERT_KEY ?
diff --git a/src/app.js b/src/app.js
index 3bc1563..97a0b1a 100644
--- a/src/app.js
+++ b/src/app.js
@@ -26,7 +26,7 @@ let emailTries = {};
  */
 function configureKafkaConsumer(handlers) {
   // create group consumer
-  const options = { groupId: config.KAFKA_GROUP_ID, connectionString: config.KAFKA_URL };
+  const options = { groupId: config.KAFKA_GROUP_ID, connectionString: config.KAFKA_URL, maxBytes:config.KAFKA_MAXBYTES };
   if (config.KAFKA_CLIENT_CERT && config.KAFKA_CLIENT_CERT_KEY) {
     options.ssl = { cert: config.KAFKA_CLIENT_CERT, key: config.KAFKA_CLIENT_CERT_KEY };
   }