diff --git a/releasenotes/notes/pin-flake8-d82d4ad0779e5610.yaml b/releasenotes/notes/pin-flake8-d82d4ad0779e5610.yaml
new file mode 100644
index 0000000..ee997ad
--- /dev/null
+++ b/releasenotes/notes/pin-flake8-d82d4ad0779e5610.yaml
@@ -0,0 +1,24 @@
+#######################################################################################
+# Copyright ETSI Contributors and Others.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#    http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+# implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#######################################################################################
+---
+prelude: >
+    Following the latest version of flake8 is normally a good idea, but new
+    versions that get released sometimes cause the pipeline to fail.  This is
+    a Good Thing (tm) normally, but can be a pain for released branches. 
+other:
+  - |
+    This change pins the version of flake8 to 6.0
\ No newline at end of file
diff --git a/tox.ini b/tox.ini
index 4abe945..7457812 100644
--- a/tox.ini
+++ b/tox.ini
@@ -53,7 +53,7 @@
 #######################################################################################
 [testenv:flake8]
 deps =
-        flake8
+        flake8==6.0.0
         flake8-import-order
 commands =
         flake8 osm_common/ setup.py