diff --git a/src/Infrastructure/BotSharp.Core/Conversations/Services/ConversationService.cs b/src/Infrastructure/BotSharp.Core/Conversations/Services/ConversationService.cs
index c810790e..4a5ac778 100644
--- a/src/Infrastructure/BotSharp.Core/Conversations/Services/ConversationService.cs
+++ b/src/Infrastructure/BotSharp.Core/Conversations/Services/ConversationService.cs
@@ -12,7 +12,7 @@ public partial class ConversationService : IConversationService
     private readonly IConversationStorage _storage;
     private readonly IConversationStateService _state;
     private string _conversationId;
-    private const string AIAssistant = "01fcc3e5-9af7-49e6-ad7a-a760bd12dc4a";
+    private const string AIAssistant = BuiltInAgentId.AIAssistant;
 
     public string ConversationId => _conversationId;
 
diff --git a/src/Infrastructure/BotSharp.Core/Translation/TranslationResponseHook.cs b/src/Infrastructure/BotSharp.Core/Translation/TranslationResponseHook.cs
index 755aa110..3df585f2 100644
--- a/src/Infrastructure/BotSharp.Core/Translation/TranslationResponseHook.cs
+++ b/src/Infrastructure/BotSharp.Core/Translation/TranslationResponseHook.cs
@@ -11,7 +11,7 @@ namespace BotSharp.Logger.Hooks
     {
         private readonly IServiceProvider _services;
         private readonly IConversationStateService _states;
-        private const string AIAssistant = "01fcc3e5-9af7-49e6-ad7a-a760bd12dc4a";
+        private const string AIAssistant = BuiltInAgentId.AIAssistant;
 
         public TranslationResponseHook(IServiceProvider services,
             IConversationStateService states)
diff --git a/tests/BotSharp.Plugin.PizzaBot/Hooks/PizzaBotAgentHook.cs b/tests/BotSharp.Plugin.PizzaBot/Hooks/PizzaBotAgentHook.cs
index 76ac568b..ff2eb8f6 100644
--- a/tests/BotSharp.Plugin.PizzaBot/Hooks/PizzaBotAgentHook.cs
+++ b/tests/BotSharp.Plugin.PizzaBot/Hooks/PizzaBotAgentHook.cs
@@ -1,10 +1,11 @@
 using BotSharp.Abstraction.Agents;
+using BotSharp.Abstraction.Agents.Enums;
 
 namespace BotSharp.Plugin.PizzaBot.Hooks;
 
 public class PizzaBotAgentHook : AgentHookBase
 {
-    public override string SelfId => "01fcc3e5-9af7-49e6-ad7a-a760bd12dc4a";
+    public override string SelfId => BuiltInAgentId.AIAssistant;
 
     public PizzaBotAgentHook(IServiceProvider services, AgentSettings settings)
         : base(services, settings)