diff --git a/Dockerfile b/Dockerfile
index 32b85947ac1..96c6d99c84b 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -130,7 +130,8 @@ RUN mkdir -p storage/framework/cache \
     && cp $PHP_INI_DIR/php.ini-production $PHP_INI_DIR/php.ini \
     && echo "upload_max_filesize=110M" > $PHP_INI_DIR/conf.d/custom.ini \
     && echo "post_max_size=110M" >> $PHP_INI_DIR/conf.d/custom.ini \
-    && echo "max_execution_time=3000" >> $PHP_INI_DIR/conf.d/custom.ini \
+    && echo "memory_limit=\${PHP_MEMORY_LIMIT:-1024M}" >> $PHP_INI_DIR/conf.d/custom.ini \
+    && echo "max_execution_time=\${PHP_MAX_EXECUTION_TIME:-3000}" >> $PHP_INI_DIR/conf.d/custom.ini \
     && echo "expose_php=Off" >> $PHP_INI_DIR/conf.d/custom.ini \
     && echo "display_errors=Off" >> $PHP_INI_DIR/conf.d/custom.ini \
     && echo "log_errors=On" >> $PHP_INI_DIR/conf.d/custom.ini
diff --git a/config/octane.php b/config/octane.php
index 5d7a0df1c23..7c94d57bd2b 100644
--- a/config/octane.php
+++ b/config/octane.php
@@ -211,5 +211,5 @@
 	|
 	*/
 
-	'max_execution_time' => 30,
+	'max_execution_time' => intval(env('LYCHEE_MAX_EXECUTION_TIME', 30)),
 ];