diff --git a/jj/config.toml b/jj/config.toml
index cd78f0f..c4c9f31 100644
--- a/jj/config.toml
+++ b/jj/config.toml
@@ -65,6 +65,8 @@ backend = "gpg"
 key = "redacted"
 
 [git]
-auto-local-bookmark = true
+#auto-local-bookmark = true
 push-bookmark-prefix = "troy0820/feat-"
 
+[remotes.origin]
+auto-track-bookmarks = 'true'