diff --git a/docs/sources/shared/configuration.md b/docs/sources/shared/configuration.md
index 11ecf0b370..1b2123206b 100644
--- a/docs/sources/shared/configuration.md
+++ b/docs/sources/shared/configuration.md
@@ -129,19 +129,19 @@ ui:
       [type: <string> | default = ""]
 
       # CloudSQL host for Goldfish database.
-      # CLI flag: -ui.goldfish.cloudsql.host
+      # CLI flag: -ui.goldfish.storage.cloudsql.host
       [cloudsql_host: <string> | default = "127.0.0.1"]
 
       # CloudSQL port for Goldfish database.
-      # CLI flag: -ui.goldfish.cloudsql.port
+      # CLI flag: -ui.goldfish.storage.cloudsql.port
       [cloudsql_port: <int> | default = 3306]
 
       # CloudSQL database name for Goldfish.
-      # CLI flag: -ui.goldfish.cloudsql.database
+      # CLI flag: -ui.goldfish.storage.cloudsql.database
       [cloudsql_database: <string> | default = "goldfish"]
 
       # CloudSQL username for Goldfish database.
-      # CLI flag: -ui.goldfish.cloudsql.user
+      # CLI flag: -ui.goldfish.storage.cloudsql.user
       [cloudsql_user: <string> | default = ""]
 
       # RDS endpoint (host:port)
diff --git a/pkg/ui/config.go b/pkg/ui/config.go
index cca8a4e883..418761696d 100644
--- a/pkg/ui/config.go
+++ b/pkg/ui/config.go
@@ -67,10 +67,10 @@ func (cfg *Config) RegisterFlags(f *flag.FlagSet) {
 	f.StringVar(&cfg.Goldfish.Storage.Type, "ui.goldfish.storage.type", "", "Storage backend type (cloudsql, rds, or empty for no storage)")
 
 	// CloudSQL flags
-	f.StringVar(&cfg.Goldfish.Storage.CloudSQLUser, "ui.goldfish.cloudsql.user", "", "CloudSQL username for Goldfish database.")
-	f.StringVar(&cfg.Goldfish.Storage.CloudSQLHost, "ui.goldfish.cloudsql.host", "127.0.0.1", "CloudSQL host for Goldfish database.")
-	f.IntVar(&cfg.Goldfish.Storage.CloudSQLPort, "ui.goldfish.cloudsql.port", 3306, "CloudSQL port for Goldfish database.")
-	f.StringVar(&cfg.Goldfish.Storage.CloudSQLDatabase, "ui.goldfish.cloudsql.database", "goldfish", "CloudSQL database name for Goldfish.")
+	f.StringVar(&cfg.Goldfish.Storage.CloudSQLUser, "ui.goldfish.storage.cloudsql.user", "", "CloudSQL username for Goldfish database.")
+	f.StringVar(&cfg.Goldfish.Storage.CloudSQLHost, "ui.goldfish.storage.cloudsql.host", "127.0.0.1", "CloudSQL host for Goldfish database.")
+	f.IntVar(&cfg.Goldfish.Storage.CloudSQLPort, "ui.goldfish.storage.cloudsql.port", 3306, "CloudSQL port for Goldfish database.")
+	f.StringVar(&cfg.Goldfish.Storage.CloudSQLDatabase, "ui.goldfish.storage.cloudsql.database", "goldfish", "CloudSQL database name for Goldfish.")
 
 	// RDS flags
 	f.StringVar(&cfg.Goldfish.Storage.RDSEndpoint, "ui.goldfish.storage.rds.endpoint", "", "RDS endpoint (host:port)")