diff --git a/package.json b/package.json
index efae70658..df66e5eca 100644
--- a/package.json
+++ b/package.json
@@ -24,7 +24,7 @@
     "database:migrate": "prisma migrate deploy",
     "database:push": "prisma db push",
     "database:seed": "prisma db seed",
-    "database:setup": "yarn database:push && yarn database:seed",
+    "database:setup": "yarn database:push && yarn database:seed && sh ./prisma/baseline.sh",
     "dep-graph": "nx dep-graph",
     "e2e": "ng e2e",
     "format": "nx format:write",
diff --git a/prisma/baseline.sh b/prisma/baseline.sh
new file mode 100644
index 000000000..e85a909d4
--- /dev/null
+++ b/prisma/baseline.sh
@@ -0,0 +1,8 @@
+#!/bin/sh
+
+#List all migration scripts based on folder name, and mark it as "applied"
+
+for d in ./prisma/migrations/*/; do 
+	mig=$(echo "$d" | sed 's/.\/prisma\/migrations\///' | sed 's/\///')
+	yarn prisma migrate resolve --applied $mig
+done
\ No newline at end of file