diff --git a/store/datastore/ddl/mysql/ddl_gen.go b/store/datastore/ddl/mysql/ddl_gen.go
index 1522076be..79da2b3f9 100644
--- a/store/datastore/ddl/mysql/ddl_gen.go
+++ b/store/datastore/ddl/mysql/ddl_gen.go
@@ -168,6 +168,10 @@ var migrations = []struct {
 		name: "update-table-set-config-name",
 		stmt: updateTableSetConfigName,
 	},
+	{
+		name: "populate-build-config",
+		stmt: populateBuildConfig,
+	},
 }
 
 // Migrate performs the database migration. If the migration fails
@@ -660,3 +664,12 @@ ALTER TABLE config ADD COLUMN config_name TEXT
 var updateTableSetConfigName = `
 UPDATE config SET config_name = "drone"
 `
+
+//
+// 021_populate_build_config.sql
+//
+
+var populateBuildConfig = `
+INSERT INTO build_config (config_id, build_id)
+SELECT build_config_id, build_id FROM builds
+`
diff --git a/store/datastore/ddl/mysql/files/021_populate_build_config.sql b/store/datastore/ddl/mysql/files/021_populate_build_config.sql
new file mode 100644
index 000000000..e004b81c9
--- /dev/null
+++ b/store/datastore/ddl/mysql/files/021_populate_build_config.sql
@@ -0,0 +1,4 @@
+-- name: populate-build-config
+
+INSERT INTO build_config (config_id, build_id)
+SELECT build_config_id, build_id FROM builds
diff --git a/store/datastore/ddl/postgres/ddl_gen.go b/store/datastore/ddl/postgres/ddl_gen.go
index e98fbe40d..1fe2828e9 100644
--- a/store/datastore/ddl/postgres/ddl_gen.go
+++ b/store/datastore/ddl/postgres/ddl_gen.go
@@ -168,6 +168,10 @@ var migrations = []struct {
 		name: "update-table-set-config-name",
 		stmt: updateTableSetConfigName,
 	},
+	{
+		name: "populate-build-config",
+		stmt: populateBuildConfig,
+	},
 }
 
 // Migrate performs the database migration. If the migration fails
@@ -662,3 +666,12 @@ ALTER TABLE config ADD COLUMN config_name TEXT
 var updateTableSetConfigName = `
 UPDATE config SET config_name = 'drone'
 `
+
+//
+// 021_populate_build_config.sql
+//
+
+var populateBuildConfig = `
+INSERT INTO build_config (config_id, build_id)
+SELECT build_config_id, build_id FROM builds
+`
diff --git a/store/datastore/ddl/postgres/files/021_populate_build_config.sql b/store/datastore/ddl/postgres/files/021_populate_build_config.sql
new file mode 100644
index 000000000..e004b81c9
--- /dev/null
+++ b/store/datastore/ddl/postgres/files/021_populate_build_config.sql
@@ -0,0 +1,4 @@
+-- name: populate-build-config
+
+INSERT INTO build_config (config_id, build_id)
+SELECT build_config_id, build_id FROM builds
diff --git a/store/datastore/ddl/sqlite/ddl_gen.go b/store/datastore/ddl/sqlite/ddl_gen.go
index b84546b5c..1da2de86b 100644
--- a/store/datastore/ddl/sqlite/ddl_gen.go
+++ b/store/datastore/ddl/sqlite/ddl_gen.go
@@ -172,6 +172,10 @@ var migrations = []struct {
 		name: "update-table-set-config-name",
 		stmt: updateTableSetConfigName,
 	},
+	{
+		name: "populate-build-config",
+		stmt: populateBuildConfig,
+	},
 }
 
 // Migrate performs the database migration. If the migration fails
@@ -661,3 +665,12 @@ ALTER TABLE config ADD COLUMN config_name TEXT
 var updateTableSetConfigName = `
 UPDATE config SET config_name = "drone"
 `
+
+//
+// 021_populate_build_config.sql
+//
+
+var populateBuildConfig = `
+INSERT INTO build_config (config_id, build_id)
+SELECT build_config_id, build_id FROM builds
+`
diff --git a/store/datastore/ddl/sqlite/files/021_populate_build_config.sql b/store/datastore/ddl/sqlite/files/021_populate_build_config.sql
new file mode 100644
index 000000000..e004b81c9
--- /dev/null
+++ b/store/datastore/ddl/sqlite/files/021_populate_build_config.sql
@@ -0,0 +1,4 @@
+-- name: populate-build-config
+
+INSERT INTO build_config (config_id, build_id)
+SELECT build_config_id, build_id FROM builds