diff --git a/pyproject.toml b/pyproject.toml
index a0a2ae0..db4f90b 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -27,8 +27,8 @@ classifiers = [
     "Topic :: Scientific/Engineering :: GIS",
 ]
 dependencies = [
-    "titiler.core>=0.15.2,<0.16",
-    "titiler.mosaic>=0.15.2,<0.16",
+    "titiler.core>=0.16.0,<0.17",
+    "titiler.mosaic>=0.16.0,<0.17",
     "geojson-pydantic~=1.0",
     "pydantic>=2.4,<3.0",
     "pydantic-settings~=2.0",
diff --git a/titiler/pgstac/factory.py b/titiler/pgstac/factory.py
index 32bdc73..ffff269 100644
--- a/titiler/pgstac/factory.py
+++ b/titiler/pgstac/factory.py
@@ -75,15 +75,15 @@ def _first_value(values: List[Any], default: Any = None):
     return next(filter(lambda x: x is not None, values), default)
 
 
-DEFAULT_TEMPLATES = Jinja2Templates(
-    directory="",
+jinja2_env = jinja2.Environment(
     loader=jinja2.ChoiceLoader(
         [
             jinja2.PackageLoader(__package__, "templates"),
             jinja2.PackageLoader("titiler.core", "templates"),
         ]
     ),
-)  # type:ignore
+)
+DEFAULT_TEMPLATES = Jinja2Templates(env=jinja2_env)
 
 
 def check_query_params(
diff --git a/titiler/pgstac/main.py b/titiler/pgstac/main.py
index dcab6bd..9e9a672 100644
--- a/titiler/pgstac/main.py
+++ b/titiler/pgstac/main.py
@@ -38,11 +38,14 @@
 logging.getLogger("botocore.utils").disabled = True
 logging.getLogger("rio-tiler").setLevel(logging.ERROR)
 
-templates = Jinja2Templates(
-    directory="",
-    loader=jinja2.ChoiceLoader([jinja2.PackageLoader(__package__, "templates")]),
-)  # type:ignore
-
+jinja2_env = jinja2.Environment(
+    loader=jinja2.ChoiceLoader(
+        [
+            jinja2.PackageLoader(__package__, "templates"),
+        ]
+    ),
+)
+templates = Jinja2Templates(env=jinja2_env)
 
 postgres_settings = PostgresSettings()
 settings = ApiSettings()