diff --git a/.env.tpl b/.env.tpl
index e7c2cea761b19daa43bff030198fce3c0ab39e16..ee8a68af06254683b61b95e6eaf1adecdb3134b8 100644
--- a/.env.tpl
+++ b/.env.tpl
@@ -111,6 +111,10 @@ NOPAQUE_ADMIN=
 #       Swarm nodes
 # NOPAQUE_DATA_DIR=
 
+# CHOOSE ONE: False, True
+# DEFAULT: False
+# NOPAQUE_DAEMON_ENABLED=
+
 # DEFAULT: 0.0.0.0
 # NOPAQUE_HOST=
 
diff --git a/web/Dockerfile b/web/Dockerfile
index 3681b70105689686fb66b92d26ca4e59c6f9c4d6..d5de03921f2cf8cf19c044770397e03eab92dce3 100644
--- a/web/Dockerfile
+++ b/web/Dockerfile
@@ -17,7 +17,6 @@ RUN apt-get update \
  && apt-get install --no-install-recommends --yes \
       build-essential \
       libpq-dev \
-      wait-for-it \
  && rm -r /var/lib/apt/lists/*
 
 
diff --git a/web/app/models.py b/web/app/models.py
index fc12610d7aeff7761c7ea9bbb4f8e67bc2ec4676..e912bf179db7a818e32b49d9bb98b06aa5dc8b3a 100644
--- a/web/app/models.py
+++ b/web/app/models.py
@@ -35,7 +35,7 @@ class Role(db.Model):
     # Fields
     default = db.Column(db.Boolean, default=False, index=True)
     name = db.Column(db.String(64), unique=True)
-    permissions = db.Column(db.BigInteger)
+    permissions = db.Column(db.Integer)
     # Relationships
     users = db.relationship('User', backref='role', lazy='dynamic')
 
diff --git a/web/boot.sh b/web/boot.sh
index 9c87cfd1e30e9de85ed99204075bc7da78a939c5..d6536518fc02985c872522d464fb5d34fcd3d8e7 100755
--- a/web/boot.sh
+++ b/web/boot.sh
@@ -1,21 +1,26 @@
 #!/bin/bash
-source venv/bin/activate
 
-while true; do
-    flask deploy
-    if [[ "$?" == "0" ]]; then
-        break
-    fi
-    echo Deploy command failed, retrying in 5 secs...
-    sleep 5
-done
+if [[ "${NOPAQUE_DAEMON_ENABLED}" == "True" ]]; then
+    echo "Starting nopaque daemon..."
+    ./nopaque-daemon.sh &
+fi
+
+source venv/bin/activate
 
-if [[ "$#" -eq 0 ]]; then
+if [[ "${#}" -eq 0 ]]; then
+    while true; do
+        flask deploy
+        if [[ "${?}" == "0" ]]; then
+            break
+        fi
+        echo Deploy command failed, retrying in 5 secs...
+        sleep 5
+    done
     python nopaque.py
-elif [[ "$1" == "flask" ]]; then
+elif [[ "${1}" == "flask" ]]; then
     exec ${@:1}
 else
-    echo "$0 [COMMAND]"
+    echo "${0} [COMMAND]"
     echo ""
     echo "nopaque startup script"
     echo ""
diff --git a/web/nopaque-daemon.sh b/web/nopaque-daemon.sh
new file mode 100755
index 0000000000000000000000000000000000000000..7a90364602c827a27c31d4f758242ca85325d68d
--- /dev/null
+++ b/web/nopaque-daemon.sh
@@ -0,0 +1,7 @@
+#!/bin/bash
+source venv/bin/activate
+
+while true; do
+    flask tasks
+    sleep 10
+done