diff --git a/agent_integration_sample/tox.ini b/agent_integration_sample/tox.ini
index 4a675960..82e73cc5 100644
--- a/agent_integration_sample/tox.ini
+++ b/agent_integration_sample/tox.ini
@@ -23,8 +23,8 @@ commands =
 
 [testenv:flake8]
 skip_install = true
-deps = flake8 <= 4.0.1
-commands = flake8 .
+deps = flake8 >= 7.0
+commands = flake8 --config tox.ini .
 
 [flake8]
 exclude = .eggs,.tox,build
diff --git a/agent_v2_integration_sample/tox.ini b/agent_v2_integration_sample/tox.ini
index a7ab31be..7464c3eb 100644
--- a/agent_v2_integration_sample/tox.ini
+++ b/agent_v2_integration_sample/tox.ini
@@ -23,8 +23,8 @@ commands =
 
 [testenv:flake8]
 skip_install = true
-deps = flake8 <= 4.0.1
-commands = flake8 .
+deps = flake8 >= 7.0
+commands = flake8 --config tox.ini .
 
 [flake8]
 exclude = .eggs,.tox,build
diff --git a/agent_v2_integration_stateful_sample/tox.ini b/agent_v2_integration_stateful_sample/tox.ini
index 390526d9..e6ebc8f9 100644
--- a/agent_v2_integration_stateful_sample/tox.ini
+++ b/agent_v2_integration_stateful_sample/tox.ini
@@ -23,8 +23,8 @@ commands =
 
 [testenv:flake8]
 skip_install = true
-deps = flake8 <= 4.0.1
-commands = flake8 .
+deps = flake8 >= 7.0
+commands = flake8 --config tox.ini .
 
 [flake8]
 exclude = .eggs,.tox,build
diff --git a/agent_v2_integration_transactional_sample/tox.ini b/agent_v2_integration_transactional_sample/tox.ini
index a7ab31be..7464c3eb 100644
--- a/agent_v2_integration_transactional_sample/tox.ini
+++ b/agent_v2_integration_transactional_sample/tox.ini
@@ -23,8 +23,8 @@ commands =
 
 [testenv:flake8]
 skip_install = true
-deps = flake8 <= 4.0.1
-commands = flake8 .
+deps = flake8 >= 7.0
+commands = flake8 --config tox.ini .
 
 [flake8]
 exclude = .eggs,.tox,build
diff --git a/dynatrace_base/tox.ini b/dynatrace_base/tox.ini
index 231f7829..07bbb510 100644
--- a/dynatrace_base/tox.ini
+++ b/dynatrace_base/tox.ini
@@ -21,8 +21,8 @@ commands =
 
 [testenv:flake8]
 skip_install = true
-deps = flake8 <= 4.0.1
-commands = flake8 .
+deps = flake8 >= 7.0
+commands = flake8 --config tox.ini .
 
 [flake8]
 exclude = .eggs,.tox,build
diff --git a/dynatrace_health/tox.ini b/dynatrace_health/tox.ini
index 7e136168..cdd72281 100644
--- a/dynatrace_health/tox.ini
+++ b/dynatrace_health/tox.ini
@@ -22,8 +22,8 @@ commands =
 
 [testenv:flake8]
 skip_install = true
-deps = flake8 <= 4.0.1
-commands = flake8 .
+deps = flake8 >= 7.0
+commands = flake8 --config tox.ini .
 
 [flake8]
 exclude = .eggs,.tox,build
diff --git a/dynatrace_topology/tox.ini b/dynatrace_topology/tox.ini
index 7f555e6a..b2141fc4 100644
--- a/dynatrace_topology/tox.ini
+++ b/dynatrace_topology/tox.ini
@@ -22,8 +22,8 @@ commands =
 
 [testenv:flake8]
 skip_install = true
-deps = flake8 <= 4.0.1
-commands = flake8 .
+deps = flake8 >= 7.0
+commands = flake8 --config tox.ini .
 
 [flake8]
 exclude = .eggs,.tox,build
diff --git a/openmetrics/tox.ini b/openmetrics/tox.ini
index ec19a8be..34da2298 100644
--- a/openmetrics/tox.ini
+++ b/openmetrics/tox.ini
@@ -22,8 +22,8 @@ commands =
 
 [testenv:flake8]
 skip_install = true
-deps = flake8 <= 4.0.1
-commands = flake8 .
+deps = flake8 >= 7.0
+commands = flake8 --config tox.ini .
 
 [flake8]
 exclude = .eggs,.tox,build
