diff --git a/admin_toolbar.info.yml b/admin_toolbar.info.yml
index 9be2a0e..236ef8e 100755
--- a/admin_toolbar.info.yml
+++ b/admin_toolbar.info.yml
@@ -3,7 +3,7 @@ description: Provides an improved drop-down menu interface to the site Toolbar.
 package: Administration
 
 type: module
-core: 8.x
+core_version_requirement: ^8 || ^9
 
 dependencies:
   - drupal:toolbar
diff --git a/admin_toolbar_links_access_filter/admin_toolbar_links_access_filter.info.yml b/admin_toolbar_links_access_filter/admin_toolbar_links_access_filter.info.yml
index 7ea071d..f437c50 100755
--- a/admin_toolbar_links_access_filter/admin_toolbar_links_access_filter.info.yml
+++ b/admin_toolbar_links_access_filter/admin_toolbar_links_access_filter.info.yml
@@ -3,7 +3,7 @@ description: Provides a workaround for the common problem that users with 'Use t
 package: Administration
 
 type: module
-core: 8.x
+core_version_requirement: ^8 || ^9
 
 dependencies:
   - admin_toolbar:admin_toolbar
diff --git a/admin_toolbar_links_access_filter/composer.json b/admin_toolbar_links_access_filter/composer.json
index d75f3b0..f1238bb 100755
--- a/admin_toolbar_links_access_filter/composer.json
+++ b/admin_toolbar_links_access_filter/composer.json
@@ -33,6 +33,7 @@
     "source": "http://cgit.drupalcode.org/admin_toolbar"
   },
   "require": {
-    "drupal/admin_toolbar": "^1"
+    "drupal/admin_toolbar": "^1",
+    "drupal/core": "^8.7|^9.0"
   }
 }
diff --git a/admin_toolbar_tools/admin_toolbar_tools.info.yml b/admin_toolbar_tools/admin_toolbar_tools.info.yml
index c71461c..485dd1f 100755
--- a/admin_toolbar_tools/admin_toolbar_tools.info.yml
+++ b/admin_toolbar_tools/admin_toolbar_tools.info.yml
@@ -3,8 +3,7 @@ description: Adds menu links to the Admin Toolbar.
 package: Administration
 
 type: module
-core: 8.x
+core_version_requirement: ^8.8 || ^9
 
 dependencies:
   - admin_toolbar:admin_toolbar
-  - drupal:system (>=8.6)
diff --git a/admin_toolbar_tools/composer.json b/admin_toolbar_tools/composer.json
index bb56879..6ff7f44 100755
--- a/admin_toolbar_tools/composer.json
+++ b/admin_toolbar_tools/composer.json
@@ -34,6 +34,6 @@
   },
   "require": {
     "drupal/admin_toolbar": "^2",
-    "drupal/core": "~8.7"
+    "drupal/core": "^8.8|^9.0"
   }
 }
diff --git a/composer.json b/composer.json
index a97caac..96d2744 100755
--- a/composer.json
+++ b/composer.json
@@ -31,5 +31,8 @@
   "support": {
     "issues": "https://www.drupal.org/project/issues/admin_toolbar",
     "source": "http://cgit.drupalcode.org/admin_toolbar"
+  },
+  "require": {
+    "drupal/core": "^8.7|^9.0"
   }
 }