diff --git a/docs_src/sql_databases/tutorial001.py b/docs_src/sql_databases/tutorial001.py
index be86ec0ee..15d89e226 100644
--- a/docs_src/sql_databases/tutorial001.py
+++ b/docs_src/sql_databases/tutorial001.py
@@ -1,3 +1,4 @@
+from contextlib import asynccontextmanager
 from typing import List, Union
 
 from fastapi import Depends, FastAPI, HTTPException, Query
@@ -27,13 +28,15 @@ def get_session():
         yield session
 
 
-app = FastAPI()
 
 
-@app.on_event("startup")
-def on_startup():
-    create_db_and_tables()
+@asynccontextmanager
+async def lifespan(app:FastAPI):
+    create_db_and_tables() #Startup
+    yield #Allows app to run
+    #Shutdown
 
+app = FastAPI(lifespan=lifespan)
 
 @app.post("/heroes/")
 def create_hero(hero: Hero, session: Session = Depends(get_session)) -> Hero:
diff --git a/docs_src/sql_databases/tutorial001_an.py b/docs_src/sql_databases/tutorial001_an.py
index 8c000d31c..486a6db5f 100644
--- a/docs_src/sql_databases/tutorial001_an.py
+++ b/docs_src/sql_databases/tutorial001_an.py
@@ -1,3 +1,4 @@
+from contextlib import asynccontextmanager
 from typing import List, Union
 
 from fastapi import Depends, FastAPI, HTTPException, Query
@@ -30,13 +31,15 @@ def get_session():
 
 SessionDep = Annotated[Session, Depends(get_session)]
 
-app = FastAPI()
 
+@asynccontextmanager
+async def lifespan(app:FastAPI):
+    create_db_and_tables() #Startup
+    yield #Allows app to run
+    #Shutdown
 
-@app.on_event("startup")
-def on_startup():
-    create_db_and_tables()
 
+app = FastAPI(lifespan=lifespan)
 
 @app.post("/heroes/")
 def create_hero(hero: Hero, session: SessionDep) -> Hero:
diff --git a/docs_src/sql_databases/tutorial001_an_py310.py b/docs_src/sql_databases/tutorial001_an_py310.py
index de1fb81fa..b1b483a35 100644
--- a/docs_src/sql_databases/tutorial001_an_py310.py
+++ b/docs_src/sql_databases/tutorial001_an_py310.py
@@ -1,3 +1,4 @@
+from contextlib import asynccontextmanager
 from typing import Annotated
 
 from fastapi import Depends, FastAPI, HTTPException, Query
@@ -29,13 +30,14 @@ def get_session():
 
 SessionDep = Annotated[Session, Depends(get_session)]
 
-app = FastAPI()
+@asynccontextmanager
+async def lifespan(app:FastAPI):
+    create_db_and_tables() #Startup
+    yield #This Allows app to run
 
+    #Statements below yield are ran after shutdown
 
-@app.on_event("startup")
-def on_startup():
-    create_db_and_tables()
-
+app = FastAPI(lifespan=lifespan)
 
 @app.post("/heroes/")
 def create_hero(hero: Hero, session: SessionDep) -> Hero:
diff --git a/docs_src/sql_databases/tutorial001_an_py39.py b/docs_src/sql_databases/tutorial001_an_py39.py
index 595892746..dd7e7c3e3 100644
--- a/docs_src/sql_databases/tutorial001_an_py39.py
+++ b/docs_src/sql_databases/tutorial001_an_py39.py
@@ -1,3 +1,4 @@
+from contextlib import asynccontextmanager
 from typing import Annotated, Union
 
 from fastapi import Depends, FastAPI, HTTPException, Query
@@ -29,13 +30,15 @@ def get_session():
 
 SessionDep = Annotated[Session, Depends(get_session)]
 
-app = FastAPI()
 
 
-@app.on_event("startup")
-def on_startup():
-    create_db_and_tables()
+@asynccontextmanager
+async def lifespan(app:FastAPI):
+    create_db_and_tables() #Startup
+    yield #Allows app to run
+    #Shutdown
 
+app = FastAPI(lifespan=lifespan)
 
 @app.post("/heroes/")
 def create_hero(hero: Hero, session: SessionDep) -> Hero:
diff --git a/docs_src/sql_databases/tutorial001_py310.py b/docs_src/sql_databases/tutorial001_py310.py
index b58462e6a..91eb5956f 100644
--- a/docs_src/sql_databases/tutorial001_py310.py
+++ b/docs_src/sql_databases/tutorial001_py310.py
@@ -1,3 +1,5 @@
+from contextlib import asynccontextmanager
+
 from fastapi import Depends, FastAPI, HTTPException, Query
 from sqlmodel import Field, Session, SQLModel, create_engine, select
 
@@ -25,13 +27,14 @@ def get_session():
         yield session
 
 
-app = FastAPI()
-
 
-@app.on_event("startup")
-def on_startup():
-    create_db_and_tables()
+@asynccontextmanager
+async def lifespan(app:FastAPI):
+    create_db_and_tables() #Startup
+    yield #Allows app to run
+    #Shutdown
 
+app = FastAPI(lifespan=lifespan)
 
 @app.post("/heroes/")
 def create_hero(hero: Hero, session: Session = Depends(get_session)) -> Hero:
diff --git a/docs_src/sql_databases/tutorial001_py39.py b/docs_src/sql_databases/tutorial001_py39.py
index 410a52d0c..978f90e74 100644
--- a/docs_src/sql_databases/tutorial001_py39.py
+++ b/docs_src/sql_databases/tutorial001_py39.py
@@ -1,3 +1,4 @@
+from contextlib import asynccontextmanager
 from typing import Union
 
 from fastapi import Depends, FastAPI, HTTPException, Query
@@ -27,13 +28,14 @@ def get_session():
         yield session
 
 
-app = FastAPI()
 
+@asynccontextmanager
+async def lifespan(app:FastAPI):
+    create_db_and_tables() #Startup
+    yield #Allows app to run
+    #Shutdown
 
-@app.on_event("startup")
-def on_startup():
-    create_db_and_tables()
-
+app = FastAPI(lifespan=lifespan)
 
 @app.post("/heroes/")
 def create_hero(hero: Hero, session: Session = Depends(get_session)) -> Hero:
diff --git a/docs_src/sql_databases/tutorial002.py b/docs_src/sql_databases/tutorial002.py
index 4350d19c6..f17dfdc09 100644
--- a/docs_src/sql_databases/tutorial002.py
+++ b/docs_src/sql_databases/tutorial002.py
@@ -1,3 +1,4 @@
+from contextlib import asynccontextmanager
 from typing import List, Union
 
 from fastapi import Depends, FastAPI, HTTPException, Query
@@ -44,14 +45,17 @@ def get_session():
         yield session
 
 
-app = FastAPI()
 
 
-@app.on_event("startup")
-def on_startup():
-    create_db_and_tables()
+@asynccontextmanager
+async def lifespan(app:FastAPI):
+    create_db_and_tables() #StartUp
+    yield #Allows app to run
+    #Shut down
 
 
+app = FastAPI(lifespan=lifespan)
+
 @app.post("/heroes/", response_model=HeroPublic)
 def create_hero(hero: HeroCreate, session: Session = Depends(get_session)):
     db_hero = Hero.model_validate(hero)
diff --git a/docs_src/sql_databases/tutorial002_an.py b/docs_src/sql_databases/tutorial002_an.py
index 15e3d7c3a..b5dd22acf 100644
--- a/docs_src/sql_databases/tutorial002_an.py
+++ b/docs_src/sql_databases/tutorial002_an.py
@@ -1,3 +1,4 @@
+from contextlib import asynccontextmanager
 from typing import List, Union
 
 from fastapi import Depends, FastAPI, HTTPException, Query
@@ -46,13 +47,15 @@ def get_session():
 
 
 SessionDep = Annotated[Session, Depends(get_session)]
-app = FastAPI()
 
 
-@app.on_event("startup")
-def on_startup():
-    create_db_and_tables()
+@asynccontextmanager
+async def lifespan(app:FastAPI):
+    create_db_and_tables() #Startup
+    yield #Allows app to run
+    #Shutdown
 
+app = FastAPI(lifespan=lifespan)
 
 @app.post("/heroes/", response_model=HeroPublic)
 def create_hero(hero: HeroCreate, session: SessionDep):
