diff --git a/changelog.md b/changelog.md
index 14c5bbe5f..891ebd5a0 100644
--- a/changelog.md
+++ b/changelog.md
@@ -4,6 +4,7 @@
 <!-- Add all new changes here. They will be moved under a version at release -->
 * `FIX` Improve type narrow with **literal alias type** during completion and signature help
 * `NEW` Setting: `Lua.type.inferTableSize`: A Small Table array can be infered
+* `NEW` Add custom repository support for addonManager. New configuration setting: `Lua.addonManager.repositoryBranch` and `Lua.addonManager.repositoryPath`
 
 ## 3.12.0
 `2024-10-30`
diff --git a/locale/en-us/setting.lua b/locale/en-us/setting.lua
index 900373da5..da103ac18 100644
--- a/locale/en-us/setting.lua
+++ b/locale/en-us/setting.lua
@@ -2,6 +2,10 @@
 
 config.addonManager.enable        =
 "Whether the addon manager is enabled or not."
+config.addonManager.repositoryBranch =
+"Specifies the git branch used by the addon manager."
+config.addonManager.repositoryPath =
+"Specifies the git path used by the addon manager."
 config.runtime.version            =
 "Lua runtime version."
 config.runtime.path               =
diff --git a/locale/ja-jp/setting.lua b/locale/ja-jp/setting.lua
index 5727da1b4..fa5b8f233 100644
--- a/locale/ja-jp/setting.lua
+++ b/locale/ja-jp/setting.lua
@@ -2,6 +2,10 @@
 
 config.addonManager.enable        = -- TODO: need translate!
 "Whether the addon manager is enabled or not."
+config.addonManager.repositoryBranch = -- TODO: need translate!
+"Specifies the git branch used by the addon manager."
+config.addonManager.repositoryPath = -- TODO: need translate!
+"Specifies the git path used by the addon manager."
 config.runtime.version            = -- TODO: need translate!
 "Lua runtime version."
 config.runtime.path               = -- TODO: need translate!
diff --git a/locale/pt-br/setting.lua b/locale/pt-br/setting.lua
index 52b03dd20..b58fa7ceb 100644
--- a/locale/pt-br/setting.lua
+++ b/locale/pt-br/setting.lua
@@ -2,6 +2,10 @@
 
 config.addonManager.enable        = -- TODO: need translate!
 "Whether the addon manager is enabled or not."
+config.addonManager.repositoryBranch = -- TODO: need translate!
+"Specifies the git branch used by the addon manager."
+config.addonManager.repositoryPath = -- TODO: need translate!
+"Specifies the git path used by the addon manager."
 config.runtime.version            = -- TODO: need translate!
 "Lua runtime version."
 config.runtime.path               = -- TODO: need translate!
diff --git a/locale/zh-cn/setting.lua b/locale/zh-cn/setting.lua
index 68574d5cd..8dcc4889c 100644
--- a/locale/zh-cn/setting.lua
+++ b/locale/zh-cn/setting.lua
@@ -2,6 +2,10 @@
 
 config.addonManager.enable        =
 "是否启用扩展的附加插件管理器(Addon Manager)"
+config.addonManager.repositoryBranch =
+"指定插件管理器(Addon Manager)使用的git仓库分支"
+config.addonManager.repositoryPath =
+"指定插件管理器(Addon Manager)使用的git仓库路径"
 config.runtime.version            =
 "Lua运行版本。"
 config.runtime.path               =
diff --git a/locale/zh-tw/setting.lua b/locale/zh-tw/setting.lua
index f76bcd746..4747452b0 100644
--- a/locale/zh-tw/setting.lua
+++ b/locale/zh-tw/setting.lua
@@ -2,6 +2,10 @@
 
 config.addonManager.enable        = -- TODO: need translate!
 "Whether the addon manager is enabled or not."
+config.addonManager.repositoryBranch = -- TODO: need translate!
+"Specifies the git branch used by the addon manager."
+config.addonManager.repositoryPath = -- TODO: need translate!
+"Specifies the git path used by the addon manager."
 config.runtime.version            =
 "Lua執行版本。"
 config.runtime.path               =
diff --git a/script/config/template.lua b/script/config/template.lua
index 40ec799ea..3ff09ecc5 100644
--- a/script/config/template.lua
+++ b/script/config/template.lua
@@ -415,6 +415,8 @@ local template = {
     ["Lua.docScriptPath"]                   = Type.String,
     -- VSCode
     ["Lua.addonManager.enable"]             = Type.Boolean >> true,
+    ["Lua.addonManager.repositoryPath"]     = Type.String,
+    ["Lua.addonManager.repositoryBranch"]   = Type.String,
     ['files.associations']                  = Type.Hash(Type.String, Type.String),
                                             -- copy from VSCode default
     ['files.exclude']                       = Type.Hash(Type.String, Type.Boolean) >> {