diff --git a/azure-pipelines.yml b/azure-pipelines.yml
index c283bc820ea..eef4c1fbb39 100644
--- a/azure-pipelines.yml
+++ b/azure-pipelines.yml
@@ -203,7 +203,7 @@ jobs:
           python_architecture: x64
           test_suites:
               click_versions: |
-                for clk_ver in 8.1.3 8.1.2 8.1.1 8.1.0 8.0.4 8.0.3 8.0.2 8.0.1 7.1.2 7.1.1 7.1 6.7;
+                for clk_ver in 8.2.0 8.2.1 8.1.7 8.1.6 8.1.5 8.1.4 8.1.3 8.1.2 8.1.1 8.1.0 8.0.4 8.0.2 8.0.3 8.0.1 7.1.2 7.1.1 7.1 6.7;
                  do
                   venv/bin/pip install click==$clk_ver;
                   venv/bin/scancode -i samples/ -n3 --json foo.json;
diff --git a/requirements.txt b/requirements.txt
index 43a0b90bc1b..358fa3ff257 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -8,9 +8,10 @@ certifi==2024.2.2
 cffi==1.16.0
 chardet==5.0.0
 charset-normalizer==2.1.0
-click==8.1.7
+click==8.2.1;python_version>='3.10'
+click==8.1.7;python_version<'3.10'
 colorama==0.4.5
-commoncode==32.2.1
+commoncode==32.3.0
 construct==2.10.68
 container-inspector==31.1.0
 cryptography==42.0.5
diff --git a/setup-mini.cfg b/setup-mini.cfg
index 9f89d632757..59fbf90b014 100644
--- a/setup-mini.cfg
+++ b/setup-mini.cfg
@@ -67,9 +67,10 @@ install_requires =
     Beautifulsoup4[chardet] >= 4.13.0
     boolean.py >= 4.0
     chardet >= 3.0.0
-    click >= 6.7, !=7.0, !=8.1.8
+    click >= 6.7, !=7.0, !=8.1.8;python_version<'3.10'
+    click >= 8.2.0;python_version>='3.10'
     colorama >= 0.3.9
-    commoncode >= 32.2.1
+    commoncode >= 32.3.0
     container-inspector >= 31.0.0
     debian-inspector >= 31.1.0
     dparse2 >= 0.7.0
diff --git a/setup.cfg b/setup.cfg
index 5395aacbee7..960a1613d79 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -67,9 +67,10 @@ install_requires =
     Beautifulsoup4[chardet] >= 4.13.0
     boolean.py >= 4.0
     chardet >= 3.0.0
-    click >= 6.7, !=7.0, !=8.1.8
+    click >= 6.7, !=7.0, !=8.1.8;python_version<'3.10'
+    click >= 8.2.0;python_version>='3.10'
     colorama >= 0.3.9
-    commoncode >= 32.2.1
+    commoncode >= 32.3.0
     container-inspector >= 31.0.0
     debian-inspector >= 31.1.0
     dparse2 >= 0.7.0