diff --git a/llama_stack/providers/utils/kvstore/redis/redis.py b/llama_stack/providers/utils/kvstore/redis/redis.py
index fb264b15c..8a7f3464b 100644
--- a/llama_stack/providers/utils/kvstore/redis/redis.py
+++ b/llama_stack/providers/utils/kvstore/redis/redis.py
@@ -9,7 +9,7 @@ from typing import List, Optional
 
 from redis.asyncio import Redis
 
-from ..api import *  # noqa: F403
+from ..api import KVStore
 from ..config import RedisKVStoreConfig
 
 
diff --git a/llama_stack/providers/utils/kvstore/sqlite/sqlite.py b/llama_stack/providers/utils/kvstore/sqlite/sqlite.py
index 1c5311d10..623404bb0 100644
--- a/llama_stack/providers/utils/kvstore/sqlite/sqlite.py
+++ b/llama_stack/providers/utils/kvstore/sqlite/sqlite.py
@@ -11,7 +11,7 @@ from typing import List, Optional
 
 import aiosqlite
 
-from ..api import *  # noqa: F403
+from ..api import KVStore
 from ..config import SqliteKVStoreConfig