diff --git a/args.go b/args.go
index baccdfe..6f94f74 100644
--- a/args.go
+++ b/args.go
@@ -20,6 +20,7 @@ func (b *bot) parseArgs(args []string) error {
 	flags.StringVar(&cliConfig.LogConvIDStr, "log-convid", "", "sets the keybase chat1.ConvIDStr to log debugging to keybase chat.")
 	flags.StringVar(&cliConfig.FeedbackConvIDStr, "feedback-convid", "", "sets the keybase chat1.ConvIDStr to send feedback to.")
 	flags.StringVar(&cliConfig.FeedbackTeamAdvert, "feedback-team-advert", "", "sets the keybase team/channel to advertise feedback. @team#channel")
+	flags.StringVar(&cliConfig.KVStoreTeam, "kvstore-team", "", "sets the keybase team where kvstore values are stored")
 	if err := flags.Parse(args[1:]); err != nil {
 		return err
 	}
@@ -38,6 +39,9 @@ func (b *bot) parseArgs(args []string) error {
 		if cliConfig.FeedbackTeamAdvert != "" {
 			b.config.FeedbackTeamAdvert = cliConfig.FeedbackTeamAdvert
 		}
+		if cliConfig.KVStoreTeam != "" {
+			b.config.KVStoreTeam = cliConfig.KVStoreTeam
+		}
 	}
 
 	// then print the running options
@@ -48,6 +52,9 @@ func (b *bot) parseArgs(args []string) error {
 	if b.config.FeedbackConvIDStr != "" {
 		b.debug("Feedback enabled to %s and advertising %s", b.config.FeedbackConvIDStr, b.config.FeedbackTeamAdvert)
 	}
+	if b.config.KVStoreTeam != "" {
+		b.debug("keybase kvstore enabled in @%s", b.config.KVStoreTeam)
+	}
 
 	return nil
 }
diff --git a/main.go b/main.go
index d7c7b6f..34494e8 100644
--- a/main.go
+++ b/main.go
@@ -29,6 +29,7 @@ type botConfig struct {
 	LogConvIDStr       string `env:"BOT_LOG_CONVID" envDefault:""`
 	FeedbackConvIDStr  string `env:"BOT_FEEDBACK_CONVID" envDefault:""`
 	FeedbackTeamAdvert string `env:"BOT_FEEDBACK_TEAM_ADVERT" envDefault:""`
+	KVStoreTeam        string `env:"BOT_KVSTORE_TEAM" envDefault:""`
 }
 
 // hold reply information when needed