diff --git a/.env b/.env
index 191754107f..9cde37640c 100644
--- a/.env
+++ b/.env
@@ -21,6 +21,9 @@ MAX_BODY_SIZE=2G
 # Max input var
 MAX_INPUT_VARS=12000
 
+MAX_EXECUTION_TIME=600
+MAX_INPUT_TIME=60
+
 # Enable opcache ? (0/1)
 OPCACHE_ENABLED=1
 # session cache limiter (off/on)
diff --git a/docker-compose.yml b/docker-compose.yml
index 34ec5133dd..2456b33650 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -40,6 +40,8 @@ services:
     - PHRASEANET_PROJECT_NAME
     - MAX_BODY_SIZE
     - MAX_INPUT_VARS
+    - MAX_EXECUTION_TIME
+    - MAX_INPUT_TIME
     - OPCACHE_ENABLED
     - SESSION_CACHE_LIMITER
     - PHP_LOG_LEVEL
diff --git a/docker/phraseanet/php.ini.sample b/docker/phraseanet/php.ini.sample
index 7f5fc97430..86634486a7 100644
--- a/docker/phraseanet/php.ini.sample
+++ b/docker/phraseanet/php.ini.sample
@@ -380,7 +380,7 @@ expose_php = On
 ; Maximum execution time of each script, in seconds
 ; http://php.net/max-execution-time
 ; Note: This directive is hardcoded to 0 for the CLI SAPI
-max_execution_time = 9999
+max_execution_time = $MAX_EXECUTION_TIME
 
 ; Maximum amount of time each script may spend parsing request data. It's a good
 ; idea to limit this time on productions servers in order to eliminate unexpectedly
@@ -390,7 +390,7 @@ max_execution_time = 9999
 ; Development Value: 60 (60 seconds)
 ; Production Value: 60 (60 seconds)
 ; http://php.net/max-input-time
-max_input_time = 60
+max_input_time = $MAX_INPUT_TIME
 
 ; Maximum input variable nesting level
 ; http://php.net/max-input-nesting-level