diff --git a/bin/docker-entrypoint b/bin/docker-entrypoint
index 5e777c10ed..219d3fe16a 100755
--- a/bin/docker-entrypoint
+++ b/bin/docker-entrypoint
@@ -2,18 +2,30 @@
 set -e
 
 scheduler() {
+  echo "Upgrading database..."
+
+  /app/manage.py db upgrade
+
   echo "Starting RQ scheduler..."
 
   exec /app/manage.py rq scheduler
 }
 
 dev_scheduler() {
+  echo "Upgrading database..."
+
+  /app/manage.py db upgrade
+
   echo "Starting dev RQ scheduler..."
 
   exec watchmedo auto-restart --directory=./redash/ --pattern=*.py --recursive -- ./manage.py rq scheduler
 }
 
 worker() {
+  echo "Upgrading database..."
+
+  /app/manage.py db upgrade
+
   echo "Starting RQ worker..."
 
   export WORKERS_COUNT=${WORKERS_COUNT:-2}
@@ -36,12 +48,20 @@ workers_healthcheck() {
 }
 
 dev_worker() {
+  echo "Upgrading database..."
+
+  /app/manage.py db upgrade
+
   echo "Starting dev RQ worker..."
 
   exec watchmedo auto-restart --directory=./redash/ --pattern=*.py --recursive -- ./manage.py rq worker $QUEUES
 }
 
 server() {
+  echo "Upgrading database..."
+
+  /app/manage.py db upgrade
+
   # Recycle gunicorn workers every n-th request. See http://docs.gunicorn.org/en/stable/settings.html#max-requests for more details.
   MAX_REQUESTS=${MAX_REQUESTS:-1000}
   MAX_REQUESTS_JITTER=${MAX_REQUESTS_JITTER:-100}