diff --git a/servicenow/tox.ini b/servicenow/tox.ini
index a1e04cdd..e9b568c8 100644
--- a/servicenow/tox.ini
+++ b/servicenow/tox.ini
@@ -22,8 +22,8 @@ commands =
 
 [testenv:flake8]
 skip_install = true
-deps = flake8 <= 4.0.1
-commands = flake8 .
+deps = flake8 >= 7.0
+commands = flake8 --config tox.ini .
 
 [flake8]
 exclude = .eggs,.tox,build
diff --git a/splunk_base/stackstate_checks/splunk/config/__init__.py b/splunk_base/stackstate_checks/splunk/config/__init__.py
index b74cad64..551a463d 100644
--- a/splunk_base/stackstate_checks/splunk/config/__init__.py
+++ b/splunk_base/stackstate_checks/splunk/config/__init__.py
@@ -1,7 +1,7 @@
 # (C) StackState 2020
 # All rights reserved
 # Licensed under a 3-clause BSD style license (see LICENSE)
-from stackstate_checks.splunk.config.splunk_instance_config import SplunkSavedSearch, AuthType, SplunkInstanceConfig,\
+from stackstate_checks.splunk.config.splunk_instance_config import SplunkSavedSearch, AuthType, SplunkInstanceConfig, \
     SplunkPersistentState
 from stackstate_checks.splunk.config.splunk_instance_config_models import SplunkConfig, SplunkConfigInstance
 
diff --git a/splunk_base/tests/test_integration_splunk_client.py b/splunk_base/tests/test_integration_splunk_client.py
index 88669266..90ef2c7b 100644
--- a/splunk_base/tests/test_integration_splunk_client.py
+++ b/splunk_base/tests/test_integration_splunk_client.py
@@ -63,8 +63,8 @@ def test_splunk_client_saved_searches_all(test_environment):
 
     saved_searches_response = client.saved_searches("-")
 
-    # This includes disabled searches
-    assert len(saved_searches_response) == 168
+    # This includes disabled searches; count varies slightly across Splunk versions
+    assert len(saved_searches_response) >= 150
 
 
 @pytest.mark.integration
diff --git a/splunk_base/tox.ini b/splunk_base/tox.ini
index 6e1b6c06..2d029795 100644
--- a/splunk_base/tox.ini
+++ b/splunk_base/tox.ini
@@ -24,8 +24,8 @@ commands =
 
 [testenv:flake8]
 skip_install = true
-deps = flake8 <= 4.0.1
-commands = flake8 .
+deps = flake8 >= 7.0
+commands = flake8 --config tox.ini .
 
 [flake8]
 ignore = F401,F403,W504,W503
diff --git a/splunk_health/tox.ini b/splunk_health/tox.ini
index 8e72b124..db477176 100644
--- a/splunk_health/tox.ini
+++ b/splunk_health/tox.ini
@@ -22,8 +22,8 @@ commands =
 
 [testenv:flake8]
 skip_install = true
-deps = flake8 <= 4.0.1
-commands = flake8 .
+deps = flake8 >= 7.0
+commands = flake8 --config tox.ini .
 
 [flake8]
 exclude = .eggs,.tox
diff --git a/splunk_metric/tox.ini b/splunk_metric/tox.ini
index f30929b5..ec817186 100644
--- a/splunk_metric/tox.ini
+++ b/splunk_metric/tox.ini
@@ -28,9 +28,10 @@ commands =
 
 [testenv:flake8]
 skip_install = true
-deps = flake8 <= 4.0.1
-commands = flake8 .
+deps = flake8 >= 7.0
+commands = flake8 --config tox.ini .
 
 [flake8]
+ignore = F401
 exclude = .eggs,.tox,build
 max-line-length = 120
diff --git a/splunk_topology/tox.ini b/splunk_topology/tox.ini
index 8e72b124..db477176 100644
--- a/splunk_topology/tox.ini
+++ b/splunk_topology/tox.ini
@@ -22,8 +22,8 @@ commands =
 
 [testenv:flake8]
 skip_install = true
-deps = flake8 <= 4.0.1
-commands = flake8 .
+deps = flake8 >= 7.0
+commands = flake8 --config tox.ini .
 
 [flake8]
 exclude = .eggs,.tox
diff --git a/stackstate_checks_base/requirements.in b/stackstate_checks_base/requirements.in
index e21437b1..dbfcfdc9 100644
--- a/stackstate_checks_base/requirements.in
+++ b/stackstate_checks_base/requirements.in
@@ -1,11 +1,11 @@
 kubernetes==33.1.0; python_version > '3.0'
