diff --git a/modules/acquia_cms_toolbar/acquia_cms_toolbar.install b/modules/acquia_cms_toolbar/acquia_cms_toolbar.install
index 2490ee368..dc7569bbf 100644
--- a/modules/acquia_cms_toolbar/acquia_cms_toolbar.install
+++ b/modules/acquia_cms_toolbar/acquia_cms_toolbar.install
@@ -12,7 +12,14 @@ use Drupal\user\Entity\Role;
  */
 function acquia_cms_toolbar_install($is_syncing) {
   if (!$is_syncing) {
-    $roles = Role::loadMultiple();
+    $roles = \Drupal::entityTypeManager()->getStorage('user_role')->loadMultiple([
+      'content_administrator',
+      'content_author',
+      'content_editor',
+      'developer',
+      'site_builder',
+      'user_administrator',
+    ]);
     foreach ($roles as $role) {
       switch ($role->id()) {
         case 'content_administrator':
@@ -21,7 +28,7 @@ function acquia_cms_toolbar_install($is_syncing) {
         case 'developer':
         case 'site_builder':
         case 'user_administrator':
-          user_role_grant_permissions($role->id(), ['access toolbar']);
+          $role->grantPermission('access toolbar')->trustData()->save();
           break;
       }
     }
diff --git a/modules/acquia_cms_toolbar/acquia_cms_toolbar.module b/modules/acquia_cms_toolbar/acquia_cms_toolbar.module
index c57335f43..8e69a9404 100644
--- a/modules/acquia_cms_toolbar/acquia_cms_toolbar.module
+++ b/modules/acquia_cms_toolbar/acquia_cms_toolbar.module
@@ -112,7 +112,8 @@ function acquia_cms_toolbar_entity_insert(EntityInterface $entity) {
     case 'developer':
     case 'site_builder':
     case 'user_administrator':
-      user_role_grant_permissions($entity->id(), ['access toolbar']);
+      $role = \Drupal::entityTypeManager()->getStorage('user_role')->load($entity->id());
+      $role->grantPermission('access toolbar')->trustData()->save();
       break;
   }
 }
diff --git a/modules/acquia_cms_tour/acquia_cms_tour.install b/modules/acquia_cms_tour/acquia_cms_tour.install
index d6e44b029..e53385eff 100644
--- a/modules/acquia_cms_tour/acquia_cms_tour.install
+++ b/modules/acquia_cms_tour/acquia_cms_tour.install
@@ -12,8 +12,8 @@ use Drupal\user\Entity\Role;
  */
 function acquia_cms_tour_install($is_syncing) {
   if (!$is_syncing) {
-    if (Role::load('content_administrator')) {
-      user_role_grant_permissions('content_administrator', ['access acquia cms tour dashboard']);
+    if ($role = \Drupal::entityTypeManager()->getStorage('user_role')->load('content_administrator')) {
+      $role->grantPermission('access toolbar')->trustData()->save();
     }
   }
 }
diff --git a/modules/acquia_cms_tour/acquia_cms_tour.module b/modules/acquia_cms_tour/acquia_cms_tour.module
index fd0b8b611..7a1ccf382 100644
--- a/modules/acquia_cms_tour/acquia_cms_tour.module
+++ b/modules/acquia_cms_tour/acquia_cms_tour.module
@@ -62,7 +62,8 @@ function acquia_cms_tour_modules_uninstalled(array $modules) {
 function acquia_cms_tour_entity_insert(EntityInterface $entity) {
   switch ($entity->id()) {
     case 'content_administrator':
-      user_role_grant_permissions('content_administrator', ['access acquia cms tour dashboard']);
+      $role = \Drupal::entityTypeManager()->getStorage('user_role')->load('content_administrator');
+      $role->grantPermission('access acquia cms tour dashboard')->trustData()->save();
       break;
   }
 }