diff --git a/pkg/serverinit/env.go b/pkg/serverinit/env.go
index 43950e2fa..ac12ecef7 100644
--- a/pkg/serverinit/env.go
+++ b/pkg/serverinit/env.go
@@ -77,7 +77,8 @@ func DefaultEnvConfig() (*Config, error) {
 	if v := os.Getenv("MYSQLDB_PORT"); strings.HasPrefix(v, "tcp://") {
 		hostPort := strings.TrimPrefix(v, "tcp://")
 		highConf.MySQL = "root@" + hostPort + ":" // no password
-		highConf.DBNames["queue-sync-to-index"] = "camsyncqueue_index"
+		highConf.DBNames["queue-sync-to-index"] = "sync_index_queue"
+		highConf.DBNames["ui_thumbcache"] = "ui_thumbmeta_cache"
 	} else {
 		// TODO: also detect Cloud SQL.
 		highConf.KVFile = "/index.kv"