-pyyaml==6.0.1; python_version > '3.0'
+pyyaml==6.0.2; python_version > '3.0'
 prometheus-client==0.19.0; python_version > '3.0'
 protobuf==5.29.6; python_version > '3.0'
 pywin32==306; sys_platform == 'win32' and python_version > '3.0'
 requests==2.32.0; python_version > '3.0'
 urllib3==2.6.3
-simplejson==3.19.2
+simplejson==3.20.1
 six==1.16.0
 uuid==1.30
 boto3==1.34.11; python_version > '3.0'
@@ -13,7 +13,7 @@ flatten-dict==0.2.0
 Deprecated==1.2.10
 enum34==1.1.10; python_version < '3.0'
 pydantic==2.9.1
-orjson==3.9.15; python_version > '3.0'
+orjson==3.11.3; python_version > '3.0'
 pytz==2021.1
 iso8601==0.1.14
 docker==6.1.3
\ No newline at end of file
diff --git a/stackstate_checks_base/stackstate_checks/base/__init__.py b/stackstate_checks_base/stackstate_checks/base/__init__.py
index 6cf20055..1499e9f3 100644
--- a/stackstate_checks_base/stackstate_checks/base/__init__.py
+++ b/stackstate_checks_base/stackstate_checks/base/__init__.py
@@ -9,7 +9,7 @@
 from .errors import ConfigurationError
 from .utils.common import ensure_string, ensure_unicode, to_string
 from .utils.identifiers import Identifiers
-from .utils.telemetry import MetricStream, MetricHealthChecks, EventStream, EventHealthChecks, HealthState,\
+from .utils.telemetry import MetricStream, MetricHealthChecks, EventStream, EventHealthChecks, HealthState, \
     ServiceCheckStream, ServiceCheckHealthChecks, TopologyEventContext, SourceLink, Event
 from .utils.health_api import Health, HealthStream, HealthStreamUrn, HealthType, HealthApiCommon
 from .utils.agent_integration_test_util import AgentIntegrationTestUtil
diff --git a/stackstate_checks_base/stackstate_checks/base/data/agent_requirements.in b/stackstate_checks_base/stackstate_checks/base/data/agent_requirements.in
index c14940ed..3eba3779 100644
--- a/stackstate_checks_base/stackstate_checks/base/data/agent_requirements.in
+++ b/stackstate_checks_base/stackstate_checks/base/data/agent_requirements.in
@@ -1,7 +1,7 @@
 boto3==1.34.11; python_version > '3.0'
 cm-client==45.0.4
 cryptography==46.0.5; python_version > '3.0'
-ddtrace==1.11.2; python_version > '3.0'
+ddtrace==3.12.5; python_version > '3.0'
 deprecated==1.2.10
 docker==6.1.3
 enum34==1.1.10; python_version < "3.0"
@@ -9,22 +9,22 @@ flatten-dict==0.2.0
 iso8601==0.1.14
 kubernetes==33.1.0; python_version > '3.0'
 orionsdk==0.3.0
-orjson==3.9.15; python_version > '3.0'
+orjson==3.11.3; python_version > '3.0'
 pg8000==1.31.5
 prometheus-client==0.19.0; python_version > '3.0'
 protobuf==5.29.6; python_version > '3.0'
-psutil==5.9.0
+psutil==6.0.0
 psycopg2-binary==2.9.9; python_version > '3.0'
-pymysql==1.1.1; python_version > '3.0'
+pymysql==1.1.2; python_version > '3.0'
 pynag==1.1.2
 PyJWT==2.10.1
 pytz==2021.1
 pywin32==306; sys_platform == 'win32' and python_version > '3.0'
-pyyaml==6.0.1; python_version > '3.0'
-requests-ntlm==1.2.0; python_version > '3.0'
+pyyaml==6.0.2; python_version > '3.0'
+requests-ntlm==1.3.0; python_version > '3.0'
 requests==2.32.0; python_version > '3.0'
 pydantic==2.9.1
-simplejson==3.19.2
+simplejson==3.20.1
 six==1.16.0
 urllib3==2.6.3
 uuid==1.30
diff --git a/stackstate_checks_base/tox.ini b/stackstate_checks_base/tox.ini
index a74ad701..54db287a 100644
--- a/stackstate_checks_base/tox.ini
+++ b/stackstate_checks_base/tox.ini
@@ -17,8 +17,8 @@ commands =
 
 [testenv:flake8]
 skip_install = true
-deps = flake8 <= 4.0.1
-commands = flake8 .
+deps = flake8 >= 7.0
+commands = flake8 --config tox.ini .
 
 [flake8]
 ignore = F401,F403,W504,W503
