diff --git a/llama_stack/models/llama/llama3/prompt_templates/system_prompts.py b/llama_stack/models/llama/llama3/prompt_templates/system_prompts.py
index 9da6a640e..495e3aa83 100644
--- a/llama_stack/models/llama/llama3/prompt_templates/system_prompts.py
+++ b/llama_stack/models/llama/llama3/prompt_templates/system_prompts.py
@@ -279,6 +279,10 @@ class PythonListCustomToolGenerator(PromptTemplateGeneratorBase):  # noqa: N801
                 {% endif -%}
                 {%- endfor %}
             ]
+
+            You are a helpful assisant who can can answer general questions or invoke tools when necessary.
+            In addition to tool calls, you should also augment your responses by using the tool outputs.
+
             """
         )
         return PromptTemplate(
diff --git a/tests/integration/test_cases/inference/chat_completion.json b/tests/integration/test_cases/inference/chat_completion.json
index e6136cc75..648c78ce1 100644
--- a/tests/integration/test_cases/inference/chat_completion.json
+++ b/tests/integration/test_cases/inference/chat_completion.json
@@ -103,10 +103,6 @@
     "data": {
       "messages": [
         [
-          {
-            "role": "system",
-            "content": "You are a helpful assistant who can answer general questions or invoke tools when necessary. In addition to tool calls, you should also augement your responses by using the tool outputs."
-          },
           {
             "role": "user",
             "content": "What's the name of the Sun in latin?"
@@ -159,10 +155,6 @@
     "data": {
       "messages": [
         [
-          {
-            "role": "system",
-            "content": "You are a helpful assistant who can answer general questions or invoke tools when necessary. In addition to tool calls, you should also augement your responses by using the tool outputs."
-          },
           {
             "role": "user",
             "content": "What's the weather like in San Francisco?"
@@ -205,10 +197,6 @@
     "data": {
       "messages": [
         [
-          {
-            "role": "system",
-            "content": "You are a helpful assistant who can answer general questions or invoke tools when necessary. In addition to tool calls, you should also augement your responses by using the tool outputs."
-          },
           {
             "role": "user",
             "content": "Please add a new product with name 'Widget', price 19.99, in stock, and tags ['new', 'sale'] and give me the product id."
@@ -271,7 +259,7 @@
         [
           {
             "role": "system",
-            "content": "Todays date is 2025-03-01.\n\nYou are a helpful assistant who can answer general questions or invoke tools when necessary. In addition to tool calls, you should also augement your responses by using the tool outputs."
+            "content": "Todays date is 2025-03-01."
           },
           {
             "role": "user",
@@ -376,7 +364,7 @@
         [
           {
             "role": "system",
-            "content": "Todays date is 2025-03-01.\n\nYou are a helpful assistant who can answer general questions or invoke tools when necessary. In addition to tool calls, you should also augement your responses by using the tool outputs."
+            "content": "Todays date is 2025-03-01."
           },
           {
             "role": "user",