diff --git a/enterprise/app/models/captain/assistant.rb b/enterprise/app/models/captain/assistant.rb
index 33027ad59..e37d2e9db 100644
--- a/enterprise/app/models/captain/assistant.rb
+++ b/enterprise/app/models/captain/assistant.rb
@@ -93,11 +93,13 @@ class Captain::Assistant < ApplicationRecord
           key: scenario.title.parameterize.underscore,
           description: scenario.description
         }
-      end
+      end,
+      response_guidelines: response_guidelines || [],
+      guardrails: guardrails || []
     }
   end
 
   def default_avatar_url
     "#{ENV.fetch('FRONTEND_URL', nil)}/assets/images/dashboard/captain/logo.svg"
   end
-end
\ No newline at end of file
+end
diff --git a/enterprise/lib/captain/prompts/assistant.liquid b/enterprise/lib/captain/prompts/assistant.liquid
index a268b325b..63ff494ef 100644
--- a/enterprise/lib/captain/prompts/assistant.liquid
+++ b/enterprise/lib/captain/prompts/assistant.liquid
@@ -10,6 +10,20 @@ You are {{ name }}, a helpful AI assistant for {{ product_name }}.
 
 {{ description }}
 
+{% if response_guidelines.size > 0 -%}
+# Response Guidelines
+{% for guideline in response_guidelines -%}
+- {{ guideline }}
+{% endfor %}
+{% endif -%}
+
+{% if guardrails.size > 0 -%}
+# Guardrails
+{% for guardrail in guardrails -%}
+- {{ guardrail }}
+{% endfor %}
+{% endif -%}
+
 # Available Handoffs
 You can hand off conversations to these specialized scenario agents when appropriate:
 {% for scenario in scenarios -%}