diff --git a/cmd/server/server.go b/cmd/server/server.go
index d14a86458..e56f19947 100644
--- a/cmd/server/server.go
+++ b/cmd/server/server.go
@@ -367,7 +367,6 @@ func setupEvilGlobals(c *cli.Context, v store.Store, f forge.Forge) {
 	server.Config.Pipeline.Networks = c.StringSlice("network")
 	server.Config.Pipeline.Volumes = c.StringSlice("volume")
 	server.Config.Pipeline.Privileged = c.StringSlice("escalate")
-	server.Config.Server.Migrations.AllowLong = c.Bool("migrations-allow-long")
 
 	// prometheus
 	server.Config.Prometheus.AuthToken = c.String("prometheus-auth-token")
diff --git a/cmd/server/setup.go b/cmd/server/setup.go
index 99a8d76bd..cedec9fe2 100644
--- a/cmd/server/setup.go
+++ b/cmd/server/setup.go
@@ -52,6 +52,8 @@ import (
 )
 
 func setupStore(c *cli.Context) (store.Store, error) {
+	// TODO: find a better way than global var to pass down to allow long migrations
+	server.Config.Server.Migrations.AllowLong = c.Bool("migrations-allow-long")
 	datasource := c.String("datasource")
 	driver := c.String("driver")
 	xorm := store.XORM{