diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
index 3d2ffe3385..92c9949680 100644
--- a/.pre-commit-config.yaml
+++ b/.pre-commit-config.yaml
@@ -103,10 +103,10 @@ repos:
         name: Check type annotations in python files
         entry: tools/ci/check_type_comments.py
         additional_dependencies:
-          - 'mypy==0.940'
-          - 'mypy-extensions==0.4.3'
-          - 'types-setuptools==57.4.14'
-          - 'types-PyYAML==0.1.9'
+          - 'mypy'
+          - 'mypy-extensions'
+          - 'types-setuptools'
+          - 'types-PyYAML'
           - 'types-requests'
         exclude: >
           (?x)^(
diff --git a/conftest.py b/conftest.py
index 79e5ad464a..5270eb2dba 100644
--- a/conftest.py
+++ b/conftest.py
@@ -25,7 +25,6 @@ import re
 import typing as t
 import zipfile
 from copy import deepcopy
-from datetime import datetime
 from urllib.parse import quote
 
 import common_test_methods  # noqa: F401
@@ -56,15 +55,10 @@ def idf_path() -> str:
     return os.path.dirname(__file__)
 
 
-@pytest.fixture(scope='session', autouse=True)
-def session_tempdir() -> str:
-    _tmpdir = os.path.join(
-        os.path.dirname(__file__),
-        'pytest_embedded_log',
-        datetime.now().strftime('%Y-%m-%d_%H-%M-%S'),
-    )
-    os.makedirs(_tmpdir, exist_ok=True)
-    return _tmpdir
+@pytest.fixture(scope='session')
+def session_root_logdir(idf_path: str) -> str:
+    """Session scoped log dir for pytest-embedded"""
+    return idf_path
 
 
 @pytest.fixture
diff --git a/tools/ci/check_type_comments.py b/tools/ci/check_type_comments.py
index d89bf562b2..38865b0842 100755
--- a/tools/ci/check_type_comments.py
+++ b/tools/ci/check_type_comments.py
@@ -2,7 +2,6 @@
 #
 # SPDX-FileCopyrightText: 2021-2022 Espressif Systems (Shanghai) CO LTD
 # SPDX-License-Identifier: Apache-2.0
-
 import argparse
 import subprocess
 from sys import exit
@@ -30,7 +29,7 @@ def types_valid_ignored_rules(file_name):  # type: (str) -> bool
     """
     Run Mypy check with rules for ignore list on the given file, return TRUE if Mypy check passes
     """
-    mypy_exit_code = subprocess.call('mypy {} --allow-untyped-defs'.format(file_name), shell=True)
+    mypy_exit_code = subprocess.call('mypy {} --python-version 3.8 --allow-untyped-defs'.format(file_name), shell=True)
     return not bool(mypy_exit_code)