diff --git a/debian/bijoe.init b/debian/bijoe.init
index 2393e31..28c321b 100644
--- a/debian/bijoe.init
+++ b/debian/bijoe.init
@@ -16,14 +16,12 @@
 PATH=/sbin:/usr/sbin:/bin:/usr/bin
 DESC="BI dashboard"
 NAME=bijoe
-DAEMON=/usr/bin/gunicorn
+DAEMON=/usr/bin/uwsgi
 RUN_DIR=/run/$NAME
 PIDFILE=$RUN_DIR/$NAME.pid
 LOG_DIR=/var/log/$NAME
 SCRIPTNAME=/etc/init.d/$NAME
 BIND=unix:$RUN_DIR/$NAME.sock
-WORKERS=5
-TIMEOUT=30
 
 BIJOE_SETTINGS_FILE=/usr/lib/$NAME/debian_config.py
 MANAGE_SCRIPT="/usr/bin/$NAME-manage"
@@ -37,17 +35,10 @@ GROUP=$NAME
 # Read configuration variable file if it is present
 [ -r /etc/default/$NAME ] && . /etc/default/$NAME
 
-DAEMON_ARGS=${DAEMON_ARGS:-"--pid $PIDFILE \
---user $USER --group $GROUP \
---daemon \
---access-logfile $LOG_DIR/gunicorn-access.log \
---log-file $LOG_DIR/gunicorn-error.log \
---bind=$BIND  \
---workers=$WORKERS \
---worker-class=sync \
---timeout=$TIMEOUT \
---name $NAME \
-$NAME.wsgi:application"}
+DAEMON_ARGS=${DAEMON_ARGS:-"--pidfile=$PIDFILE
+--uid $USER --gid $GROUP
+--ini /etc/$NAME/uwsgi.ini
+--daemonize /var/log/uwsgi.$NAME.log"}
 
 # Load the VERBOSE setting and other rcS variables
 . /lib/init/vars.sh
@@ -73,9 +64,7 @@ do_start()
     #   0 if daemon has been started
     #   1 if daemon was already running
     #   2 if daemon could not be started
-    start-stop-daemon --start --quiet --pidfile $PIDFILE --exec $DAEMON --test > /dev/null \
-        || return 1
-    start-stop-daemon --start --quiet --exec $DAEMON -- \
+    start-stop-daemon --start --quiet --user $USER --exec $DAEMON -- \
         $DAEMON_ARGS \
         || return 2
 }
@@ -90,32 +79,16 @@ do_stop()
     #   1 if daemon was already stopped
     #   2 if daemon could not be stopped
     #   other if a failure occurred
-    start-stop-daemon --stop --quiet --retry=TERM/30/KILL/5 --pidfile $PIDFILE
-    RETVAL="$?"
-    [ "$RETVAL" = 2 ] && return 2
-    # Wait for children to finish too if this is a daemon that forks
-    # and if the daemon is only ever run from this initscript.
-    # If the above conditions are not satisfied then add some other code
-    # that waits for the process to drop all resources that could be
-    # needed by services started subsequently.  A last resort is to
-    # sleep for some time.
-    start-stop-daemon --stop --quiet --oknodo --retry=0/30/KILL/5 --exec $DAEMON
-    [ "$?" = 2 ] && return 2
-    # Many daemons don't delete their pidfiles when they exit.
+    $DAEMON --stop $PIDFILE
     rm -f $PIDFILE
-    return "$RETVAL"
+    return 0 # hopefully
 }
 
 #
 # Function that sends a SIGHUP to the daemon/service
 #
 do_reload() {
-    #
-    # If the daemon can reload its configuration without
-    # restarting (for example, when it is sent a SIGHUP),
-    # then implement that here.
-    #
-    start-stop-daemon --stop --signal 1 --quiet --pidfile $PIDFILE --name `basename $DAEMON`
+    $DAEMON --reload $PIDFILE
     return 0
 }
 
@@ -149,7 +122,7 @@ case "$1" in
         esac
         ;;
   status)
-        status_of_proc "$DAEMON" "$NAME" || exit $?
+        status_of_proc -p $PIDFILE "$DAEMON" "$NAME" || exit $?
         su $USER -s /bin/sh -p -c "bijoe-manage check" || exit $?
         ;;
   reload)
diff --git a/debian/bijoe.install b/debian/bijoe.install
index e711b6e..524032d 100644
--- a/debian/bijoe.install
+++ b/debian/bijoe.install
@@ -2,6 +2,7 @@ usr/bin/manage.py         /usr/lib/bijoe
 debian/bijoe-manage       /usr/bin
 debian/bijoe.service      /lib/systemd/system
 debian/settings.py        /etc/bijoe
+debian/uwsgi.ini          /etc/bijoe
 debian/debian_config.py   /usr/lib/bijoe
 debian/import-wcs-data.sh /usr/lib/bijoe
 README.rst                /usr/share/doc/bijoe
diff --git a/debian/bijoe.service b/debian/bijoe.service
index b8f64f6..d5c03be 100644
--- a/debian/bijoe.service
+++ b/debian/bijoe.service
@@ -1,26 +1,25 @@
 [Unit]
 Description=BiJoe
-After=network.target postgresql.service
+After=network.target syslog.target postgresql.service
 Wants=postgresql.service
 
 [Service]
 Environment=BIJOE_SETTINGS_FILE=/usr/lib/%p/debian_config.py
+Environment=LANG=C.UTF-8
 User=%p
 Group=%p
 ExecStartPre=/usr/bin/bijoe-manage migrate_schemas --noinput
 ExecStartPre=/usr/bin/bijoe-manage collectstatic --noinput
-ExecStart=/usr/bin/gunicorn \
-          --bind unix:/run/%p/%p.sock \
-          --worker-class=sync \
-          --workers 5 \
-          --timeout=30 \
-          --name %p \
-          %p.wsgi:application
+ExecStart=/usr/bin/uwsgi --ini /etc/%p/uwsgi.ini
 ExecReload=/bin/kill -HUP $MAINPID
+KillSignal=SIGQUIT
 TimeoutStartSec=0
 PrivateTmp=true
 Restart=on-failure
 RuntimeDirectory=bijoe
+Type=notify
+StandardError=syslog
+NotifyAccess=all
 
 [Install]
 WantedBy=multi-user.target
diff --git a/debian/control b/debian/control
index bb52774..1b048e2 100644
--- a/debian/control
+++ b/debian/control
@@ -24,5 +24,6 @@ Architecture: all
 Depends: ${python:Depends},
     ${misc:Depends},
     python-bijoe,
-    gunicorn
+    uwsgi,
+    uwsgi-plugin-python
 Description: BI dashboard from Postgres db with star schema
diff --git a/debian/uwsgi.ini b/debian/uwsgi.ini
new file mode 100644
index 0000000..cae702f
--- /dev/null
+++ b/debian/uwsgi.ini
@@ -0,0 +1,26 @@
+[uwsgi]
+auto-procname = true
+procname-prefix-spaced = bijoe
+
+plugin = python
+module = bijoe.wsgi:application
+
+http-socket = /run/bijoe/bijoe.sock
+chmod-socket = 666
+vacuum = true
+
+master = true
+processes = 5
+harakiri = 120
+enable-threads = true
+
+buffer-size = 32768
+
+py-tracebacker = /run/bijoe/py-tracebacker.sock.
+stats = /run/bijoe/stats.sock
+
+ignore-sigpipe = true
+
+if-file = /etc/bijoe/uwsgi-local.ini
+  include = /etc/bijoe/uwsgi-local.ini
+endif =