diff --git a/webkit/Dockerfile b/webkit/Dockerfile
index e4849f5..6015873 100644
--- a/webkit/Dockerfile
+++ b/webkit/Dockerfile
@@ -6,19 +6,16 @@ FROM ubuntu:14.04
 MAINTAINER kev
 
 RUN apt-get update && apt-get install -y supervisor haproxy libfontconfig1 libfreetype6
-RUN mkdir -p /usr/local/lib/webkit/
+RUN mkdir -p /usr/local/lib/webkit/ /etc/supervisor/conf.d/ /etc/monit/
 
-ADD ./*.js ./includes/ /usr/local/lib/webkit/
-ADD ./phantomjs /usr/local/bin/
-ADD ./webkit.sh /usr/local/bin/
-ADD ./restart.sh /usr/local/bin/
+ADD ./*.js ./includes /usr/local/lib/webkit/
+ADD ./bin/* /usr/local/bin/
 ADD ./haproxy.cfg /etc/haproxy/
 ADD ./supervisor/supervisord.conf /etc/supervisor/
-ADD ./supervisor/conf.d/haproxy.conf /etc/supervisor/conf.d/
-ADD ./supervisor/conf.d/webkit.conf /etc/supervisor/conf.d/
-ADD ./supervisor/conf.d/restart.conf /etc/supervisor/conf.d/
+ADD ./supervisor/conf.d/* /etc/supervisor/conf.d/
+ADD ./monit/* /etc/monit/
 
-EXPOSE 1024 9001
+EXPOSE 1024 2812 9001
 
 CMD /usr/bin/supervisord -n -c /etc/supervisor/supervisord.conf
 
diff --git a/webkit/bin/monit b/webkit/bin/monit
new file mode 100755
index 0000000..aa86037
Binary files /dev/null and b/webkit/bin/monit differ
diff --git a/webkit/phantomjs b/webkit/bin/phantomjs
similarity index 100%
rename from webkit/phantomjs
rename to webkit/bin/phantomjs
diff --git a/webkit/restart.sh b/webkit/bin/restart.sh
similarity index 100%
rename from webkit/restart.sh
rename to webkit/bin/restart.sh
diff --git a/webkit/webkit.sh b/webkit/bin/webkit.sh
similarity index 70%
rename from webkit/webkit.sh
rename to webkit/bin/webkit.sh
index 76ffd8f..9234b48 100755
--- a/webkit/webkit.sh
+++ b/webkit/bin/webkit.sh
@@ -5,5 +5,5 @@
 
 set -e
 cd /usr/local/lib/webkit
-phantomjs server.js "$@"
+exec phantomjs server.js "$@"
 
diff --git a/webkit/monit/conf.d/setting.cfg b/webkit/monit/conf.d/setting.cfg
new file mode 100644
index 0000000..01530d9
--- /dev/null
+++ b/webkit/monit/conf.d/setting.cfg
@@ -0,0 +1,4 @@
+set httpd port 2812 and
+    use address 0.0.0.0
+    allow 0.0.0.0/0
+
diff --git a/webkit/monit/conf.d/webkit.cfg b/webkit/monit/conf.d/webkit.cfg
new file mode 100644
index 0000000..feccbe6
--- /dev/null
+++ b/webkit/monit/conf.d/webkit.cfg
@@ -0,0 +1,40 @@
+check process webkit-8080 with pidfile /var/run/webkit-8080.pid
+    restart program = "/usr/bin/supervisorctl restart webkit:webkit-8080"
+    if uptime > 10 minute then restart
+
+check process webkit-8081 with pidfile /var/run/webkit-8081.pid
+    restart program = "/usr/bin/supervisorctl restart webkit:webkit-8081"
+    if uptime > 10 minute then restart
+
+check process webkit-8082 with pidfile /var/run/webkit-8082.pid
+    restart program = "/usr/bin/supervisorctl restart webkit:webkit-8082"
+    if uptime > 10 minute then restart
+
+check process webkit-8083 with pidfile /var/run/webkit-8083.pid
+    restart program = "/usr/bin/supervisorctl restart webkit:webkit-8083"
+    if uptime > 10 minute then restart
+
+check process webkit-8084 with pidfile /var/run/webkit-8084.pid
+    restart program = "/usr/bin/supervisorctl restart webkit:webkit-8084"
+    if uptime > 10 minute then restart
+
+check process webkit-8085 with pidfile /var/run/webkit-8085.pid
+    restart program = "/usr/bin/supervisorctl restart webkit:webkit-8085"
+    if uptime > 10 minute then restart
+
+check process webkit-8086 with pidfile /var/run/webkit-8086.pid
+    restart program = "/usr/bin/supervisorctl restart webkit:webkit-8086"
+    if uptime > 10 minute then restart
+
+check process webkit-8087 with pidfile /var/run/webkit-8087.pid
+    restart program = "/usr/bin/supervisorctl restart webkit:webkit-8087"
+    if uptime > 10 minute then restart
+
+check process webkit-8088 with pidfile /var/run/webkit-8088.pid
+    restart program = "/usr/bin/supervisorctl restart webkit:webkit-8088"
+    if uptime > 10 minute then restart
+
+check process webkit-8089 with pidfile /var/run/webkit-8089.pid
+    restart program = "/usr/bin/supervisorctl restart webkit:webkit-8089"
+    if uptime > 10 minute then restart
+
diff --git a/webkit/monit/monitrc b/webkit/monit/monitrc
new file mode 100644
index 0000000..b2d826d
--- /dev/null
+++ b/webkit/monit/monitrc
@@ -0,0 +1,260 @@
+###############################################################################
+## Monit control file
+###############################################################################
+##
+## Comments begin with a '#' and extend through the end of the line. Keywords
+## are case insensitive. All path's MUST BE FULLY QUALIFIED, starting with '/'.
+##
+## Below you will find examples of some frequently used statements. For 
+## information about the control file and a complete list of statements and 
+## options, please have a look in the Monit manual.
+##
+##
+###############################################################################
+## Global section
+###############################################################################
+##
+## Start Monit in the background (run as a daemon):
+#
+  set daemon 120            # check services at 2-minute intervals
+#   with start delay 240    # optional: delay the first check by 4-minutes (by 
+#                           # default Monit check immediately after Monit start)
+#
+#
+## Set syslog logging with the 'daemon' facility. If the FACILITY option is
+## omitted, Monit will use 'user' facility by default. If you want to log to 
+## a standalone log file instead, specify the full path to the log file
+#
+# set logfile syslog facility log_daemon                       
+  set logfile /var/log/monit.log
+#
+#
+## Set the location of the Monit lock file which stores the process id of the
+## running Monit instance. By default this file is stored in $HOME/.monit.pid
+#
+# set pidfile /var/run/monit.pid
+#
+## Set the location of the Monit id file which stores the unique id for the
+## Monit instance. The id is generated and stored on first Monit start. By 
+## default the file is placed in $HOME/.monit.id.
+#
+# set idfile /var/.monit.id
+  set idfile /var/lib/monit/id
+#
+## Set the location of the Monit state file which saves monitoring states
+## on each cycle. By default the file is placed in $HOME/.monit.state. If
+## the state file is stored on a persistent filesystem, Monit will recover
+## the monitoring state across reboots. If it is on temporary filesystem, the
+## state will be lost on reboot which may be convenient in some situations.
+#
+  set statefile /var/lib/monit/state
+#
+## Set the list of mail servers for alert delivery. Multiple servers may be 
+## specified using a comma separator. If the first mail server fails, Monit 
+# will use the second mail server in the list and so on. By default Monit uses 
+# port 25 - it is possible to override this with the PORT option.
+#
+# set mailserver mail.bar.baz,               # primary mailserver
+#                backup.bar.baz port 10025,  # backup mailserver on port 10025
+#                localhost                   # fallback relay
+#
+#
+## By default Monit will drop alert events if no mail servers are available. 
+## If you want to keep the alerts for later delivery retry, you can use the 
+## EVENTQUEUE statement. The base directory where undelivered alerts will be 
+## stored is specified by the BASEDIR option. You can limit the queue size 
+## by using the SLOTS option (if omitted, the queue is limited by space
+## available in the back end filesystem).
+#
+  set eventqueue
+      basedir /var/lib/monit/events # set the base directory where events will be stored
+      slots 100                     # optionally limit the queue size
+#
+#
+## Send status and events to M/Monit (for more informations about M/Monit 
+## see http://mmonit.com/). By default Monit registers credentials with 
+## M/Monit so M/Monit can smoothly communicate back to Monit and you don't
+## have to register Monit credentials manually in M/Monit. It is possible to
+## disable credential registration using the commented out option below. 
+## Though, if safety is a concern we recommend instead using https when
+## communicating with M/Monit and send credentials encrypted.
+#
+# set mmonit http://monit:monit@192.168.1.10:8080/collector
+#     # and register without credentials     # Don't register credentials
+#
+#
+## Monit by default uses the following format for alerts if the the mail-format
+## statement is missing::
+## --8<--
+## set mail-format {
+##      from: monit@$HOST
+##   subject: monit alert --  $EVENT $SERVICE
+##   message: $EVENT Service $SERVICE
+##                 Date:        $DATE
+##                 Action:      $ACTION
+##                 Host:        $HOST
+##                 Description: $DESCRIPTION
+##
+##            Your faithful employee,
+##            Monit
+## }
+## --8<--
+##
+## You can override this message format or parts of it, such as subject
+## or sender using the MAIL-FORMAT statement. Macros such as $DATE, etc.
+## are expanded at runtime. For example, to override the sender, use:
+#
+# set mail-format { from: monit@foo.bar }
+#
+#
+## You can set alert recipients whom will receive alerts if/when a 
+## service defined in this file has errors. Alerts may be restricted on 
+## events by using a filter as in the second example below.
+#
+# set alert sysadm@foo.bar                       # receive all alerts
+#
+## Do not alert when Monit starts, stops or performs a user initiated action.
+## This filter is recommended to avoid getting alerts for trivial cases.
+#
+# set alert your-name@your.domain not on { instance, action }
+#
+#
+## Monit has an embedded HTTP interface which can be used to view status of 
+## services monitored and manage services from a web interface. The HTTP 
+## interface is also required if you want to issue Monit commands from the
+## command line, such as 'monit status' or 'monit restart service' The reason
+## for this is that the Monit client uses the HTTP interface to send these
+## commands to a running Monit daemon. See the Monit Wiki if you want to 
+## enable SSL for the web server. 
+#
+# set httpd port 2812 and
+#    use address localhost  # only accept connection from localhost
+#    allow localhost        # allow localhost to connect to the server and
+#    allow admin:monit      # require user 'admin' with password 'monit'
+#    allow @monit           # allow users of group 'monit' to connect (rw)
+#    allow @users readonly  # allow users of group 'users' to connect readonly
+#
+###############################################################################
+## Services
+###############################################################################
+##
+## Check general system resources such as load average, cpu and memory
+## usage. Each test specifies a resource, conditions and the action to be
+## performed should a test fail.
+#
+#  check system myhost.mydomain.tld
+#    if loadavg (1min) > 4 then alert
+#    if loadavg (5min) > 2 then alert
+#    if memory usage > 75% then alert
+#    if swap usage > 25% then alert
+#    if cpu usage (user) > 70% then alert
+#    if cpu usage (system) > 30% then alert
+#    if cpu usage (wait) > 20% then alert
+#
+#    
+## Check if a file exists, checksum, permissions, uid and gid. In addition
+## to alert recipients in the global section, customized alert can be sent to 
+## additional recipients by specifying a local alert handler. The service may 
+## be grouped using the GROUP option. More than one group can be specified by
+## repeating the 'group name' statement.
+#    
+#  check file apache_bin with path /usr/local/apache/bin/httpd
+#    if failed checksum and 
+#       expect the sum 8f7f419955cefa0b33a2ba316cba3659 then unmonitor
+#    if failed permission 755 then unmonitor
+#    if failed uid root then unmonitor
+#    if failed gid root then unmonitor
+#    alert security@foo.bar on {
+#           checksum, permission, uid, gid, unmonitor
+#        } with the mail-format { subject: Alarm! }
+#    group server
+#
+#    
+## Check that a process is running, in this case Apache, and that it respond
+## to HTTP and HTTPS requests. Check its resource usage such as cpu and memory,
+## and number of children. If the process is not running, Monit will restart 
+## it by default. In case the service is restarted very often and the 
+## problem remains, it is possible to disable monitoring using the TIMEOUT
+## statement. This service depends on another service (apache_bin) which
+## is defined above.
+#    
+#  check process apache with pidfile /usr/local/apache/logs/httpd.pid
+#    start program = "/etc/init.d/httpd start" with timeout 60 seconds
+#    stop program  = "/etc/init.d/httpd stop"
+#    if cpu > 60% for 2 cycles then alert
+#    if cpu > 80% for 5 cycles then restart
+#    if totalmem > 200.0 MB for 5 cycles then restart
+#    if children > 250 then restart
+#    if loadavg(5min) greater than 10 for 8 cycles then stop
+#    if failed host www.tildeslash.com port 80 protocol http 
+#       and request "/somefile.html"
+#    then restart
+#    if failed port 443 type tcpssl protocol http
+#       with timeout 15 seconds
+#    then restart
+#    if 3 restarts within 5 cycles then timeout
+#    depends on apache_bin
+#    group server
+#    
+#    
+## Check filesystem permissions, uid, gid, space and inode usage. Other services,
+## such as databases, may depend on this resource and an automatically graceful
+## stop may be cascaded to them before the filesystem will become full and data
+## lost.
+#
+#  check filesystem datafs with path /dev/sdb1
+#    start program  = "/bin/mount /data"
+#    stop program  = "/bin/umount /data"
+#    if failed permission 660 then unmonitor
+#    if failed uid root then unmonitor
+#    if failed gid disk then unmonitor
+#    if space usage > 80% for 5 times within 15 cycles then alert
+#    if space usage > 99% then stop
+#    if inode usage > 30000 then alert
+#    if inode usage > 99% then stop
+#    group server
+#
+#
+## Check a file's timestamp. In this example, we test if a file is older 
+## than 15 minutes and assume something is wrong if its not updated. Also,
+## if the file size exceed a given limit, execute a script
+#
+#  check file database with path /data/mydatabase.db
+#    if failed permission 700 then alert
+#    if failed uid data then alert
+#    if failed gid data then alert
+#    if timestamp > 15 minutes then alert
+#    if size > 100 MB then exec "/my/cleanup/script" as uid dba and gid dba
+#
+#
+## Check directory permission, uid and gid.  An event is triggered if the 
+## directory does not belong to the user with uid 0 and gid 0.  In addition, 
+## the permissions have to match the octal description of 755 (see chmod(1)).
+#
+#  check directory bin with path /bin
+#    if failed permission 755 then unmonitor
+#    if failed uid 0 then unmonitor
+#    if failed gid 0 then unmonitor
+#
+#
+## Check a remote host availability by issuing a ping test and check the 
+## content of a response from a web server. Up to three pings are sent and 
+## connection to a port and an application level network check is performed.
+#
+#  check host myserver with address 192.168.1.1
+#    if failed ping then alert
+#    if failed port 3306 protocol mysql with timeout 15 seconds then alert
+#    if failed port 80 protocol http
+#       and request /some/path with content = "a string"
+#    then alert
+#
+#
+###############################################################################
+## Includes
+###############################################################################
+##
+## It is possible to include additional configuration parts from other files or
+## directories.
+#
+   include /etc/monit/conf.d/*
+#
diff --git a/webkit/server.js b/webkit/server.js
index f2f9670..d367f35 100644
--- a/webkit/server.js
+++ b/webkit/server.js
@@ -40,7 +40,7 @@ var ok = server.listen(port, function(request, response) {
 
 
 if(ok) {
-    var pidfile = '/tmp/webkit-' + port.toString() + '.pid';
+    var pidfile = '/var/run/webkit-' + port.toString() + '.pid';
     utils.info('service started (listen %d)', port);
     utils.info('write pidfile: %s (pid %d)', pidfile, sys.pid);
     fs.write(pidfile, sys.pid.toString(), 'w');
diff --git a/webkit/supervisor/conf.d/monit.conf b/webkit/supervisor/conf.d/monit.conf
new file mode 100644
index 0000000..f19052b
--- /dev/null
+++ b/webkit/supervisor/conf.d/monit.conf
@@ -0,0 +1,2 @@
+[program:monit]
+command = /usr/local/bin/monit -I -c /etc/monit/monitrc