diff --git a/app/core/router.py b/app/core/router.py
index 0d1a300..475be95 100644
--- a/app/core/router.py
+++ b/app/core/router.py
@@ -2,19 +2,17 @@ from fastapi import APIRouter, Request
 
 from fastapi.responses import HTMLResponse
 from jinja2 import Environment, FileSystemLoader, select_autoescape
+from fastapi.templating import Jinja2Templates
 
 router = APIRouter()
 
 # Inicjalizacja Jinja2
-templates_env = Environment(
-  loader=FileSystemLoader("app/templates"),
-  autoescape=select_autoescape(["html", "xml"]),
-)
+templates = Jinja2Templates(directory="app/templates")
 
 
 # Przykładowy endpoint HTML
 @router.get("/", response_class=HTMLResponse)
 async def index(request: Request) -> HTMLResponse:
-  template = templates_env.get_template("index.html")
-  html = template.render(title="Strona główna", request=request)
-  return HTMLResponse(content=html)
+  return templates.TemplateResponse(name="index.html",
+                                    request=request,
+                                    context={"title": "Strona Główna"})