diff --git a/src/utils/bedrock_agent_helper.py b/src/utils/bedrock_agent_helper.py
index e20b77ff..1facd2e0 100644
--- a/src/utils/bedrock_agent_helper.py
+++ b/src/utils/bedrock_agent_helper.py
@@ -947,7 +947,7 @@ def create_agent(
         _agent_id = None
 
         _kwargs = {}
-
+        
         if routing_classifier_model is not None:
             _kwargs["promptOverrideConfiguration"] = {
                 "promptConfigurations": [
@@ -960,6 +960,13 @@ def create_agent(
                     }
                 ]
             }
+            
+        if prompt_override_configuration is not None:
+            if routing_classifier_model is not None:
+                routing_config = _kwargs["promptOverrideConfiguration"]["promptConfigurations"]
+                prompt_override_configuration["promptConfigurations"] = routing_config + prompt_override_configuration["promptConfigurations"]
+            _kwargs["promptOverrideConfiguration"] = prompt_override_configuration
+            
         if guardrail_id is not None:
             _kwargs["guardrailConfiguration"] = {
                 "guardrailIdentifier": guardrail_id,