diff --git a/docker/docker-burp1/Dockerfile b/docker/docker-burp1/Dockerfile
index da6fb560..91db7f4a 100644
--- a/docker/docker-burp1/Dockerfile
+++ b/docker/docker-burp1/Dockerfile
@@ -23,7 +23,6 @@ EXPOSE 10000/tcp
 
 VOLUME ["/srv/demo/spool/burp1/backup:/var/spool/burp"]
 VOLUME ["/srv/demo/spool/burp1/tmp:/tmp/bui"]
-VOLUME ["/srv/demo/conf/burp1/clients:/etc/burp/clientconfdir"]
 
 ENTRYPOINT ["/app/init"]
 CMD ["app:start"]
diff --git a/docker/docker-burp1/assets/config/burp/clientconfdir/agent b/docker/docker-burp1/assets/config/burp/clientconfdir/agent
new file mode 100644
index 00000000..d8d0302d
--- /dev/null
+++ b/docker/docker-burp1/assets/config/burp/clientconfdir/agent
@@ -0,0 +1 @@
+password = abcdefgh
diff --git a/docker/docker-burp1/assets/config/burp/clientconfdir/demo1 b/docker/docker-burp1/assets/config/burp/clientconfdir/demo1
new file mode 100644
index 00000000..ee693451
--- /dev/null
+++ b/docker/docker-burp1/assets/config/burp/clientconfdir/demo1
@@ -0,0 +1,3 @@
+password = abcdefgh
+
+. inc/rules
diff --git a/docker/docker-burp1/assets/config/burp/clientconfdir/demo2 b/docker/docker-burp1/assets/config/burp/clientconfdir/demo2
new file mode 100644
index 00000000..ee693451
--- /dev/null
+++ b/docker/docker-burp1/assets/config/burp/clientconfdir/demo2
@@ -0,0 +1,3 @@
+password = abcdefgh
+
+. inc/rules
diff --git a/docker/docker-burp1/assets/config/burp/clientconfdir/inc/rules b/docker/docker-burp1/assets/config/burp/clientconfdir/inc/rules
new file mode 100644
index 00000000..d87c77d4
--- /dev/null
+++ b/docker/docker-burp1/assets/config/burp/clientconfdir/inc/rules
@@ -0,0 +1,5 @@
+timer_arg = 5m
+timer_arg = Mon,Tue,Wed,Thu,Fri,Sat,Sun,00,01,02,03,04,05,06,07,08,09,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24
+
+keep = 7
+keep = 4
diff --git a/docker/docker-burp1/assets/setup/install b/docker/docker-burp1/assets/setup/install
index 14cd63bf..c1ff5274 100755
--- a/docker/docker-burp1/assets/setup/install
+++ b/docker/docker-burp1/assets/setup/install
@@ -103,6 +103,9 @@ echo "restore_client = agent" >>/etc/burp/burp-server.conf
 
 cp ${CONFIG_DIR}/burp-ui/buiagent.cfg /etc/burp/buiagent.cfg
 
+rm -rf /etc/burp/clientconfdir
+cp -r ${CONFIG_DIR}/burp/clientconfdir/ /etc/burp/
+
 mkdir -p /tmp/burp/{CA,CA-client}
 chgrp -R burpui /tmp/burp
 chmod -R g+w /tmp/burp
diff --git a/docker/docker-burp2/Dockerfile b/docker/docker-burp2/Dockerfile
index ac7a6332..8648712a 100644
--- a/docker/docker-burp2/Dockerfile
+++ b/docker/docker-burp2/Dockerfile
@@ -23,7 +23,6 @@ EXPOSE 10000/tcp
 
 VOLUME ["/srv/demo/spool/burp2/backup:/var/spool/burp"]
 VOLUME ["/srv/demo/spool/burp2/tmp:/tmp/bui"]
-VOLUME ["/srv/demo/conf/burp2/clients:/etc/burp/clientconfdir"]
 
 ENTRYPOINT ["/app/init"]
 CMD ["app:start"]
