diff --git a/buildpack/telemetry/fluentbit.py b/buildpack/telemetry/fluentbit.py
index 0c36f4b81..b5691a640 100644
--- a/buildpack/telemetry/fluentbit.py
+++ b/buildpack/telemetry/fluentbit.py
@@ -19,6 +19,10 @@
     "FLUENTBIT_LOG_LEVEL": os.getenv(
         "FLUENTBIT_LOG_LEVEL", default="info"
     ).lower(),
+    "FLUENTBIT_LOGS_BUFFER_SIZE": os.getenv(
+        "FLUENTBIT_LOGS_BUFFER_SIZE", default="128"),
+    "FLUENTBIT_LOGS_MEM_BUF_LIMIT": os.getenv(
+        "FLUENTBIT_LOGS_MEM_BUF_LIMIT", default="50MB")
 }
 
 
diff --git a/etc/fluentbit/fluentbit.conf b/etc/fluentbit/fluentbit.conf
index 178411f83..5b7d88988 100644
--- a/etc/fluentbit/fluentbit.conf
+++ b/etc/fluentbit/fluentbit.conf
@@ -4,6 +4,8 @@
     Port        ${FLUENTBIT_LOGS_PORT}
     Format      json
     Log_Level   ${FLUENTBIT_LOG_LEVEL}
+    Buffer_Size ${FLUENTBIT_LOGS_BUFFER_SIZE}
+    Mem_Buf_Limit ${FLUENTBIT_LOGS_MEM_BUF_LIMIT}
 
 [FILTER]
     Name    lua
diff --git a/etc/m2ee/m2ee.yaml b/etc/m2ee/m2ee.yaml
index f0ca90770..ef0d34921 100644
--- a/etc/m2ee/m2ee.yaml
+++ b/etc/m2ee/m2ee.yaml
@@ -22,7 +22,7 @@ m2ee:
   javaopts:
     [
       "-Dfile.encoding=UTF-8",
-      "-Djava.io.tmpdir=/tmp",
+      "-Djava.io.tmpdir=BUILD_PATH/data/tmp",
       "-XX:OnError=BUILD_PATH/.local/scripts/on_error.sh",
       "-XX:OnOutOfMemoryError=BUILD_PATH/.local/scripts/on_out_of_memory_error.sh",
     ]