diff --git a/config/nvim/lua/custom/plugins/init.lua b/config/nvim/lua/custom/plugins/init.lua
index 1e26fa9..7c32d34 100644
--- a/config/nvim/lua/custom/plugins/init.lua
+++ b/config/nvim/lua/custom/plugins/init.lua
@@ -441,8 +441,19 @@ return {
           reverse_switch_windows = '<S-Tab>',
         },
       },
+      -- The custom_tools type supports both a list and a function that returns a list. Using a function here prevents requiring mcphub before it's loaded
+      custom_tools = function()
+        return {
+          require('mcphub.extensions.avante').mcp_tool(),
+        }
+      end,
       hints = { enabled = true },
       provider = 'gemini-pro',
+      -- The system_prompt type supports both a string and a function that returns a string. Using a function here allows dynamically updating the prompt with `mcphub`
+      system_prompt = function()
+        local hub = require('mcphub').get_hub_instance()
+        return hub and hub:get_active_servers_prompt() or ''
+      end,
       vendors = {
         ['gemini-pro'] = {
           __inherited_from = 'gemini',