diff --git a/requirements/dev.txt b/requirements/dev.txt
index a8d59dca757..8b22da4eb43 100644
--- a/requirements/dev.txt
+++ b/requirements/dev.txt
@@ -23,7 +23,7 @@ billiard==4.2.0
     # via
     #   -r requirements/prod.txt
     #   celery
-bleach==6.1.0
+bleach==6.2.0
     # via -r requirements/prod.txt
 build==1.0.3
     # via pip-tools
@@ -294,7 +294,6 @@ six==1.16.0
     # via
     #   -r requirements/prod.txt
     #   asttokens
-    #   bleach
     #   elasticsearch-dsl
     #   python-dateutil
     #   rfc3339-validator
diff --git a/requirements/functests.txt b/requirements/functests.txt
index 6ca05d7449b..a04a28eec57 100644
--- a/requirements/functests.txt
+++ b/requirements/functests.txt
@@ -5,43 +5,43 @@
 #    pip-compile requirements/functests.in
 #
 alembic==1.13.3
-    # via -r prod.txt
+    # via -r requirements/prod.txt
 amqp==5.2.0
     # via
-    #   -r prod.txt
+    #   -r requirements/prod.txt
     #   kombu
 attrs==23.2.0
     # via
-    #   -r prod.txt
+    #   -r requirements/prod.txt
     #   jsonschema
     #   referencing
 bcrypt==4.2.0
-    # via -r prod.txt
+    # via -r requirements/prod.txt
 beautifulsoup4==4.12.2
     # via webtest
 billiard==4.2.0
     # via
-    #   -r prod.txt
+    #   -r requirements/prod.txt
     #   celery
-bleach==6.1.0
-    # via -r prod.txt
+bleach==6.2.0
+    # via -r requirements/prod.txt
 build==1.0.3
     # via pip-tools
 celery==5.4.0
-    # via -r prod.txt
+    # via -r requirements/prod.txt
 certifi==2024.8.30
     # via
-    #   -r prod.txt
+    #   -r requirements/prod.txt
     #   sentry-sdk
 cffi==1.17.1
-    # via -r prod.txt
+    # via -r requirements/prod.txt
 chameleon==4.4.3
     # via
-    #   -r prod.txt
+    #   -r requirements/prod.txt
     #   deform
 click==8.1.7
     # via
-    #   -r prod.txt
+    #   -r requirements/prod.txt
     #   celery
     #   click-didyoumean
     #   click-plugins
@@ -49,170 +49,170 @@ click==8.1.7
     #   pip-tools
 click-didyoumean==0.3.0
     # via
-    #   -r prod.txt
+    #   -r requirements/prod.txt
     #   celery
 click-plugins==1.1.1
     # via
-    #   -r prod.txt
+    #   -r requirements/prod.txt
     #   celery
 click-repl==0.3.0
     # via
-    #   -r prod.txt
+    #   -r requirements/prod.txt
     #   celery
 colander==2.0
     # via
-    #   -r prod.txt
+    #   -r requirements/prod.txt
     #   deform
 data-tasks==0.0.4
-    # via -r prod.txt
+    # via -r requirements/prod.txt
 deform==2.0.15
-    # via -r prod.txt
+    # via -r requirements/prod.txt
 elasticsearch==6.8.2
     # via
-    #   -r prod.txt
+    #   -r requirements/prod.txt
     #   elasticsearch-dsl
 elasticsearch-dsl==6.4.0
-    # via -r prod.txt
+    # via -r requirements/prod.txt
 factory-boy==3.3.1
-    # via -r functests.in
+    # via -r requirements/functests.in
 faker==22.2.0
     # via factory-boy
 gevent==24.10.3
-    # via -r prod.txt
+    # via -r requirements/prod.txt
 greenlet==3.1.1
     # via
-    #   -r prod.txt
+    #   -r requirements/prod.txt
     #   gevent
     #   sqlalchemy
 gunicorn==23.0.0
-    # via -r prod.txt
+    # via -r requirements/prod.txt
 h-api==1.1.0
-    # via -r prod.txt
+    # via -r requirements/prod.txt
 h-assets==1.0.7
-    # via -r prod.txt
+    # via -r requirements/prod.txt
 h-matchers==1.2.16
-    # via -r prod.txt
+    # via -r requirements/prod.txt
 h-pyramid-sentry==1.2.4
