diff --git a/.devcontainer/devcontainer.json b/.devcontainer/devcontainer.json
index bf9a8bbee0f9f07d9f2afa359abb47767256aaa2..da0eb5d895a74b0734716cb86146a2b4c1b47f12 100644
--- a/.devcontainer/devcontainer.json
+++ b/.devcontainer/devcontainer.json
@@ -20,8 +20,8 @@
                 "python.linting.flake8Enabled": true,
                 "python.linting.flake8Args": [
                     "--isolated",
-                    "--select=ATL,F,E101,E7,E9,W6",
-                    "--ignore=E701,E702,E704,E741",
+                    "--select=ATL,B,F,E101,E7,E9,W6",
+                    "--ignore=B006,B007,B019,E701,E702,E704,E741",
                     "--enable-extensions=ATL902"
                 ]
             },
diff --git a/.vscode/settings.json b/.vscode/settings.json
index 0cd0b2e80e98cee50ae263acb4e6d9d324627879..af4ac8a8d447f93295903e032b952c149de5778d 100644
--- a/.vscode/settings.json
+++ b/.vscode/settings.json
@@ -18,8 +18,8 @@
     ],
     "flake8.args": [
         "--isolated",
-        "--select=ATL,F,E101,E7,E9,W6", // note that equals sign is required by VS Code
-        "--ignore=E701,E702,E704,E741",
+        "--select=ATL,B,F,E101,E7,E9,W6", // note that equals sign is required by VS Code
+        "--ignore=B006,B007,B019,E701,E702,E704,E741",
         "--enable-extensions=ATL902"
     ],
 }
diff --git a/Projects/AthGeneration/CMakeLists.txt b/Projects/AthGeneration/CMakeLists.txt
index db997a574fdbff8dae38478cab354e36f7cf676e..44f681c3c2718a2d6f9e6a2f3ad38df75b3c1a6c 100644
--- a/Projects/AthGeneration/CMakeLists.txt
+++ b/Projects/AthGeneration/CMakeLists.txt
@@ -1,4 +1,4 @@
-# Copyright (C) 2002-2023 CERN for the benefit of the ATLAS collaboration
+# Copyright (C) 2002-2024 CERN for the benefit of the ATLAS collaboration
 
 # Set up the project.
 cmake_minimum_required( VERSION 3.6 )
@@ -11,8 +11,8 @@ unset( _version )
 set( HEPMC3_USE TRUE CACHE BOOL "Build with HepMC3" )
 
 # Configure flake8:
-set( ATLAS_FLAKE8 flake8_atlas --isolated --select ATL,F,E101,E7,E9,W6
-                               --ignore E701,E702,E704,E741
+set( ATLAS_FLAKE8 flake8_atlas --isolated --select ATL,B,F,E101,E7,E9,W6
+                               --ignore B006,B007,B019,E701,E702,E704,E741
                                --enable-extensions ATL902
    CACHE STRING "Default flake8 command" )
 set( ATLAS_PYTHON_CHECKER ${ATLAS_FLAKE8}
diff --git a/Projects/AthSimulation/CMakeLists.txt b/Projects/AthSimulation/CMakeLists.txt
index 688c0c357152156ca1df3abbe54643f9250cb2e8..734302379272f1cb50fa61f9aab6faa36888014d 100644
--- a/Projects/AthSimulation/CMakeLists.txt
+++ b/Projects/AthSimulation/CMakeLists.txt
@@ -11,8 +11,8 @@ unset( _version )
 set( HEPMC3_USE TRUE CACHE BOOL "Build with HepMC3" )
 
 # Configure flake8:
-set( ATLAS_FLAKE8 flake8_atlas --isolated --select ATL,F,E101,E7,E9,W6
-                               --ignore E701,E702,E704,E741
+set( ATLAS_FLAKE8 flake8_atlas --isolated --select ATL,B,F,E101,E7,E9,W6
+                               --ignore B006,B007,B019,E701,E702,E704,E741
                                --enable-extensions ATL902
    CACHE STRING "Default flake8 command" )
 set( ATLAS_PYTHON_CHECKER ${ATLAS_FLAKE8}
diff --git a/Projects/Athena/CMakeLists.txt b/Projects/Athena/CMakeLists.txt
index 19154cf0f8114ef78843cce35b5698eea654d05f..39388bff14603b5739c5ae276f8e22238f24d6b9 100644
--- a/Projects/Athena/CMakeLists.txt
+++ b/Projects/Athena/CMakeLists.txt
@@ -58,8 +58,8 @@ mark_as_advanced( TDAQ-COMMON_ATROOT TDAQ_PROJECT_NAME
 set( HEPMC3_USE TRUE CACHE BOOL "Build with HepMC3" )
 
 # Configure flake8:
-set( ATLAS_FLAKE8 flake8_atlas --isolated --select ATL,F,E101,E7,E9,W6
-                               --ignore E701,E702,E704,E741
+set( ATLAS_FLAKE8 flake8_atlas --isolated --select ATL,B,F,E101,E7,E9,W6
+                               --ignore B006,B007,B019,E701,E702,E704,E741
                                --enable-extensions ATL902
    CACHE STRING "Default flake8 command" )
 set( ATLAS_PYTHON_CHECKER ${ATLAS_FLAKE8}