diff --git a/stackstate_checks_dev/stackstate_checks/dev/tooling/templates/check/{check_name}/tox.ini b/stackstate_checks_dev/stackstate_checks/dev/tooling/templates/check/{check_name}/tox.ini
index 3b143625..eb980616 100644
--- a/stackstate_checks_dev/stackstate_checks/dev/tooling/templates/check/{check_name}/tox.ini
+++ b/stackstate_checks_dev/stackstate_checks/dev/tooling/templates/check/{check_name}/tox.ini
@@ -21,8 +21,8 @@ commands =
 
 [testenv:flake8]
 skip_install = true
-deps = flake8 <= 4.0.1
-commands = flake8 .
+deps = flake8 >= 7.0
+commands = flake8 --config tox.ini .
 
 [flake8]
 exclude = .eggs,.tox,build
diff --git a/stackstate_checks_dev/tox.ini b/stackstate_checks_dev/tox.ini
index 4d627d26..103947d4 100644
--- a/stackstate_checks_dev/tox.ini
+++ b/stackstate_checks_dev/tox.ini
@@ -24,8 +24,8 @@ commands =
     {py3,py3-mac,py37,py37-mac}-docker: pytest tests -m"docker"
 
 [testenv:flake8]
-deps = flake8 <= 4.0.1
-commands = flake8 .
+deps = flake8 >= 7.0
+commands = flake8 --config tox.ini .
 
 [testenv:py3-{docker,default}]
 platform = linux|win32
diff --git a/static_health/stackstate_checks/static_health/static_health.py b/static_health/stackstate_checks/static_health/static_health.py
index b50aabb9..236071f0 100644
--- a/static_health/stackstate_checks/static_health/static_health.py
+++ b/static_health/stackstate_checks/static_health/static_health.py
@@ -5,7 +5,7 @@
 import csv
 import codecs
 from stackstate_checks.base.utils.validations_utils import ForgivingBaseModel
-from stackstate_checks.base import ConfigurationError, AgentCheck, TopologyInstance,\
+from stackstate_checks.base import ConfigurationError, AgentCheck, TopologyInstance, \
     HealthStream, HealthStreamUrn, HealthType
 from enum import Enum
 
diff --git a/static_health/tox.ini b/static_health/tox.ini
index 343f1f08..2feace8c 100644
--- a/static_health/tox.ini
+++ b/static_health/tox.ini
@@ -23,8 +23,8 @@ commands =
 
 [testenv:flake8]
 skip_install = true
-deps = flake8 <= 4.0.1
-commands = flake8 .
+deps = flake8 >= 7.0
+commands = flake8 --config tox.ini .
 
 [flake8]
 exclude = .eggs,.tox,build
diff --git a/static_topology/tox.ini b/static_topology/tox.ini
index 98d7fab4..07475eb0 100644
--- a/static_topology/tox.ini
+++ b/static_topology/tox.ini
@@ -22,8 +22,8 @@ commands =
 
 [testenv:flake8]
 skip_install = true
-deps = flake8 <= 4.0.1
-commands = flake8 .
+deps = flake8 >= 7.0
+commands = flake8 --config tox.ini .
 
 [flake8]
 exclude = .eggs,.tox,build
diff --git a/vsphere/tox.ini b/vsphere/tox.ini
index 8b34bef6..56fea2a5 100644
--- a/vsphere/tox.ini
+++ b/vsphere/tox.ini
@@ -11,6 +11,7 @@ pip_version = pip==23.2.1
 usedevelop = true
 platform = linux|darwin|win32
 deps =
+    setuptools<78
     -e../stackstate_checks_base[deps]
     -rrequirements-dev.txt
 passenv =
@@ -23,8 +24,8 @@ commands =
 
 [testenv:flake8]
 skip_install = true
-deps = flake8 <= 4.0.1
-commands = flake8 .
+deps = flake8 >= 7.0
+commands = flake8 --config tox.ini .
 
 [testenv:py3]
 platform = linux|win32
diff --git a/zabbix/tox.ini b/zabbix/tox.ini
index d87d48cd..f40cb76e 100644
--- a/zabbix/tox.ini
+++ b/zabbix/tox.ini
@@ -22,9 +22,10 @@ commands =
 
 [testenv:flake8]
 skip_install = true
-deps = flake8 <= 4.0.1
-commands = flake8 .
+deps = flake8 >= 7.0
+commands = flake8 --config tox.ini .
 
 [flake8]
+ignore = E275,E721
 exclude = .eggs,.tox,build
 max-line-length = 120