-    # via -r prod.txt
+    # via -r requirements/prod.txt
 h-testkit==1.0.1
-    # via -r functests.in
+    # via -r requirements/functests.in
 hupper==1.12
     # via
-    #   -r prod.txt
+    #   -r requirements/prod.txt
     #   pyramid
 importlib-metadata==7.0.1
     # via
-    #   -r prod.txt
+    #   -r requirements/prod.txt
     #   h-api
     #   pip-sync-faster
 importlib-resources==6.4.5
     # via
-    #   -r prod.txt
+    #   -r requirements/prod.txt
     #   data-tasks
     #   h-api
 iniconfig==2.0.0
     # via pytest
 iso8601==2.1.0
     # via
-    #   -r prod.txt
+    #   -r requirements/prod.txt
     #   colander
     #   deform
 itsdangerous==2.2.0
-    # via -r prod.txt
+    # via -r requirements/prod.txt
 jinja2==3.1.4
     # via
-    #   -r prod.txt
+    #   -r requirements/prod.txt
     #   data-tasks
     #   pyramid-jinja2
 jsonschema==4.23.0
     # via
-    #   -r prod.txt
+    #   -r requirements/prod.txt
     #   h-api
 jsonschema-specifications==2023.12.1
     # via
-    #   -r prod.txt
+    #   -r requirements/prod.txt
     #   jsonschema
 kombu==5.4.2
     # via
-    #   -r prod.txt
+    #   -r requirements/prod.txt
     #   celery
 mako==1.3.0
     # via
-    #   -r prod.txt
+    #   -r requirements/prod.txt
     #   alembic
 markdown==3.7
-    # via -r prod.txt
+    # via -r requirements/prod.txt
 markupsafe==2.1.5
     # via
-    #   -r prod.txt
+    #   -r requirements/prod.txt
     #   jinja2
     #   mako
     #   pyramid-jinja2
 newrelic==10.2.0
-    # via -r prod.txt
+    # via -r requirements/prod.txt
 oauthlib==3.2.2
-    # via -r prod.txt
+    # via -r requirements/prod.txt
 packaging==24.1
     # via
-    #   -r prod.txt
+    #   -r requirements/prod.txt
     #   build
     #   gunicorn
     #   pytest
     #   zope-sqlalchemy
 passlib==1.7.4
-    # via -r prod.txt
+    # via -r requirements/prod.txt
 pastedeploy==3.1.0
     # via
-    #   -r prod.txt
+    #   -r requirements/prod.txt
     #   plaster-pastedeploy
 peppercorn==0.6
     # via
-    #   -r prod.txt
+    #   -r requirements/prod.txt
     #   deform
 pip-sync-faster==0.0.4
-    # via -r functests.in
+    # via -r requirements/functests.in
 pip-tools==7.4.1
     # via
-    #   -r functests.in
+    #   -r requirements/functests.in
     #   pip-sync-faster
 plaster==1.1.2
     # via
-    #   -r prod.txt
+    #   -r requirements/prod.txt
     #   plaster-pastedeploy
     #   pyramid
 plaster-pastedeploy==1.0.1
     # via
-    #   -r prod.txt
+    #   -r requirements/prod.txt
     #   pyramid
 pluggy==1.5.0
     # via pytest
 prompt-toolkit==3.0.43
     # via
-    #   -r prod.txt
+    #   -r requirements/prod.txt
     #   click-repl
 psycogreen==1.0.2
-    # via -r prod.txt
+    # via -r requirements/prod.txt
 psycopg2==2.9.10
     # via
-    #   -r prod.txt
+    #   -r requirements/prod.txt
     #   data-tasks
 pycparser==2.21
     # via
-    #   -r prod.txt
+    #   -r requirements/prod.txt
     #   cffi
 pycryptodomex==3.21.0
-    # via -r prod.txt
+    # via -r requirements/prod.txt
 pyjwt==2.9.0
-    # via -r prod.txt
+    # via -r requirements/prod.txt
 pyparsing==3.2.0
-    # via -r prod.txt
+    # via -r requirements/prod.txt
 pyproject-hooks==1.0.0
     # via
     #   build
     #   pip-tools
 pyramid==2.0.2
     # via