diff --git a/docs_src/sql_databases/tutorial002_an_py310.py b/docs_src/sql_databases/tutorial002_an_py310.py
index 64c554b8a..3989b5082 100644
--- a/docs_src/sql_databases/tutorial002_an_py310.py
+++ b/docs_src/sql_databases/tutorial002_an_py310.py
@@ -1,3 +1,4 @@
+from contextlib import asynccontextmanager
 from typing import Annotated
 
 from fastapi import Depends, FastAPI, HTTPException, Query
@@ -45,13 +46,15 @@ def get_session():
 
 
 SessionDep = Annotated[Session, Depends(get_session)]
-app = FastAPI()
 
 
-@app.on_event("startup")
-def on_startup():
-    create_db_and_tables()
+@asynccontextmanager
+async def lifespan(app:FastAPI):
+    create_db_and_tables() #Startup
+    yield #Allows app to run
+    #Shutdown
 
+app = FastAPI(lifespan=lifespan)
 
 @app.post("/heroes/", response_model=HeroPublic)
 def create_hero(hero: HeroCreate, session: SessionDep):
diff --git a/docs_src/sql_databases/tutorial002_an_py39.py b/docs_src/sql_databases/tutorial002_an_py39.py
index a8a0721ff..8b45dd9db 100644
--- a/docs_src/sql_databases/tutorial002_an_py39.py
+++ b/docs_src/sql_databases/tutorial002_an_py39.py
@@ -1,3 +1,4 @@
+from contextlib import asynccontextmanager
 from typing import Annotated, Union
 
 from fastapi import Depends, FastAPI, HTTPException, Query
@@ -45,13 +46,15 @@ def get_session():
 
 
 SessionDep = Annotated[Session, Depends(get_session)]
-app = FastAPI()
 
 
-@app.on_event("startup")
-def on_startup():
-    create_db_and_tables()
+@asynccontextmanager
+async def lifespan(app:FastAPI):
+    create_db_and_tables() #Startup
+    yield #Allows app to run
+    #Shutdown
 
+app = FastAPI(lifespan=lifespan)
 
 @app.post("/heroes/", response_model=HeroPublic)
 def create_hero(hero: HeroCreate, session: SessionDep):
diff --git a/docs_src/sql_databases/tutorial002_py310.py b/docs_src/sql_databases/tutorial002_py310.py
index ec3d68db5..c71bd19e0 100644
--- a/docs_src/sql_databases/tutorial002_py310.py
+++ b/docs_src/sql_databases/tutorial002_py310.py
@@ -1,3 +1,5 @@
+from contextlib import asynccontextmanager
+
 from fastapi import Depends, FastAPI, HTTPException, Query
 from sqlmodel import Field, Session, SQLModel, create_engine, select
 
@@ -42,13 +44,15 @@ def get_session():
         yield session
 
 
-app = FastAPI()
 
 
-@app.on_event("startup")
-def on_startup():
-    create_db_and_tables()
+@asynccontextmanager
+async def lifespan(app:FastAPI):
+    create_db_and_tables() #Startup
+    yield #Allows app to run
+    #Shutdown
 
+app = FastAPI(lifespan=lifespan)
 
 @app.post("/heroes/", response_model=HeroPublic)
 def create_hero(hero: HeroCreate, session: Session = Depends(get_session)):
diff --git a/docs_src/sql_databases/tutorial002_py39.py b/docs_src/sql_databases/tutorial002_py39.py
index d8f5dd090..412bdb410 100644
--- a/docs_src/sql_databases/tutorial002_py39.py
+++ b/docs_src/sql_databases/tutorial002_py39.py
@@ -1,3 +1,4 @@
+from contextlib import asynccontextmanager
 from typing import Union
 
 from fastapi import Depends, FastAPI, HTTPException, Query
@@ -44,13 +45,14 @@ def get_session():
         yield session
 
 
-app = FastAPI()
 
+@asynccontextmanager
+async def lifespan(app:FastAPI):
+    create_db_and_tables() #Startup
+    yield #Allows app to run
+    #Shutdown
 
-@app.on_event("startup")
-def on_startup():
-    create_db_and_tables()
-
+app = FastAPI(lifespan=lifespan)
 
 @app.post("/heroes/", response_model=HeroPublic)
 def create_hero(hero: HeroCreate, session: Session = Depends(get_session)):