diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
index fd91d3bf3..ae62457dc 100644
--- a/.pre-commit-config.yaml
+++ b/.pre-commit-config.yaml
@@ -39,7 +39,7 @@ repos:
     rev: v3.1.0
     hooks:
       - id: pyupgrade
-        args: [--py36-plus]
+        args: [--py38-plus]
 
   - repo: https://github.com/psf/black
     rev: 22.10.0
diff --git a/analyzer/libretime_analyzer/pipeline/_utils.py b/analyzer/libretime_analyzer/pipeline/_utils.py
index 4ccddc08e..21034984a 100644
--- a/analyzer/libretime_analyzer/pipeline/_utils.py
+++ b/analyzer/libretime_analyzer/pipeline/_utils.py
@@ -1,4 +1,4 @@
-from subprocess import PIPE, CalledProcessError, CompletedProcess, run
+from subprocess import CalledProcessError, CompletedProcess, run
 
 from loguru import logger
 
@@ -8,9 +8,8 @@ def run_(*args, **kwargs) -> CompletedProcess:
         return run(
             args,
             check=True,
-            stdout=PIPE,
-            stderr=PIPE,
-            universal_newlines=True,
+            capture_output=True,
+            text=True,
             **kwargs,
         )
 
diff --git a/analyzer/libretime_analyzer/pipeline/pipeline.py b/analyzer/libretime_analyzer/pipeline/pipeline.py
index f2633cbf5..fd9ff5d04 100644
--- a/analyzer/libretime_analyzer/pipeline/pipeline.py
+++ b/analyzer/libretime_analyzer/pipeline/pipeline.py
@@ -1,9 +1,8 @@
 from enum import Enum
 from queue import Queue
-from typing import Any, Dict
+from typing import Any, Dict, Protocol
 
 from loguru import logger
-from typing_extensions import Protocol
 
 from .analyze_cuepoint import analyze_cuepoint
 from .analyze_metadata import analyze_metadata
diff --git a/playout/libretime_playout/config.py b/playout/libretime_playout/config.py
index 661ab2404..1cb19e8fe 100644
--- a/playout/libretime_playout/config.py
+++ b/playout/libretime_playout/config.py
@@ -1,5 +1,5 @@
 from pathlib import Path
-from typing import List
+from typing import List, Literal
 
 from libretime_shared.config import (
     BaseConfig,
@@ -8,7 +8,6 @@ from libretime_shared.config import (
     StreamConfig,
 )
 from pydantic import BaseModel
-from typing_extensions import Literal
 
 CACHE_DIR = Path.cwd() / "scheduler"
 RECORD_DIR = Path.cwd() / "recorder"
diff --git a/playout/libretime_playout/liquidsoap/client/_client.py b/playout/libretime_playout/liquidsoap/client/_client.py
index 5eb8ee72d..054ac9cfd 100644
--- a/playout/libretime_playout/liquidsoap/client/_client.py
+++ b/playout/libretime_playout/liquidsoap/client/_client.py
@@ -1,10 +1,9 @@
 from pathlib import Path
 from subprocess import CalledProcessError, check_output, run
 from time import sleep
-from typing import Any, Optional, Tuple
+from typing import Any, Literal, Optional, Tuple
 
 from loguru import logger
-from typing_extensions import Literal
 
 from ..version import parse_liquidsoap_version
 from ._connection import LiquidsoapConnection
diff --git a/playout/libretime_playout/liquidsoap/version.py b/playout/libretime_playout/liquidsoap/version.py
index b97d249d9..b01a767a3 100644
--- a/playout/libretime_playout/liquidsoap/version.py
+++ b/playout/libretime_playout/liquidsoap/version.py
@@ -1,5 +1,5 @@
 import re
-from subprocess import PIPE, run
+from subprocess import run
 from typing import Tuple
 
 LIQUIDSOAP_VERSION_RE = re.compile(r"(?:Liquidsoap )?(\d+).(\d+).(\d+)")
@@ -18,9 +18,8 @@ def get_liquidsoap_version() -> Tuple[int, int, int]:
     cmd = run(
         ("liquidsoap", "--check", "print(liquidsoap.version) shutdown()"),
         check=True,
-        stdout=PIPE,
-        stderr=PIPE,
-        universal_newlines=True,
+        capture_output=True,
+        text=True,
     )
 
     return parse_liquidsoap_version(cmd.stdout)
diff --git a/playout/tests/liquidsoap/client/connection_test.py b/playout/tests/liquidsoap/client/connection_test.py
index d6f62303f..20ac3a103 100644
--- a/playout/tests/liquidsoap/client/connection_test.py
+++ b/playout/tests/liquidsoap/client/connection_test.py
@@ -67,7 +67,7 @@ def liq_conn_fixture(request, tmp_path_factory):
         ("liquidsoap", "--debug", str(entrypoint)),
         stdout=PIPE,
         stderr=STDOUT,
-        universal_newlines=True,
+        text=True,
     ) as process:
         if request.param == "telnet":
             sleep(2)
diff --git a/shared/libretime_shared/config/_models.py b/shared/libretime_shared/config/_models.py
index 08f96fee0..8b2db281d 100644
--- a/shared/libretime_shared/config/_models.py
+++ b/shared/libretime_shared/config/_models.py
@@ -1,9 +1,9 @@
 from enum import Enum
-from typing import TYPE_CHECKING, Any, List, Optional, Sequence, Union
+from typing import TYPE_CHECKING, Any, List, Literal, Optional, Sequence, Union
 
 # pylint: disable=no-name-in-module
 from pydantic import AnyHttpUrl, AnyUrl, BaseModel, Field, validator
-from typing_extensions import Annotated, Literal
+from typing_extensions import Annotated
 
 try:
     from zoneinfo import ZoneInfo, ZoneInfoNotFoundError