-    #   -r prod.txt
+    #   -r requirements/prod.txt
     #   h-assets
     #   h-pyramid-sentry
     #   pyramid-exclog
@@ -223,60 +223,59 @@ pyramid==2.0.2
     #   pyramid-services
     #   pyramid-tm
 pyramid-exclog==1.1
-    # via -r prod.txt
+    # via -r requirements/prod.txt
 pyramid-jinja2==2.10.1
-    # via -r prod.txt
+    # via -r requirements/prod.txt
 pyramid-mailer==0.15.1
-    # via -r prod.txt
+    # via -r requirements/prod.txt
 pyramid-retry==2.1.1
-    # via -r prod.txt
+    # via -r requirements/prod.txt
 pyramid-sanity==1.0.4
-    # via -r prod.txt
+    # via -r requirements/prod.txt
 pyramid-services==2.2
-    # via -r prod.txt
+    # via -r requirements/prod.txt
 pyramid-tm==2.5
-    # via -r prod.txt
+    # via -r requirements/prod.txt
 pytest==8.3.3
     # via
-    #   -r functests.in
+    #   -r requirements/functests.in
     #   pytest-reverse
 pytest-reverse==1.8.0
-    # via -r functests.in
+    # via -r requirements/functests.in
 python-dateutil==2.9.0.post0
     # via
-    #   -r prod.txt
+    #   -r requirements/prod.txt
     #   celery
     #   elasticsearch-dsl
     #   faker
 python-slugify==8.0.4
-    # via -r prod.txt
+    # via -r requirements/prod.txt
 pytz==2024.2
-    # via -r prod.txt
+    # via -r requirements/prod.txt
 referencing==0.32.1
     # via
-    #   -r prod.txt
+    #   -r requirements/prod.txt
     #   h-api
     #   jsonschema
     #   jsonschema-specifications
 repoze-sendmail==4.4.1
     # via
-    #   -r prod.txt
+    #   -r requirements/prod.txt
     #   pyramid-mailer
 rfc3339-validator==0.1.4
-    # via -r prod.txt
+    # via -r requirements/prod.txt
 rpds-py==0.16.2
     # via
-    #   -r prod.txt
+    #   -r requirements/prod.txt
     #   jsonschema
     #   referencing
 sentry-sdk==2.17.0
     # via
-    #   -r prod.txt
+    #   -r requirements/prod.txt
     #   h-pyramid-sentry
 six==1.16.0
     # via
-    #   -r prod.txt
-    #   bleach
+    #   -r requirements/prod.txt
     #   elasticsearch-dsl
     #   python-dateutil
     #   rfc3339-validator
@@ -284,59 +283,59 @@ soupsieve==2.5
     # via beautifulsoup4
 sqlalchemy==2.0.25
     # via
-    #   -r prod.txt
+    #   -r requirements/prod.txt
     #   alembic
     #   data-tasks
     #   zope-sqlalchemy
 sqlparse==0.5.1
     # via
-    #   -r prod.txt
+    #   -r requirements/prod.txt
     #   data-tasks
 supervisor==4.2.5
-    # via -r prod.txt
+    # via -r requirements/prod.txt
 tabulate==0.9.0
     # via
-    #   -r prod.txt
+    #   -r requirements/prod.txt
     #   data-tasks
 text-unidecode==1.3
     # via
-    #   -r prod.txt
+    #   -r requirements/prod.txt
     #   python-slugify
 transaction==5.0
     # via
-    #   -r prod.txt
+    #   -r requirements/prod.txt
     #   pyramid-mailer
     #   pyramid-tm
     #   repoze-sendmail
     #   zope-sqlalchemy
 translationstring==1.4
     # via
-    #   -r prod.txt
+    #   -r requirements/prod.txt
     #   colander
     #   deform
     #   pyramid
 typing-extensions==4.9.0
     # via
-    #   -r prod.txt
+    #   -r requirements/prod.txt
     #   alembic
     #   sqlalchemy
 tzdata==2023.4
     # via
-    #   -r prod.txt
+    #   -r requirements/prod.txt
     #   celery
     #   kombu
 urllib3==2.2.2
     # via
-    #   -r prod.txt
+    #   -r requirements/prod.txt
     #   elasticsearch
     #   sentry-sdk
 venusian==3.1.0
     # via
