diff --git a/app/controllers/discourse_ai/admin/ai_personas_controller.rb b/app/controllers/discourse_ai/admin/ai_personas_controller.rb
index ca92ed50..f8f9b796 100644
--- a/app/controllers/discourse_ai/admin/ai_personas_controller.rb
+++ b/app/controllers/discourse_ai/admin/ai_personas_controller.rb
@@ -125,6 +125,7 @@ module DiscourseAi
             :rag_chunk_overlap_tokens,
             :rag_conversation_chunks,
             :question_consolidator_llm,
+            :role,
             allowed_group_ids: [],
             rag_uploads: [:id],
           )
diff --git a/app/serializers/localized_ai_persona_serializer.rb b/app/serializers/localized_ai_persona_serializer.rb
index d37a2276..6ddc4bd9 100644
--- a/app/serializers/localized_ai_persona_serializer.rb
+++ b/app/serializers/localized_ai_persona_serializer.rb
@@ -23,7 +23,12 @@ class LocalizedAiPersonaSerializer < ApplicationSerializer
              :rag_chunk_tokens,
              :rag_chunk_overlap_tokens,
              :rag_conversation_chunks,
-             :question_consolidator_llm
+             :question_consolidator_llm,
+             :role,
+             :role_tags,
+             :role_category_ids,
+             :role_whispers,
+             :role_max_responses_per_hour
 
   has_one :user, serializer: BasicUserSerializer, embed: :object
   has_many :rag_uploads, serializer: UploadSerializer, embed: :object
diff --git a/assets/javascripts/discourse/admin/models/ai-persona.js b/assets/javascripts/discourse/admin/models/ai-persona.js
index 9b0046d8..697d08f5 100644
--- a/assets/javascripts/discourse/admin/models/ai-persona.js
+++ b/assets/javascripts/discourse/admin/models/ai-persona.js
@@ -26,6 +26,9 @@ const CREATE_ATTRIBUTES = [
   "rag_chunk_overlap_tokens",
   "rag_conversation_chunks",
   "question_consolidator_llm",
+  "role",
+  "role_category_ids",
+  "role_whispers",
 ];
 
 const SYSTEM_ATTRIBUTES = [
diff --git a/assets/javascripts/discourse/components/ai-persona-editor.gjs b/assets/javascripts/discourse/components/ai-persona-editor.gjs
index 334f7af8..9ead6c7d 100644
--- a/assets/javascripts/discourse/components/ai-persona-editor.gjs
+++ b/assets/javascripts/discourse/components/ai-persona-editor.gjs
@@ -23,6 +23,7 @@ import DTooltip from "float-kit/components/d-tooltip";
 import AiCommandSelector from "./ai-command-selector";
 import AiLlmSelector from "./ai-llm-selector";
 import AiPersonaCommandOptions from "./ai-persona-command-options";
+import RoleSelector from "./ai-persona-role-selector";
 import PersonaRagUploader from "./persona-rag-uploader";
 
 export default class PersonaEditor extends Component {
@@ -336,6 +337,14 @@ export default class PersonaEditor extends Component {
           disabled={{this.editingModel.system}}
         />
       </div>
+      <div class="control-group ai-persona-editor__role">
+        <label>{{I18n.t "discourse_ai.ai_persona.role"}}</label>
+        <RoleSelector
+          class="ai-persona-editor__role_selctor"
+          @value={{this.editingModel.role}}
+          @disabled={{this.editingModel.system}}
+        />
+      </div>
       <div class="control-group">
         <label>{{I18n.t "discourse_ai.ai_persona.default_llm"}}</label>
         <AiLlmSelector
diff --git a/assets/javascripts/discourse/components/ai-persona-role-selector.js b/assets/javascripts/discourse/components/ai-persona-role-selector.js
new file mode 100644
index 00000000..9f7ca303
--- /dev/null
+++ b/assets/javascripts/discourse/components/ai-persona-role-selector.js
@@ -0,0 +1,26 @@
+import { computed, observer } from "@ember/object";
+import I18n from "discourse-i18n";
+import ComboBox from "select-kit/components/combo-box";
+
+export default ComboBox.extend({
+  _modelDisabledChanged: observer("attrs.disabled", function () {
+    this.selectKit.options.set("disabled", this.get("attrs.disabled.value"));
+  }),
+
+  content: computed(function () {
+    return [
+      {
+        id: "bot",
+        name: I18n.t("discourse_ai.ai_persona.role_options.bot"),
+      },
+      {
+        id: "message_responder",
+        name: I18n.t("discourse_ai.ai_persona.role_options.message_responder"),
+      },
+    ];
+  }),
+
+  selectKitOptions: {
+    filterable: false,
+  },
+});
diff --git a/config/locales/client.en.yml b/config/locales/client.en.yml
index 9de90254..5e059b39 100644
--- a/config/locales/client.en.yml
+++ b/config/locales/client.en.yml
@@ -137,6 +137,10 @@ en:
         mentionable: Mentionable
         mentionable_help: If enabled, users in allowed groups can mention this user in posts and messages, the AI will respond as this persona.
         user: User
+        role: Role
+        role_options:
+          bot: Bot
+          message_responder: Message Responder
         create_user: Create User
         create_user_help: You can optionally attach a user to this persona. If you do, the AI will use this user to respond to requests.
         default_llm: Default Language Model