diff --git a/group.module b/group.module
index 24678e0..a168082 100644
--- a/group.module
+++ b/group.module
@@ -402,7 +402,7 @@ function group_form_alter(&$form, FormStateInterface $form_state, $form_id) {
   // forms for the process to work properly.
   if ($form_state->has('group_wizard') && $form_state->get('group_wizard_id') == 'group_entity') {
     if ($wizard = $form_state->get('group_wizard')) {
-      $store = \Drupal::service('user.private_tempstore')->get($form_state->get('group_wizard_id'));
+      $store = \Drupal::service('tempstore.private')->get($form_state->get('group_wizard_id'));
       $store_id = $form_state->get('store_id');
 
       // Bail out if we are on step 2 of the wizard. We only want to alter the
@@ -468,7 +468,7 @@ function group_content_wizard_store($form, FormStateInterface $form_state) {
   $entity = $form_state->getFormObject()->getEntity();
 
   // Store the unsaved entity in the temp store.
-  $store = \Drupal::service('user.private_tempstore')->get($form_state->get('group_wizard_id'));
+  $store = \Drupal::service('tempstore.private')->get($form_state->get('group_wizard_id'));
   $store_id = $form_state->get('store_id');
   $store->set("$store_id:entity", $entity);
   $store->set("$store_id:step", 2);
@@ -486,7 +486,7 @@ function group_content_wizard_store($form, FormStateInterface $form_state) {
  * @see \Drupal\group\Entity\Controller\GroupContentController::createForm()
  */
 function group_content_wizard_cancel($form, FormStateInterface $form_state) {
-  $store = \Drupal::service('user.private_tempstore')->get($form_state->get('group_wizard_id'));
+  $store = \Drupal::service('tempstore.private')->get($form_state->get('group_wizard_id'));
   $store_id = $form_state->get('store_id');
   $store->delete("$store_id:entity");
   $store->delete("$store_id:step");
diff --git a/modules/gnode/src/Controller/GroupNodeController.php b/modules/gnode/src/Controller/GroupNodeController.php
index 2163c37..0670067 100644
--- a/modules/gnode/src/Controller/GroupNodeController.php
+++ b/modules/gnode/src/Controller/GroupNodeController.php
@@ -48,7 +48,7 @@ class GroupNodeController extends GroupContentController {
   public static function create(ContainerInterface $container) {
     return new static(
       $container->get('plugin.manager.group_content_enabler'),
-      $container->get('user.private_tempstore'),
+      $container->get('tempstore.private'),
       $container->get('entity_type.manager'),
       $container->get('entity.form_builder'),
       $container->get('renderer')
diff --git a/src/Entity/Controller/GroupContentController.php b/src/Entity/Controller/GroupContentController.php
index cda9e2d..4b4c075 100644
--- a/src/Entity/Controller/GroupContentController.php
+++ b/src/Entity/Controller/GroupContentController.php
@@ -73,7 +73,7 @@ class GroupContentController extends ControllerBase {
    */
   public static function create(ContainerInterface $container) {
     return new static(
-      $container->get('user.private_tempstore'),
+      $container->get('tempstore.private'),
       $container->get('entity_type.manager'),
       $container->get('entity.form_builder'),
       $container->get('renderer')
diff --git a/src/Entity/Controller/GroupController.php b/src/Entity/Controller/GroupController.php
index bd1c326..de0173a 100644
--- a/src/Entity/Controller/GroupController.php
+++ b/src/Entity/Controller/GroupController.php
@@ -67,7 +67,7 @@ class GroupController extends ControllerBase {
    */
   public static function create(ContainerInterface $container) {
     return new static(
-      $container->get('user.private_tempstore'),
+      $container->get('tempstore.private'),
       $container->get('entity_type.manager'),
       $container->get('entity.form_builder'),
       $container->get('renderer')
diff --git a/src/Entity/Form/GroupContentForm.php b/src/Entity/Form/GroupContentForm.php
index 9623b00..8a93a84 100644
--- a/src/Entity/Form/GroupContentForm.php
+++ b/src/Entity/Form/GroupContentForm.php
@@ -40,7 +40,7 @@ class GroupContentForm extends ContentEntityForm {
    */
   public static function create(ContainerInterface $container) {
     return new static(
-      $container->get('user.private_tempstore'),
+      $container->get('tempstore.private'),
       $container->get('entity.manager')
     );
   }
diff --git a/src/Entity/Form/GroupForm.php b/src/Entity/Form/GroupForm.php
index 429cf46..8107c5e 100644
--- a/src/Entity/Form/GroupForm.php
+++ b/src/Entity/Form/GroupForm.php
@@ -40,7 +40,7 @@ class GroupForm extends ContentEntityForm {
    */
   public static function create(ContainerInterface $container) {
     return new static(
-      $container->get('user.private_tempstore'),
+      $container->get('tempstore.private'),
       $container->get('entity.manager')
     );
   }