diff --git a/.env b/.env
index 2783a3e71b..c1636f2c1c 100644
--- a/.env
+++ b/.env
@@ -20,7 +20,7 @@ GATEWAY_FASTCGI_TIMEOUT=300
 # --------------- PHP CONFIGURATION  --------------------
 
 # Max upload size
-MAX_BODY_SIZE=2G
+MAX_BODY_SIZE=1G
 # Max input var
 MAX_INPUT_VARS=12000
 
@@ -59,6 +59,15 @@ PHRASEANET_SERVER_NAME=localhost
 # Mysql max allowed packet
 MYSQL_MAX_ALLOWED_PACKET=16M
 
+# binaries execution timeouts
+PHRASEANET_FFMPEG_TIMEOUT=3600
+PHRASEANET_FFPROBE_TIMEOUT=120
+PHRASEANET_GS_TIMEOUT=120
+PHRASEANET_MP4BOX_TIMEOUT=120
+PHRASEANET_SWFTOOLS_TIMEOUT=120
+PHRASEANET_UNOCON_TIMEOUT=120
+PHRASEANET_EXIFTOOL_TIMEOUT=120
+
 # api
 PHRASEANET_API_ENABLED=true
 PHRASEANET_API_SSL=true
diff --git a/docker-compose.yml b/docker-compose.yml
index 1a4dc6369c..f7ea154070 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -75,6 +75,13 @@ services:
     - PHRASEANET_LAZARET_DIR
     - PHRASEANET_CAPTION_DIR
     - PHRASEANET_WORKER_TMP
+    - PHRASEANET_FFMPEG_TIMEOUT
+    - PHRASEANET_FFPROBE_TIMEOUT
+    - PHRASEANET_GS_TIMEOUT
+    - PHRASEANET_MP4BOX_TIMEOUT
+    - PHRASEANET_SWFTOOLS_TIMEOUT
+    - PHRASEANET_UNOCON_TIMEOUT
+    - PHRASEANET_EXIFTOOL_TIMEOUT
     - LC_MESSAGES=C.UTF-8
     - LC_COLLATE=C.UTF-8
     - LC_IDENTIFICATION=C.UTF-8
diff --git a/docker/phraseanet/entrypoint.sh b/docker/phraseanet/entrypoint.sh
index 2745c3730a..0614e93e84 100755
--- a/docker/phraseanet/entrypoint.sh
+++ b/docker/phraseanet/entrypoint.sh
@@ -31,6 +31,14 @@ if [ -f "$FILE" ]; then
         bin/setup system:config set registry.email.smtp-password $PHRASEANET_SMTP_PASSWORD
         bin/setup system:config set registry.email.emitter-email $PHRASEANET_EMITTER_EMAIL
         bin/setup system:config set registry.email.prefix $PHRASEANET_MAIL_OBJECT_PREFIX
+        bin/setup system:config set registry.binaries.ffmpeg_timeout $PHRASEANET_FFMPEG_TIMEOUT
+        bin/setup system:config set registry.binaries.ffprobe_timeout $PHRASEANET_FFPROBE_TIMEOUT
+        bin/setup system:config set registry.binaries.gs_timeout $PHRASEANET_GS_TIMEOUT
+        bin/setup system:config set registry.binaries.mp4box_timeout $PHRASEANET_MP4BOX_TIMEOUT
+        bin/setup system:config set registry.binaries.swftools_timeout $PHRASEANET_SWFTOOLS_TIMEOUT
+        bin/setup system:config set registry.binaries.unoconv_timeout $PHRASEANET_UNOCON_TIMEOUT
+        bin/setup system:config set registry.binaries.exiftool_timeout $PHRASEANET_EXIFTOOL_TIMEOUT
+
         if [[ -n $PHRASEANET_TRUSTED_PROXY ]]; then
             bin/setup system:config add trusted-proxies $PHRASEANET_TRUSTED_PROXY
         fi