diff --git a/.github/workflows/unittests.yml b/.github/workflows/unittests.yml
index 4d26c208..e4480b6b 100644
--- a/.github/workflows/unittests.yml
+++ b/.github/workflows/unittests.yml
@@ -4,7 +4,7 @@ on: [push, pull_request]
 
 jobs:
   build:
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-20.04
     strategy:
       matrix:
         python-version: ['3.6', '3.7', '3.8', '3.9', '3.10']
diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
index 3d314ed0..9ce54201 100644
--- a/.pre-commit-config.yaml
+++ b/.pre-commit-config.yaml
@@ -10,8 +10,8 @@ repos:
     -   id: black
         args:
         -   --target-version=py36
--   repo: https://gitlab.com/pycqa/flake8
-    rev: 3.8.2
+-   repo: https://github.com/PyCQA/flake8
+    rev: 6.0.0
     hooks:
       - id: flake8
 -   repo: https://github.com/Matterminers/dev-tools
diff --git a/docs/source/changelog.rst b/docs/source/changelog.rst
index a8d3564c..1fed65d2 100644
--- a/docs/source/changelog.rst
+++ b/docs/source/changelog.rst
@@ -1,4 +1,4 @@
-.. Created by changelog.py at 2022-11-23, command
+.. Created by changelog.py at 2022-12-07, command
    '/Users/giffler/.cache/pre-commit/repor6pnmwlm/py_env-python3.10/bin/changelog docs/source/changes compile --output=docs/source/changelog.rst'
    based on the format of 'https://keepachangelog.com/'
 
@@ -6,7 +6,7 @@
 CHANGELOG
 #########
 
-[Unreleased] - 2022-11-23
+[Unreleased] - 2022-12-07
 =========================
 
 Added
diff --git a/tardis/utilities/asyncbulkcall.py b/tardis/utilities/asyncbulkcall.py
index 44706e6e..dff49c60 100644
--- a/tardis/utilities/asyncbulkcall.py
+++ b/tardis/utilities/asyncbulkcall.py
@@ -112,7 +112,7 @@ async def __call__(self, __task: T) -> R:
     async def _bulk_dispatch(self):
         """Collect tasks into bulks and dispatch them for command execution"""
         while not self._queue.empty():
-            bulk = list(zip(*(await self._get_bulk())))
+            bulk = list(zip(*(await self._get_bulk())))  # noqa B905
             if not bulk:
                 continue
             tasks, futures = bulk
@@ -171,5 +171,5 @@ async def _bulk_execute(
             for future in futures:
                 future.set_exception(task_exception)
         else:
-            for future, result in zip(futures, results):
+            for future, result in zip(futures, results):  # noqa B905
                 future.set_result(result)
diff --git a/tests/plugins_t/test_prometheusmonitoring.py b/tests/plugins_t/test_prometheusmonitoring.py
index 134d145c..ee721487 100644
--- a/tests/plugins_t/test_prometheusmonitoring.py
+++ b/tests/plugins_t/test_prometheusmonitoring.py
@@ -74,7 +74,9 @@ def assert_gauges(self, values):
         assert all(
             [
                 gauge.get({}) == result
-                for (gauge, result) in zip(self.plugin._gauges.values(), values)
+                for (gauge, result) in zip(  # noqa B905
+                    self.plugin._gauges.values(), values
+                )
             ]
         )
 
diff --git a/tests/plugins_t/test_sqliteregistry.py b/tests/plugins_t/test_sqliteregistry.py
index 5b8c8a38..0cd20797 100644
--- a/tests/plugins_t/test_sqliteregistry.py
+++ b/tests/plugins_t/test_sqliteregistry.py
@@ -145,7 +145,7 @@ def test_add_site(self):
         # Database content has to be checked several times
         # Define inline function to re-use code
         def check_db_content():
-            for row, site_name in zip(
+            for row, site_name in zip(  # noqa B905
                 self.execute_db_query("SELECT site_name FROM Sites"), test_site_names
             ):
                 self.assertEqual(row[0], site_name)