diff --git a/bin/docker-entrypoint b/bin/docker-entrypoint
index 5e777c10ed..cb81c263f8 100755
--- a/bin/docker-entrypoint
+++ b/bin/docker-entrypoint
@@ -42,6 +42,10 @@ dev_worker() {
 }
 
 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}
diff --git a/client/cypress/cypress.js b/client/cypress/cypress.js
index 320402f18d..02ce35b2f8 100644
--- a/client/cypress/cypress.js
+++ b/client/cypress/cypress.js
@@ -47,9 +47,10 @@ function buildServer() {
 }
 
 function startServer() {
+  console.log("Creating the database...");
+  execSync("docker compose -p cypress run server create_db", { stdio: "inherit" });
   console.log("Starting the server...");
   execSync("docker compose -p cypress up -d", { stdio: "inherit" });
-  execSync("docker compose -p cypress run server create_db", { stdio: "inherit" });
 }
 
 function stopServer() {