diff --git a/.gitlab/issue_templates/Release.md b/.gitlab/issue_templates/Release.md
index f93cf8fa7d..d0d43a481a 100644
--- a/.gitlab/issue_templates/Release.md
+++ b/.gitlab/issue_templates/Release.md
@@ -86,7 +86,7 @@
  - [ ] ***(QA)*** Merge published release tags (non-linearly) back into the their relevant development/maintenance branches.
  - [ ] ***(QA)*** Sanitize confidential issues which are assigned to the current release milestone and do not describe a security vulnerability, then make them public.
  - [ ] ***(QA)*** Sanitize confidential issues which are assigned to older release milestones and describe security vulnerabilities, then make them public if appropriate[^2].
- - [ ] ***(QA)*** Update QA tools used in GitLab CI (e.g. Flake8, PyLint) by modifying the relevant `Dockerfile`.
+ - [ ] ***(QA)*** Update QA tools used in GitLab CI (e.g. Black, PyLint) by modifying the relevant `Dockerfile`.
 
 [^1]: If not, use the time remaining until the tagging deadline to ensure all outstanding issues are either resolved or moved to a different milestone.
 [^2]: As a rule of thumb, security vulnerabilities which have reproducers merged to the public repository are considered okay for full disclosure.
diff --git a/bin/tests/system/digdelv/yamlget.py b/bin/tests/system/digdelv/yamlget.py
index 2b00bf245b..afa582dd9c 100644
--- a/bin/tests/system/digdelv/yamlget.py
+++ b/bin/tests/system/digdelv/yamlget.py
@@ -13,7 +13,6 @@ import sys
 
 try:
     import yaml
-# flake8: noqa: E722
 # pylint: disable=bare-except
 except:
     print("No python yaml module, skipping")
diff --git a/doc/arm/conf.py b/doc/arm/conf.py
index 695ca9a77f..af7a525e49 100644
--- a/doc/arm/conf.py
+++ b/doc/arm/conf.py
@@ -11,8 +11,6 @@
 # information regarding copyright ownership.
 ############################################################################
 
-# flake8: noqa: E501
-
 from pathlib import Path
 import re
 import sys
diff --git a/doc/man/conf.py b/doc/man/conf.py
index f805e03bff..0f4ba58948 100644
--- a/doc/man/conf.py
+++ b/doc/man/conf.py
@@ -11,8 +11,6 @@
 # information regarding copyright ownership.
 ############################################################################
 
-# flake8: noqa: E501
-
 #
 # Configuration file for the Sphinx documentation builder.
 #