diff --git a/kafka/strimzi/templates/cluster.yaml b/kafka/strimzi/templates/cluster.yaml
index 8887ae9d28..a6ae168dae 100644
--- a/kafka/strimzi/templates/cluster.yaml
+++ b/kafka/strimzi/templates/cluster.yaml
@@ -43,6 +43,7 @@ spec:
       default.replication.factor: {{ .Values.topic.defaultReplicationFactor }}
       min.insync.replicas: {{ .Values.topic.minISR }}
       inter.broker.protocol.version: {{ .Values.broker.interBrokerProtocolVersion }}
+      message.max.bytes: {{ .Values.broker.messageMaxBytes }}
     template:
       pod:
         tmpDirSizeLimit: {{ .Values.broker.tmpDirSizeLimit }}
diff --git a/kafka/strimzi/values.yaml b/kafka/strimzi/values.yaml
index f569d12476..223213a3fd 100644
--- a/kafka/strimzi/values.yaml
+++ b/kafka/strimzi/values.yaml
@@ -35,10 +35,12 @@ broker:
   tmpDirSizeLimit: 100Mi
 
   pvcSize: 100Gi
+
+  messageMaxBytes: 1000000000
   
   resources:
     cpu:      200m                                                                                                         
-    memory:   1Gi
+    memory:   2Gi
 
 topic:
   autoCreate: true
diff --git a/scheduler/all-base.yaml b/scheduler/all-base.yaml
index f267b9440e..ce9b35726a 100644
--- a/scheduler/all-base.yaml
+++ b/scheduler/all-base.yaml
@@ -107,7 +107,8 @@ services:
   kafka:
     image: "${KAFKA_IMAGE_AND_TAG}"
     environment:
-    - KAFKA_CFG_SOCKET_REQUEST_MAX_BYTES=1000000000
+    - KAFKA_CFG_SOCKET_REQUEST_MAX_BYTES=${KAFKA_MESSAGE_MAX_BYTES}
+    - KAFKA_CFG_MESSAGE_MAX_BYTES=${KAFKA_MESSAGE_MAX_BYTES}
     volumes:
       - "kafka_data:/bitnami"
     depends_on:
diff --git a/scheduler/all-internal.yaml b/scheduler/all-internal.yaml
index 826cba2200..07e9d02ecc 100644
--- a/scheduler/all-internal.yaml
+++ b/scheduler/all-internal.yaml
@@ -101,7 +101,6 @@ services:
     - KAFKA_BROKER_ID=1
     - KAFKA_CFG_ZOOKEEPER_CONNECT=zookeeper:2181
     - ALLOW_PLAINTEXT_LISTENER=yes
-    - KAFKA_CFG_MESSAGE_MAX_BYTES=1000000000
     ports:
       - "9092:9092"
 
diff --git a/scheduler/env.all b/scheduler/env.all
index cb174c9770..2aa8e84df3 100644
--- a/scheduler/env.all
+++ b/scheduler/env.all
@@ -58,3 +58,5 @@ HODOMETER_METRICS_LEVEL=feature
 HODOMETER_LOG_LEVEL=info
 HODOMETER_RECEIVER_RECORD_LEVEL=all
 HODOMETER_RECEIVER_LOG_LEVEL=info
+
+KAFKA_MESSAGE_MAX_BYTES=1000000000