diff --git a/src/runboat/api.py b/src/runboat/api.py
index 26118b9..55cfaf5 100644
--- a/src/runboat/api.py
+++ b/src/runboat/api.py
@@ -1,6 +1,6 @@
 import asyncio
 import datetime
-from typing import AsyncGenerator
+from collections.abc import AsyncGenerator
 
 from ansi2html import Ansi2HTMLConverter
 from fastapi import APIRouter, Depends, HTTPException, Request, status
diff --git a/src/runboat/controller.py b/src/runboat/controller.py
index 64e86b4..225c7f4 100644
--- a/src/runboat/controller.py
+++ b/src/runboat/controller.py
@@ -1,6 +1,7 @@
 import asyncio
 import logging
-from typing import Any, Awaitable, Callable
+from collections.abc import Awaitable
+from typing import Any, Callable
 
 from . import k8s
 from .db import BuildsDb
diff --git a/src/runboat/db.py b/src/runboat/db.py
index c53baf7..04dab58 100644
--- a/src/runboat/db.py
+++ b/src/runboat/db.py
@@ -1,7 +1,8 @@
 import logging
 import sqlite3
+from collections.abc import Iterator
 from enum import Enum
-from typing import Any, Iterator, Protocol, cast
+from typing import Any, Protocol, cast
 from weakref import WeakSet
 
 from .github import CommitInfo
diff --git a/src/runboat/k8s.py b/src/runboat/k8s.py
index 0b1015c..adb345e 100644
--- a/src/runboat/k8s.py
+++ b/src/runboat/k8s.py
@@ -4,11 +4,12 @@ import os
 import shutil
 import subprocess
 import tempfile
+from collections.abc import Generator
 from contextlib import contextmanager
 from enum import Enum
 from importlib import resources
 from pathlib import Path
-from typing import Any, Callable, Generator, TypedDict, cast
+from typing import Any, Callable, TypedDict, cast
 
 import urllib3
 from jinja2 import Template
diff --git a/src/runboat/utils.py b/src/runboat/utils.py
index 3a5d4bc..c61ab06 100644
--- a/src/runboat/utils.py
+++ b/src/runboat/utils.py
@@ -1,18 +1,10 @@
 import asyncio
 import functools
 import re
+from collections.abc import AsyncGenerator, Awaitable, Generator, Iterator
 from concurrent.futures.thread import ThreadPoolExecutor
 from functools import wraps
-from typing import (
-    Any,
-    AsyncGenerator,
-    Awaitable,
-    Callable,
-    Generator,
-    Iterator,
-    ParamSpec,
-    TypeVar,
-)
+from typing import Any, Callable, ParamSpec, TypeVar
 
 _pool = ThreadPoolExecutor(max_workers=20, thread_name_prefix="sync_to_async")