diff --git a/docker/docker-burp2/assets/config/burp/clientconfdir/agent b/docker/docker-burp2/assets/config/burp/clientconfdir/agent
new file mode 100644
index 00000000..d8d0302d
--- /dev/null
+++ b/docker/docker-burp2/assets/config/burp/clientconfdir/agent
@@ -0,0 +1 @@
+password = abcdefgh
diff --git a/docker/docker-burp2/assets/config/burp/clientconfdir/demo1 b/docker/docker-burp2/assets/config/burp/clientconfdir/demo1
new file mode 100644
index 00000000..10d26ccd
--- /dev/null
+++ b/docker/docker-burp2/assets/config/burp/clientconfdir/demo1
@@ -0,0 +1,5 @@
+password = abcdefgh
+
+label = color: #ffcc00
+
+. inc/rules
diff --git a/docker/docker-burp2/assets/config/burp/clientconfdir/demo2 b/docker/docker-burp2/assets/config/burp/clientconfdir/demo2
new file mode 100644
index 00000000..65f83cd7
--- /dev/null
+++ b/docker/docker-burp2/assets/config/burp/clientconfdir/demo2
@@ -0,0 +1,5 @@
+password = abcdefgh
+
+label = color: #9966ff
+
+. inc/rules
diff --git a/docker/docker-burp2/assets/config/burp/clientconfdir/inc/rules b/docker/docker-burp2/assets/config/burp/clientconfdir/inc/rules
new file mode 100644
index 00000000..d87c77d4
--- /dev/null
+++ b/docker/docker-burp2/assets/config/burp/clientconfdir/inc/rules
@@ -0,0 +1,5 @@
+timer_arg = 5m
+timer_arg = Mon,Tue,Wed,Thu,Fri,Sat,Sun,00,01,02,03,04,05,06,07,08,09,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24
+
+keep = 7
+keep = 4
diff --git a/docker/docker-burp2/assets/setup/install b/docker/docker-burp2/assets/setup/install
index 6c0108a6..8a2b79f7 100755
--- a/docker/docker-burp2/assets/setup/install
+++ b/docker/docker-burp2/assets/setup/install
@@ -5,7 +5,7 @@ set -e
 SETUP_DIR="/app/setup"
 CONFIG_DIR="${SETUP_DIR}/config"
 BURP="https://git.ziirish.me/ziirish/burp.git"
-BURP_VERSION="2.0.32"
+BURP_VERSION="2.0.34"
 BURPUI="https://burpui.ziirish.me/builds/burp-ui.dev.tar.gz"
 
 # Install burp
@@ -107,6 +107,9 @@ echo "monitor_browse_cache = 1" >>/etc/burp/burp-server.conf
 
 cp ${CONFIG_DIR}/burp-ui/buiagent.cfg /etc/burp/buiagent.cfg
 
+rm -rf /etc/burp/clientconfdir
+cp -r ${CONFIG_DIR}/burp/clientconfdir/ /etc/burp/
+
 mkdir -p /tmp/burp2/CA-client
 chgrp -R burpui /tmp/burp2
 chmod -R g+w /tmp/burp2
diff --git a/docker/docker-burpui/assets/config/burp-ui/burpui.cfg b/docker/docker-burpui/assets/config/burp-ui/burpui.cfg
index 1ed3d0d4..be640537 100644
--- a/docker/docker-burpui/assets/config/burp-ui/burpui.cfg
+++ b/docker/docker-burpui/assets/config/burp-ui/burpui.cfg
@@ -40,7 +40,7 @@ storage: redis
 # redis server to connect to
 redis: demo-redis:6379
 # whether to use secure cookie or not
-scookie: false
+scookie: true
 
 ## burp1 backend specific options
 #[Burp1]
diff --git a/docker/docker-cli2/assets/setup/install b/docker/docker-cli2/assets/setup/install
index 8f68d98e..5fb174e4 100755
--- a/docker/docker-cli2/assets/setup/install
+++ b/docker/docker-cli2/assets/setup/install
@@ -4,7 +4,7 @@ set -e
 SETUP_DIR="/app/setup"
 CONFIG_DIR="${SETUP_DIR}/config"
 BURP="https://git.ziirish.me/ziirish/burp.git"
-BURP_VERSION="2.0.32"
+BURP_VERSION="2.0.34"
 BURPUI="https://burpui.ziirish.me/builds/burp-ui.dev.tar.gz"
 
 # Install burp
diff --git a/docker/docker-compose.yml b/docker/docker-compose.yml
index b19b9726..d15cc666 100644
--- a/docker/docker-compose.yml
+++ b/docker/docker-compose.yml
@@ -4,7 +4,6 @@ demo-burp1:
   volumes:
     - /srv/demo/spool/burp1/backup:/var/spool/burp
     - /srv/demo/spool/burp1/tmp:/tmp/bui
-    - /srv/demo/conf/burp1/clients:/etc/burp/clientconfdir
 
 demo-burp2:
   restart: always
@@ -12,7 +11,6 @@ demo-burp2:
   volumes:
     - /srv/demo/spool/burp2/backup:/var/spool/burp
     - /srv/demo/spool/burp2/tmp:/tmp/bui
-    - /srv/demo/conf/burp2/clients:/etc/burp/clientconfdir
 
 demo-redis:
   restart: always
@@ -40,8 +38,6 @@ demo-cli2:
 demo-bui:
   restart: always
   build: docker-burpui/
-  volumes:
-    - /srv/demo/conf/bui:/etc/burp
   ports:
     - 127.0.0.1:5000:5000
   links: