diff --git a/llama_stack/providers/utils/inference/prompt_adapter.py b/llama_stack/providers/utils/inference/prompt_adapter.py
index 269f84d6c..b7945dee7 100644
--- a/llama_stack/providers/utils/inference/prompt_adapter.py
+++ b/llama_stack/providers/utils/inference/prompt_adapter.py
@@ -14,13 +14,6 @@ from typing import List, Optional, Tuple, Union
 
 import httpx
 from llama_models.llama3.api.chat_format import ChatFormat
-from llama_models.llama3.prompt_templates import (
-    BuiltinToolGenerator,
-    FunctionTagCustomToolGenerator,
-    JsonCustomToolGenerator,
-    PythonListCustomToolGenerator,
-    SystemDefaultGenerator,
-)
 from PIL import Image as PIL_Image
 
 from llama_stack.apis.common.content_types import (
@@ -51,6 +44,13 @@ from llama_stack.models.llama.datatypes import (
     ToolPromptFormat,
     is_multimodal,
 )
+from llama_stack.models.llama.llama3.prompt_templates import (
+    BuiltinToolGenerator,
+    FunctionTagCustomToolGenerator,
+    JsonCustomToolGenerator,
+    PythonListCustomToolGenerator,
+    SystemDefaultGenerator,
+)
 from llama_stack.models.llama.sku_list import resolve_model
 from llama_stack.providers.utils.inference import supported_inference_models
 
diff --git a/tests/client-sdk/report.py b/tests/client-sdk/report.py
index 543562541..d36fa827f 100644
--- a/tests/client-sdk/report.py
+++ b/tests/client-sdk/report.py
@@ -13,8 +13,12 @@ from typing import Optional
 from urllib.parse import urlparse
 
 import pytest
-from llama_models.datatypes import CoreModelId
-from llama_models.sku_list import (
+from metadata import API_MAPS
+from pytest import CollectReport
+from termcolor import cprint
+
+from llama_stack.models.llama.datatypes import CoreModelId
+from llama_stack.models.llama.sku_list import (
     all_registered_models,
     llama3_1_instruct_models,
     llama3_2_instruct_models,
@@ -22,10 +26,6 @@ from llama_models.sku_list import (
     llama3_instruct_models,
     safety_models,
 )
-from metadata import API_MAPS
-from pytest import CollectReport
-from termcolor import cprint
-
 from llama_stack.providers.datatypes import Api
 from llama_stack.providers.tests.env import get_env_or_fail