diff --git a/src/Form/WebformSubmissionDeleteForm.php b/src/Form/WebformSubmissionDeleteForm.php
index 0bc0170d..3d450a3a 100644
--- a/src/Form/WebformSubmissionDeleteForm.php
+++ b/src/Form/WebformSubmissionDeleteForm.php
@@ -3,7 +3,7 @@
 namespace Drupal\webform\Form;
 
 use Drupal\Core\Entity\ContentEntityDeleteForm;
-use Drupal\Core\Entity\EntityManagerInterface;
+use Drupal\Core\Entity\EntityRepositoryInterface;
 use Drupal\Core\Form\FormStateInterface;
 use Drupal\webform\WebformRequestInterface;
 use Symfony\Component\DependencyInjection\ContainerInterface;
@@ -46,13 +46,13 @@ class WebformSubmissionDeleteForm extends ContentEntityDeleteForm implements Web
   /**
    * Constructs a WebformSubmissionDeleteForm object.
    *
-   * @param \Drupal\Core\Entity\EntityManagerInterface $entity_manager
+   * @param \Drupal\Core\Entity\EntityRepositoryInterface $entity_repository
    *   The entity manager.
    * @param \Drupal\webform\WebformRequestInterface $request_handler
    *   The webform request handler.
    */
-  public function __construct(EntityManagerInterface $entity_manager, WebformRequestInterface $request_handler) {
-    parent::__construct($entity_manager);
+  public function __construct(EntityRepositoryInterface $entity_repository, WebformRequestInterface $request_handler) {
+    parent::__construct($entity_repository);
     $this->requestHandler = $request_handler;
   }
 
@@ -61,7 +61,7 @@ class WebformSubmissionDeleteForm extends ContentEntityDeleteForm implements Web
    */
   public static function create(ContainerInterface $container) {
     return new static(
-      $container->get('entity.manager'),
+      $container->get('entity.repository'),
       $container->get('webform.request')
     );
   }
diff --git a/src/WebformSubmissionForm.php b/src/WebformSubmissionForm.php
index c20d348f..83207a4a 100644
--- a/src/WebformSubmissionForm.php
+++ b/src/WebformSubmissionForm.php
@@ -8,7 +8,7 @@ use Drupal\Component\Utility\Html;
 use Drupal\Component\Utility\NestedArray;
 use Drupal\Core\Cache\Cache;
 use Drupal\Core\Entity\EntityInterface;
-use Drupal\Core\Entity\EntityManagerInterface;
+use Drupal\Core\Entity\EntityTypeManagerInterface;
 use Drupal\Core\Entity\ContentEntityForm;
 use Drupal\Core\Form\FormState;
 use Drupal\Core\Form\FormStateInterface;
@@ -32,6 +32,7 @@ use Drupal\webform\Utility\WebformElementHelper;
 use Symfony\Component\DependencyInjection\ContainerInterface;
 use Symfony\Component\HttpKernel\Exception\AccessDeniedHttpException;
 use Drupal\Core\Config\ConfigFactoryInterface;
+use Drupal\Core\Entity\EntityRepositoryInterface;
 
 /**
  * Provides a webform to collect and edit submissions.
@@ -40,6 +41,13 @@ class WebformSubmissionForm extends ContentEntityForm {
 
   use WebformDialogFormTrait;
 
+  /**
+   * The entity type manager.
+   *
+   * @var \Drupal\Core\Entity\EntityTypeManagerInterface
+   */
+  protected $entityTypeManager;
+
   /**
    * The configuration object factory.
    *
@@ -148,7 +156,9 @@ class WebformSubmissionForm extends ContentEntityForm {
   /**
    * Constructs a WebformSubmissionForm object.
    *
-   * @param \Drupal\Core\Entity\EntityManagerInterface $entity_manager
+   * @param \Drupal\Core\Entity\EntityTypeManagerInterface $entity_type_manager
+   *   The entity type manager.
+   * @param \Drupal\Core\Entity\EntityRepositoryInterface $entity_repository
    *   The entity manager.
    * @param \Drupal\Core\Config\ConfigFactoryInterface $config_factory
    *   The factory for configuration objects.
@@ -176,7 +186,8 @@ class WebformSubmissionForm extends ContentEntityForm {
    *   The webform submission generation service.
    */
   public function __construct(
-    EntityManagerInterface $entity_manager,
+    EntityTypeManagerInterface $entity_type_manager,
+    EntityRepositoryInterface $entity_repository,
     ConfigFactoryInterface $config_factory,
     RendererInterface $renderer,
     AliasManagerInterface $alias_manager,
@@ -190,7 +201,8 @@ class WebformSubmissionForm extends ContentEntityForm {
     WebformEntityReferenceManagerInterface $webform_entity_reference_manager,
     WebformSubmissionGenerateInterface $submission_generate
   ) {
-    parent::__construct($entity_manager);
+    parent::__construct($entity_repository);
+    $this->entityTypeManager = $entity_type_manager;
     $this->configFactory = $config_factory;
     $this->renderer = $renderer;
     $this->requestHandler = $request_handler;
@@ -211,7 +223,8 @@ class WebformSubmissionForm extends ContentEntityForm {
    */
   public static function create(ContainerInterface $container) {
     return new static(
-      $container->get('entity.manager'),
+      $container->get('entity_type.manager'),
+      $container->get('entity.repository'),
       $container->get('config.factory'),
       $container->get('renderer'),
       $container->get('path.alias_manager'),
@@ -1931,7 +1944,7 @@ class WebformSubmissionForm extends ContentEntityForm {
         '#attributes' => $preview_attributes,
         // Progress bar is -20.
         '#weight' => -10,
-        'submission' => $this->entityManager
+        'submission' => $this->entityTypeManager
           ->getViewBuilder('webform_submission')
           ->view($this->entity, 'preview'),
       ];
@@ -2474,7 +2487,7 @@ class WebformSubmissionForm extends ContentEntityForm {
    *   The webform submission entity storage.
    */
   protected function getStorage() {
-    return $this->entityManager->getStorage('webform_submission');
+    return $this->entityTypeManager->getStorage('webform_submission');
   }
 
   /**
diff --git a/src/WebformSubmissionNotesForm.php b/src/WebformSubmissionNotesForm.php
index 748dbfc3..1143417d 100644
--- a/src/WebformSubmissionNotesForm.php
+++ b/src/WebformSubmissionNotesForm.php
@@ -3,7 +3,7 @@
 namespace Drupal\webform;
 
 use Drupal\Core\Entity\ContentEntityForm;
-use Drupal\Core\Entity\EntityManagerInterface;
+use Drupal\Core\Entity\EntityRepositoryInterface;
 use Drupal\Core\Form\FormStateInterface;
 use Drupal\webform\Form\WebformDialogFormTrait;
 use Symfony\Component\DependencyInjection\ContainerInterface;
@@ -27,7 +27,7 @@ class WebformSubmissionNotesForm extends ContentEntityForm {
   /**
    * Constructs a ContentEntityForm object.
    *
-   * @param \Drupal\Core\Entity\EntityManagerInterface $entity_manager
+   * @param \Drupal\Core\Entity\EntityRepositoryInterface $entity_repository
    *   The entity manager.
    * @param \Drupal\webform\WebformRequestInterface $webform_request
    *   The webform request handler.
@@ -36,9 +36,9 @@ class WebformSubmissionNotesForm extends ContentEntityForm {
    * @param \Drupal\Component\Datetime\TimeInterface $time
    *   The time service.
    */
-  public function __construct(EntityManagerInterface $entity_manager, WebformRequestInterface $webform_request, EntityTypeBundleInfoInterface $entity_type_bundle_info = NULL, TimeInterface $time = NULL) {
+  public function __construct(EntityRepositoryInterface $entity_repository, WebformRequestInterface $webform_request, EntityTypeBundleInfoInterface $entity_type_bundle_info = NULL, TimeInterface $time = NULL) {
     // Calling the parent constructor.
-    parent::__construct($entity_manager, $entity_type_bundle_info, $time);
+    parent::__construct($entity_repository, $entity_type_bundle_info, $time);
 
     $this->requestHandler = $webform_request;
   }
@@ -48,7 +48,7 @@ class WebformSubmissionNotesForm extends ContentEntityForm {
    */
   public static function create(ContainerInterface $container) {
     return new static(
-      $container->get('entity.manager'),
+      $container->get('entity.repository'),
       $container->get('webform.request'),
       $container->get('entity_type.bundle.info'),
       $container->get('datetime.time')