-    #   -r prod.txt
+    #   -r requirements/prod.txt
     #   pyramid
 vine==5.1.0
     # via
-    #   -r prod.txt
+    #   -r requirements/prod.txt
     #   amqp
     #   celery
     #   kombu
@@ -344,46 +343,46 @@ waitress==3.0.1
     # via webtest
 wcwidth==0.2.13
     # via
-    #   -r prod.txt
+    #   -r requirements/prod.txt
     #   prompt-toolkit
 webencodings==0.5.1
     # via
-    #   -r prod.txt
+    #   -r requirements/prod.txt
     #   bleach
 webob==1.8.8
     # via
-    #   -r prod.txt
+    #   -r requirements/prod.txt
     #   pyramid
     #   webtest
 webtest==3.0.1
-    # via -r functests.in
+    # via -r requirements/functests.in
 wheel==0.42.0
     # via pip-tools
 wired==0.3
     # via
-    #   -r prod.txt
+    #   -r requirements/prod.txt
     #   pyramid-services
 ws4py==0.5.1
-    # via -r prod.txt
+    # via -r requirements/prod.txt
 wsaccel==0.6.7
-    # via -r prod.txt
+    # via -r requirements/prod.txt
 zipp==3.19.1
     # via
-    #   -r prod.txt
+    #   -r requirements/prod.txt
     #   importlib-metadata
 zope-deprecation==5.0
     # via
-    #   -r prod.txt
+    #   -r requirements/prod.txt
     #   deform
     #   pyramid
     #   pyramid-jinja2
 zope-event==5.0
     # via
-    #   -r prod.txt
+    #   -r requirements/prod.txt
     #   gevent
 zope-interface==7.1.1
     # via
-    #   -r prod.txt
+    #   -r requirements/prod.txt
     #   gevent
     #   pyramid
     #   pyramid-retry
@@ -393,7 +392,7 @@ zope-interface==7.1.1
     #   wired
     #   zope-sqlalchemy
 zope-sqlalchemy==3.1
-    # via -r prod.txt
+    # via -r requirements/prod.txt
 
 # The following packages are considered to be unsafe in a requirements file:
 # pip
diff --git a/requirements/lint.txt b/requirements/lint.txt
index 926a7083de3..7319953a6e2 100644
--- a/requirements/lint.txt
+++ b/requirements/lint.txt
@@ -35,7 +35,7 @@ billiard==4.2.0
     #   -r requirements/functests.txt
     #   -r requirements/tests.txt
     #   celery
-bleach==6.1.0
+bleach==6.2.0
     # via
     #   -r requirements/functests.txt
     #   -r requirements/tests.txt
@@ -448,7 +448,6 @@ six==1.16.0
     # via
     #   -r requirements/functests.txt
     #   -r requirements/tests.txt
-    #   bleach
     #   elasticsearch-dsl
     #   python-dateutil
     #   rfc3339-validator
diff --git a/requirements/prod.txt b/requirements/prod.txt
index c2f6d468806..21a6d37af2f 100644
--- a/requirements/prod.txt
+++ b/requirements/prod.txt
@@ -16,7 +16,7 @@ bcrypt==4.2.0
     # via -r requirements/prod.in
 billiard==4.2.0
     # via celery
-bleach==6.1.0
+bleach==6.2.0
     # via -r requirements/prod.in
 celery==5.4.0
     # via -r requirements/prod.in
@@ -200,7 +200,6 @@ sentry-sdk==2.17.0
     #   h-pyramid-sentry
 six==1.16.0
     # via
-    #   bleach
     #   elasticsearch-dsl
     #   python-dateutil
     #   rfc3339-validator
diff --git a/requirements/tests.txt b/requirements/tests.txt
index 7fff20d8c22..4dff335f745 100644
--- a/requirements/tests.txt
+++ b/requirements/tests.txt
@@ -22,7 +22,7 @@ billiard==4.2.0
     # via
     #   -r requirements/prod.txt
     #   celery
-bleach==6.1.0
+bleach==6.2.0
     # via -r requirements/prod.txt
 build==1.0.3
     # via pip-tools
@@ -294,7 +294,6 @@ sentry-sdk==2.17.0
 six==1.16.0
     # via
     #   -r requirements/prod.txt
-    #   bleach
     #   elasticsearch-dsl
     #   python-dateutil
     #   rfc3339-validator