diff --git a/awsbatch-cli/.flake8 b/awsbatch-cli/.flake8
index 2747dff211..cc0bc2a158 100644
--- a/awsbatch-cli/.flake8
+++ b/awsbatch-cli/.flake8
@@ -15,7 +15,10 @@ ignore =
     # D413: Missing blank line after last section
     D413,
     # F821: undefined name
-    F821
+    F821,
+    # B028: Consider replacing f"'{foo}'" with f"{foo!r}".
+    # Currently being disabled by flake8-bugbear. See https://github.com/PyCQA/flake8-bugbear/pull/333
+    B028
 # D101 Missing docstring in public class
 # D102 Missing docstring in public method
 per-file-ignores =
@@ -36,4 +39,4 @@ max-complexity = 10
 max-line-length = 120
 import-order-style = google
 application-import-names = flake8
-format = ${cyan}%(path)s${reset}:${yellow_bold}%(row)d${reset}:${green_bold}%(col)d${reset}: ${red_bold}%(code)s${reset} %(text)s
+format = %(cyan)s%(path)s%(reset)s:%(bold)s%(yellow)s%(row)d%(reset)s:%(bold)s%(green)s%(col)d%(reset)s: %(bold)s%(red)s%(code)s%(reset)s %(text)s
diff --git a/cli/.flake8 b/cli/.flake8
index 865fbe3e52..cbb1726dc9 100644
--- a/cli/.flake8
+++ b/cli/.flake8
@@ -17,7 +17,10 @@ ignore =
     # F821: undefined name
     F821,
     # N818: exception name should be named with an Error suffix
-    N818
+    N818,
+    # B028: Consider replacing f"'{foo}'" with f"{foo!r}".
+    # Currently being disabled by flake8-bugbear. See https://github.com/PyCQA/flake8-bugbear/pull/333
+    B028
 # D101 Missing docstring in public class
 # D102 Missing docstring in public method
 # D202 No blank lines allowed after function docstring
@@ -47,4 +50,4 @@ max-complexity = 10
 max-line-length = 120
 import-order-style = google
 application-import-names = flake8
-format = ${cyan}%(path)s${reset}:${yellow_bold}%(row)d${reset}:${green_bold}%(col)d${reset}: ${red_bold}%(code)s${reset} %(text)s
+format = %(cyan)s%(path)s%(reset)s:%(bold)s%(yellow)s%(row)d%(reset)s:%(bold)s%(green)s%(col)d%(reset)s: %(bold)s%(red)s%(code)s%(reset)s %(text)s