diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 2ca87a68..912e04fe 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -54,8 +54,9 @@ build:py3:
 deploy:demo:
   stage: deploy
   script:
-  - cd docker/
-  - find . -name "install" | xargs sed -i "s/@build@/$(git rev-parse HEAD)/"
+  - find docker/ -name "install" | xargs sed -i "s/@build@/$(git rev-parse HEAD)/"
+  - cp -r docker/ /srv/demo/
+  - cd /srv/demo/docker/
   - docker-compose build
   - docker-compose stop
   - docker-compose rm -f
diff --git a/docker/docker-burp1/Dockerfile b/docker/docker-burp1/Dockerfile
index f8248bbe..2888f4a5 100644
--- a/docker/docker-burp1/Dockerfile
+++ b/docker/docker-burp1/Dockerfile
@@ -5,7 +5,9 @@ RUN apt-get update \
  && DEBIAN_FRONTEND=noninteractive apt-get install -y supervisor logrotate locales wget curl uthash-dev g++ make libssl-dev librsync-dev python2.7-dev git python-virtualenv python-pip cron libffi-dev \
  && update-locale LANG=C.UTF-8 LC_MESSAGES=POSIX \
  && locale-gen en_US.UTF-8 \
- && dpkg-reconfigure locales \
+ && dpkg-reconfigure -f noninteractive locales \
+ && echo "Europe/Paris" >/etc/timezone \
+ && dpkg-reconfigure -f noninteractive tzdata \
  && rm -rf /var/lib/apt/lists/*
 
 ADD assets/setup/ /app/setup/
diff --git a/docker/docker-burp1/assets/config/burp-ui/buiagent.cfg b/docker/docker-burp1/assets/config/burp-ui/buiagent.cfg
index 8cc219d2..d3d41003 100644
--- a/docker/docker-burp1/assets/config/burp-ui/buiagent.cfg
+++ b/docker/docker-burp1/assets/config/burp-ui/buiagent.cfg
@@ -14,6 +14,8 @@ sslkey: /etc/burp/ssl_cert-server.key
 version: 1
 # agent password
 password: azerty
+# number of threads that will handle requests
+threads: 20
 
 ## burp1 backend specific options
 [Burp1]
diff --git a/docker/docker-burp2/Dockerfile b/docker/docker-burp2/Dockerfile
index 76271a09..5c638e9f 100644
--- a/docker/docker-burp2/Dockerfile
+++ b/docker/docker-burp2/Dockerfile
@@ -5,7 +5,9 @@ RUN apt-get update \
  && DEBIAN_FRONTEND=noninteractive apt-get install -y supervisor logrotate locales wget curl uthash-dev g++ make libssl-dev librsync-dev python2.7-dev git python-virtualenv python-pip cron libffi-dev \
  && update-locale LANG=C.UTF-8 LC_MESSAGES=POSIX \
  && locale-gen en_US.UTF-8 \
- && dpkg-reconfigure locales \
+ && dpkg-reconfigure -f noninteractive locales \
+ && echo "Europe/Paris" >/etc/timezone \
+ && dpkg-reconfigure -f noninteractive tzdata \
  && rm -rf /var/lib/apt/lists/*
 
 ADD assets/setup/ /app/setup/
diff --git a/docker/docker-burp2/assets/config/burp-ui/buiagent.cfg b/docker/docker-burp2/assets/config/burp-ui/buiagent.cfg
index 234f8a1b..f6318163 100644
--- a/docker/docker-burp2/assets/config/burp-ui/buiagent.cfg
+++ b/docker/docker-burp2/assets/config/burp-ui/buiagent.cfg
@@ -14,6 +14,8 @@ sslkey: /etc/burp/ssl_cert-server.key
 version: 2
 # agent password
 password: azerty
+# number of threads that will handle requests
+threads: 20
 
 [Burp2]
 tmpdir: /tmp/bui/
diff --git a/docker/docker-burp2/assets/setup/install b/docker/docker-burp2/assets/setup/install
index 382a7a7b..26c159eb 100755
--- a/docker/docker-burp2/assets/setup/install
+++ b/docker/docker-burp2/assets/setup/install
@@ -109,6 +109,8 @@ mkdir -p /tmp/burp2/CA-client
 chgrp -R burpui /tmp/burp2
 chmod -R g+w /tmp/burp2
 
+sed -i "s/^max_status_children.*$/max_status_children = 100/" /etc/burp/burp-server.conf
+
 /usr/sbin/burp -g -c /etc/burp/burp-server.conf
 
 # cleanup
diff --git a/docker/docker-burpui/Dockerfile b/docker/docker-burpui/Dockerfile
index dad60f91..30663770 100644
--- a/docker/docker-burpui/Dockerfile
+++ b/docker/docker-burpui/Dockerfile
@@ -5,7 +5,9 @@ RUN apt-get update \
  && DEBIAN_FRONTEND=noninteractive apt-get install -y supervisor logrotate locales wget curl python2.7-dev git python-virtualenv gunicorn python-pip cron libffi-dev \
  && update-locale LANG=C.UTF-8 LC_MESSAGES=POSIX \
  && locale-gen en_US.UTF-8 \
- && dpkg-reconfigure locales \
+ && dpkg-reconfigure -f noninteractive locales \
+ && echo "Europe/Paris" >/etc/timezone \
+ && dpkg-reconfigure -f noninteractive tzdata \
  && rm -rf /var/lib/apt/lists/*
 
 ADD assets/setup/ /app/setup/
diff --git a/docker/docker-cli1/Dockerfile b/docker/docker-cli1/Dockerfile
index e6d8a5d9..b80e8021 100644
--- a/docker/docker-cli1/Dockerfile
+++ b/docker/docker-cli1/Dockerfile
@@ -5,7 +5,9 @@ RUN apt-get update \
  && DEBIAN_FRONTEND=noninteractive apt-get install -y supervisor logrotate locales wget curl uthash-dev g++ make libssl-dev librsync-dev git cron \
  && update-locale LANG=C.UTF-8 LC_MESSAGES=POSIX \
  && locale-gen en_US.UTF-8 \
- && dpkg-reconfigure locales \
+ && dpkg-reconfigure -f noninteractive locales \
+ && echo "Europe/Paris" >/etc/timezone \
+ && dpkg-reconfigure -f noninteractive tzdata \
  && rm -rf /var/lib/apt/lists/*
 
 ADD assets/setup/ /app/setup/
diff --git a/docker/docker-cli2/Dockerfile b/docker/docker-cli2/Dockerfile
index e6d8a5d9..b80e8021 100644
--- a/docker/docker-cli2/Dockerfile
+++ b/docker/docker-cli2/Dockerfile
@@ -5,7 +5,9 @@ RUN apt-get update \
  && DEBIAN_FRONTEND=noninteractive apt-get install -y supervisor logrotate locales wget curl uthash-dev g++ make libssl-dev librsync-dev git cron \
  && update-locale LANG=C.UTF-8 LC_MESSAGES=POSIX \
  && locale-gen en_US.UTF-8 \
- && dpkg-reconfigure locales \
+ && dpkg-reconfigure -f noninteractive locales \
+ && echo "Europe/Paris" >/etc/timezone \
+ && dpkg-reconfigure -f noninteractive tzdata \
  && rm -rf /var/lib/apt/lists/*
 
 ADD assets/setup/ /app/setup/