diff --git a/modules/webform_access/src/WebformAccessGroupListBuilder.php b/modules/webform_access/src/WebformAccessGroupListBuilder.php
index 254bca01..3cf362f1 100644
--- a/modules/webform_access/src/WebformAccessGroupListBuilder.php
+++ b/modules/webform_access/src/WebformAccessGroupListBuilder.php
@@ -62,11 +62,14 @@ class WebformAccessGroupListBuilder extends ConfigEntityListBuilder {
    * {@inheritdoc}
    */
   public static function createInstance(ContainerInterface $container, EntityTypeInterface $entity_type) {
+    /** @var \Drupal\Core\Entity\EntityTypeManagerInterface $entity_type_manager */
+    $entity_type_manager = $container->get('entity_type.manager');
+
     return new static(
       $entity_type,
-      $container->get('entity.manager')->getStorage($entity_type->id()),
+      $entity_type_manager->getStorage($entity_type->id()),
       $container->get('current_user'),
-      $container->get('entity_type.manager')
+      $entity_type_manager
     );
   }
 
diff --git a/modules/webform_access/src/WebformAccessTypeListBuilder.php b/modules/webform_access/src/WebformAccessTypeListBuilder.php
index 03d58c69..a66f6f3b 100644
--- a/modules/webform_access/src/WebformAccessTypeListBuilder.php
+++ b/modules/webform_access/src/WebformAccessTypeListBuilder.php
@@ -41,10 +41,13 @@ class WebformAccessTypeListBuilder extends ConfigEntityListBuilder {
    * {@inheritdoc}
    */
   public static function createInstance(ContainerInterface $container, EntityTypeInterface $entity_type) {
+    /** @var \Drupal\Core\Entity\EntityTypeManagerInterface $entity_type_manager */
+    $entity_type_manager = $container->get('entity_type.manager');
+
     return new static(
       $entity_type,
-      $container->get('entity.manager')->getStorage($entity_type->id()),
-      $container->get('entity.manager')->getStorage('webform_access_group')
+      $entity_type_manager->getStorage($entity_type->id()),
+      $entity_type_manager->getStorage('webform_access_group')
     );
   }
 
diff --git a/modules/webform_image_select/src/WebformImageSelectImagesListBuilder.php b/modules/webform_image_select/src/WebformImageSelectImagesListBuilder.php
index a43dc187..bfca911e 100644
--- a/modules/webform_image_select/src/WebformImageSelectImagesListBuilder.php
+++ b/modules/webform_image_select/src/WebformImageSelectImagesListBuilder.php
@@ -56,9 +56,12 @@ class WebformImageSelectImagesListBuilder extends ConfigEntityListBuilder {
    * {@inheritdoc}
    */
   public static function createInstance(ContainerInterface $container, EntityTypeInterface $entity_type) {
+    /** @var \Drupal\Core\Entity\EntityTypeManagerInterface $entity_type_manager */
+    $entity_type_manager = $container->get('entity_type.manager');
+
     return new static(
       $entity_type,
-      $container->get('entity.manager')->getStorage($entity_type->id()),
+      $entity_type_manager->getStorage($entity_type->id()),
       $container->get('request_stack')
     );
   }
diff --git a/src/Controller/WebformSubmissionViewController.php b/src/Controller/WebformSubmissionViewController.php
index baeaf69e..243c5380 100644
--- a/src/Controller/WebformSubmissionViewController.php
+++ b/src/Controller/WebformSubmissionViewController.php
@@ -3,8 +3,9 @@
 namespace Drupal\webform\Controller;
 
 use Drupal\Core\Entity\EntityInterface;
-use Drupal\Core\Entity\Controller\EntityViewController;
 use Drupal\Core\Entity\EntityManagerInterface;
+use Drupal\Core\Entity\EntityRepositoryInterface;
+use Drupal\Core\Entity\Controller\EntityViewController;
 use Drupal\Core\Render\RendererInterface;
 use Drupal\Core\Session\AccountInterface;
 use Drupal\Core\StringTranslation\StringTranslationTrait;
@@ -32,6 +33,13 @@ class WebformSubmissionViewController extends EntityViewController {
    */
   protected $requestHandler;
 
+  /**
+   * The entity repository service.
+   *
+   * @var \Drupal\Core\Entity\EntityRepositoryInterface
+   */
+  protected $entityRepository;
+
   /**
    * Creates an WebformSubmissionViewController object.
    *
@@ -43,11 +51,23 @@ class WebformSubmissionViewController extends EntityViewController {
    *   The current user.
    * @param \Drupal\webform\WebformRequestInterface $webform_request
    *   The webform request handler.
+   * @param \Drupal\Core\Entity\EntityRepositoryInterface $entity_repository
+   *   The entity repository service.
+   *
+   * @todo past Drupal Core 8.6 support: Inject 'entity_type.manager' instead of
+   *   the deprecated 'entity_manager' service.
    */
-  public function __construct(EntityManagerInterface $entity_manager, RendererInterface $renderer, AccountInterface $current_user, WebformRequestInterface $webform_request) {
+  public function __construct(EntityManagerInterface $entity_manager, RendererInterface $renderer, AccountInterface $current_user, WebformRequestInterface $webform_request, EntityRepositoryInterface $entity_repository = NULL) {
     parent::__construct($entity_manager, $renderer);
+
     $this->currentUser = $current_user;
     $this->requestHandler = $webform_request;
+
+    if (!$entity_repository) {
+      @trigger_error('Calling WebformSubmissionsController::__construct() without the $entity_repository argument is deprecated in webform:8.x-5.3 and will be required before webform:8.x-6.0.', E_USER_DEPRECATED);
+      $entity_repository = \Drupal::service('entity.repository');
+    }
+    $this->entityRepository = $entity_repository;
   }
 
   /**
@@ -58,7 +78,8 @@ class WebformSubmissionViewController extends EntityViewController {
       $container->get('entity.manager'),
       $container->get('renderer'),
       $container->get('current_user'),
-      $container->get('webform.request')
+      $container->get('webform.request'),
+      $container->get('entity.repository')
     );
   }
 
@@ -118,7 +139,7 @@ class WebformSubmissionViewController extends EntityViewController {
    *   The page title.
    */
   public function title(EntityInterface $webform_submission, $duplicate = FALSE) {
-    $title = $this->entityManager->getTranslationFromContext($webform_submission)->label();
+    $title = $this->entityRepository->getTranslationFromContext($webform_submission)->label();
     return ($duplicate) ? $this->t('Duplicate @title', ['@title' => $title]) : $title;
   }
 
diff --git a/src/Controller/WebformSubmissionsController.php b/src/Controller/WebformSubmissionsController.php
index 8ca03579..3364ce2b 100644
--- a/src/Controller/WebformSubmissionsController.php
+++ b/src/Controller/WebformSubmissionsController.php
@@ -4,7 +4,9 @@ namespace Drupal\webform\Controller;
 
 use Drupal\Component\Utility\Html;
 use Drupal\Core\Controller\ControllerBase;
+use Drupal\Core\Entity\EntityRepositoryInterface;
 use Drupal\webform\WebformInterface;
+use Symfony\Component\DependencyInjection\ContainerInterface;
 use Symfony\Component\HttpFoundation\JsonResponse;
 use Symfony\Component\HttpFoundation\Request;
 
@@ -13,6 +15,36 @@ use Symfony\Component\HttpFoundation\Request;
  */
 class WebformSubmissionsController extends ControllerBase {
 
+  /**
+   * The entity repository service.
+   *
+   * @var \Drupal\Core\Entity\EntityRepositoryInterface
+   */
+  protected $entityRepository;
+
+  /**
+   * Constructs a new EntityViewBuilder.
+   *
+   * @param \Drupal\Core\Entity\EntityRepositoryInterface $entity_repository
+   *   The entity repository service.
+   */
+  public function __construct(EntityRepositoryInterface $entity_repository = NULL) {
+    if (!$entity_repository) {
+      @trigger_error('Calling WebformSubmissionsController::__construct() without the $entity_repository argument is deprecated in webform:8.x-5.2 and will be required before webform:8.x-6.0.', E_USER_DEPRECATED);
+      $entity_repository = $this->container()->get('entity.repository');
+    }
+    $this->entityRepository = $entity_repository;
+  }
+
+  /**
+   * {@inheritdoc}
+   */
+  public static function create(ContainerInterface $container) {
+    return new static(
+      $container->get('entity.repository')
+    );
+  }
+
   /**
    * Returns response for the source entity autocompletion.
    *
@@ -52,7 +84,7 @@ class WebformSubmissionsController extends ControllerBase {
 
       $entities = $storage->loadMultiple($entity_ids);
       foreach ($entities as $source_entity_id => $source_entity) {
-        $label = Html::escape($this->entityManager()->getTranslationFromContext($source_entity)->label());
+        $label = Html::escape($this->entityRepository->getTranslationFromContext($source_entity)->label());
         $value = "$label ($source_entity_type:$source_entity_id)";
         $matches[] = [
           'value' => $value,
diff --git a/src/Entity/WebformSubmission.php b/src/Entity/WebformSubmission.php
index 7dffefc5..858a94d4 100644
--- a/src/Entity/WebformSubmission.php
+++ b/src/Entity/WebformSubmission.php
@@ -782,7 +782,9 @@ class WebformSubmission extends ContentEntityBase implements WebformSubmissionIn
    * {@inheritdoc}
    */
   public function resave() {
-    return $this->entityManager()->getStorage($this->entityTypeId)->resave($this);
+    /** @var \Drupal\webform\WebformSubmissionStorageInterface $storage */
+    $storage = $this->entityTypeManager()->getStorage($this->entityTypeId);
+    return $storage->resave($this);
   }
 
   /**
diff --git a/src/WebformOptionsListBuilder.php b/src/WebformOptionsListBuilder.php
index 6f32a5cb..e511a2cf 100644
--- a/src/WebformOptionsListBuilder.php
+++ b/src/WebformOptionsListBuilder.php
@@ -57,9 +57,12 @@ class WebformOptionsListBuilder extends ConfigEntityListBuilder {
    * {@inheritdoc}
    */
   public static function createInstance(ContainerInterface $container, EntityTypeInterface $entity_type) {
+    /** @var \Drupal\Core\Entity\EntityTypeManagerInterface $entity_type_manager */
+    $entity_type_manager = $container->get('entity_type.manager');
+
     return new static(
       $entity_type,
-      $container->get('entity.manager')->getStorage($entity_type->id()),
+      $entity_type_manager->getStorage($entity_type->id()),
       $container->get('request_stack')
     );
   }
diff --git a/src/WebformSubmissionForm.php b/src/WebformSubmissionForm.php
index 97034430..76d37f26 100644
--- a/src/WebformSubmissionForm.php
+++ b/src/WebformSubmissionForm.php
@@ -150,8 +150,6 @@ class WebformSubmissionForm extends ContentEntityForm {
    *
    * @param \Drupal\Core\Entity\EntityRepositoryInterface $entity_repository
    *   The entity repository.
-   * @param \Drupal\Core\Entity\EntityManagerInterface $entity_manager
-   *   The entity manager.
    * @param \Drupal\Core\Config\ConfigFactoryInterface $config_factory
    *   The factory for configuration objects.
    * @param \Drupal\Core\Render\RendererInterface $renderer
diff --git a/src/WebformSubmissionStorage.php b/src/WebformSubmissionStorage.php
index 1cd4d4e5..7c7b13e2 100644
--- a/src/WebformSubmissionStorage.php
+++ b/src/WebformSubmissionStorage.php
@@ -60,6 +60,8 @@ class WebformSubmissionStorage extends SqlContentEntityStorage implements Webfor
    * WebformSubmissionStorage constructor.
    *
    * @todo Webform 8.x-6.x: Move $time before $access_rules_manager.
+   * @todo past Drupal Core 8.6 support: Inject 'entity_field.manager' instead
+   *   of the deprecated 'entity_manager' service.
    */
   public function __construct(EntityTypeInterface $entity_type, Connection $database, EntityManagerInterface $entity_manager, CacheBackendInterface $cache, LanguageManagerInterface $language_manager, AccountProxyInterface $current_user, WebformAccessRulesManagerInterface $access_rules_manager, TimeInterface $time = NULL) {
     parent::__construct($entity_type, $database, $entity_manager, $cache, $language_manager);
@@ -336,8 +338,8 @@ class WebformSubmissionStorage extends SqlContentEntityStorage implements Webfor
     $options = [];
     $source_entities = $this->getSourceEntities($webform);
     foreach ($source_entities as $entity_type => $entity_ids) {
-      $optgroup = (string) $this->entityManager->getDefinition($entity_type)->getCollectionLabel();
-      $entities = $this->entityManager->getStorage($entity_type)->loadMultiple($entity_ids);
+      $optgroup = (string) $this->entityTypeManager->getDefinition($entity_type)->getCollectionLabel();
+      $entities = $this->entityTypeManager->getStorage($entity_type)->loadMultiple($entity_ids);
       foreach ($entities as $entity_id => $entity) {
         if ($entity instanceof TranslatableInterface && $entity->hasTranslation($this->languageManager->getCurrentLanguage()->getId())) {
           $entity = $entity->getTranslation($this->languageManager->getCurrentLanguage()->getId());
diff --git a/src/WebformSubmissionViewBuilder.php b/src/WebformSubmissionViewBuilder.php
index 1fb05812..7a50d9c6 100644
--- a/src/WebformSubmissionViewBuilder.php
+++ b/src/WebformSubmissionViewBuilder.php
@@ -66,6 +66,8 @@ class WebformSubmissionViewBuilder extends EntityViewBuilder implements WebformS
    *   The route match object.
    *
    * @todo Webform 8.x-6.x: Move $route_match before $webform_request.
+   * @todo past Drupal Core 8.6 support: Inject 'entity.repository' instead of
+   *   the deprecated 'entity_manager' service.
    */
   public function __construct(EntityTypeInterface $entity_type, EntityManagerInterface $entity_manager, LanguageManagerInterface $language_manager, WebformRequestInterface $webform_request, WebformElementManagerInterface $element_manager, WebformSubmissionConditionsValidatorInterface $conditions_validator, RouteMatchInterface $route_match = NULL) {
     parent::__construct($entity_type, $entity_manager, $language_manager);
diff --git a/tests/src/Unit/Plugin/views/field/WebformSubmissionBulkFormTest.php b/tests/src/Unit/Plugin/views/field/WebformSubmissionBulkFormTest.php
index 21701e33..c55e624b 100644
--- a/tests/src/Unit/Plugin/views/field/WebformSubmissionBulkFormTest.php
+++ b/tests/src/Unit/Plugin/views/field/WebformSubmissionBulkFormTest.php
@@ -51,6 +51,8 @@ class WebformSubmissionBulkFormTest extends UnitTestCase {
       ->method('loadMultiple')
       ->will($this->returnValue($actions));
 
+    // @todo: past Drupal Core 8.6 support: Replace by a mock of
+    // \Drupal\Core\Entity\EntityTypeManagerInterface.
     $entity_manager = $this->createMock('Drupal\Core\Entity\EntityManagerInterface');
     $entity_manager->expects($this->once())
       ->method('getStorage')