diff --git a/config/install/content_lock.settings.yml b/config/install/content_lock.settings.yml
index d816791..dc324eb 100644
--- a/config/install/content_lock.settings.yml
+++ b/config/install/content_lock.settings.yml
@@ -1,2 +1,3 @@
 verbose: 1
 types: {}
+form_op_lock: {}
diff --git a/config/schema/content_lock.schema.yml b/config/schema/content_lock.schema.yml
index 0b66fb1..bb9ad92 100644
--- a/config/schema/content_lock.schema.yml
+++ b/config/schema/content_lock.schema.yml
@@ -13,3 +13,15 @@ content_lock.settings:
         sequence:
           type: string
           label: 'Bundle type'
+    form_op_lock:
+    type: mapping
+    mapping:
+      mode:
+        type: integer
+        label: 'Disabled / blacklist / whitelist mode per entity type'
+      values:
+        type: sequence
+        label: 'Whitelisted / blacklisted form operations per entity type'
+        sequence:
+          type: string
+          label: 'form operation'
diff --git a/content_lock.install b/content_lock.install
index 5c414d6..a0383aa 100644
--- a/content_lock.install
+++ b/content_lock.install
@@ -5,6 +5,8 @@
  * Create content_lock table.
  */
 
+use Drupal\Core\Language\LanguageInterface;
+
 /**
  * Implements hook_schema().
  */
@@ -27,6 +29,13 @@ function content_lock_schema() {
         'not null' => TRUE,
         'default' => 'node',
       ],
+      'form_op' => [
+        'description' => 'The entity form operation.',
+        'type' => 'varchar',
+        'length' => 255,
+        'not null' => TRUE,
+        'default' => '*',
+      ],
       'uid' => [
         'description' => 'User that holds the lock.',
         'type' => 'int',
diff --git a/content_lock.module b/content_lock.module
index 6ac39d0..cc01551 100644
--- a/content_lock.module
+++ b/content_lock.module
@@ -72,7 +72,8 @@ function content_lock_form_alter(&$form, FormStateInterface $form_state, $form_i
   // Check if we must lock this entity.
   /** @var \Drupal\content_lock\ContentLock\ContentLock $lock_service */
   $lock_service = \Drupal::service('content_lock');
-  if (!$lock_service->isLockable($entity)) {
+  $form_op = $form_state->getFormObject()->getOperation();
+  if (!$lock_service->isLockable($entity, $form_op)) {
     return;
   }
 
@@ -82,7 +83,7 @@ function content_lock_form_alter(&$form, FormStateInterface $form_state, $form_i
     $form['actions']['publish']['#submit'][] = 'content_lock_form_submit';
 
     // We lock the content if it is currently edited by another user.
-    if (!$lock_service->locking($entity->id(), $user->id(), $entity_type)) {
+    if (!$lock_service->locking($entity->id(), $form_op, $user->id(), $entity_type)) {
       $form['#disabled'] = TRUE;
 
       // Do not allow deletion, publishing, or unpublishing if locked.
@@ -105,7 +106,7 @@ function content_lock_form_alter(&$form, FormStateInterface $form_state, $form_i
     else {
       // ContentLock::locking() returns TRUE if the content is locked by the
       // current user. Add an unlock button only for this user.
-      $form['actions']['unlock'] = $lock_service->unlockButton($entity_type, $entity->id(), \Drupal::request()->query->get('destination'));
+      $form['actions']['unlock'] = $lock_service->unlockButton($entity_type, $entity->id(), $form_op, \Drupal::request()->query->get('destination'));
     }
   }
 }
@@ -123,7 +124,7 @@ function content_lock_form_submit($form, FormStateInterface $form_state) {
   $entity = $form_state->getFormObject()->getEntity();
 
   // If the user submitting owns the lock, release it.
-  $lock_service->release($entity->id(), $user->id(), $entity->getEntityTypeId());
+  $lock_service->release($entity->id(), $form_state->getFormObject()->getOperation(), $user->id(), $entity->getEntityTypeId());
 
   // We need to redirect to the taxonomy term page after saving it. If not, we
   // stay on the taxonomy term edit form and we relock the term.
@@ -151,7 +152,7 @@ function content_lock_entity_predelete(EntityInterface $entity) {
     return;
   }
 
-  $data = $lock_service->fetchLock($entity_id, $entity_type);
+  $data = $lock_service->fetchLock($entity_id, NULL, $entity_type);
 
   if ($data !== FALSE) {
     $current_user = \Drupal::currentUser();
@@ -287,14 +288,14 @@ function content_lock_entity_operation(EntityInterface $entity) {
   $lock_service = \Drupal::service('content_lock');
   if ($lock_service->isLockable($entity)) {
 
-    $lock = $lock_service->fetchLock($entity->id(), $entity->getEntityTypeId());
+    $lock = $lock_service->fetchLock($entity->id(), NULL, $entity->getEntityTypeId());
 
     $user = \Drupal::currentUser();
     if ($lock && $user->hasPermission('break content lock')) {
       $url = 'content_lock.break_lock.' . $entity->getEntityTypeId();
       $operations['break_lock'] = [
         'title' => t('Break lock'),
-        'url' => Url::fromRoute($url, ['entity' => $entity->id()]),
+        'url' => Url::fromRoute($url, ['entity' => $entity->id(), 'form_op' => '*']),
         'weight' => 50,
       ];
     }
diff --git a/modules/content_lock_timeout/content_lock_timeout.module b/modules/content_lock_timeout/content_lock_timeout.module
index d5b4383..f3d151d 100644
--- a/modules/content_lock_timeout/content_lock_timeout.module
+++ b/modules/content_lock_timeout/content_lock_timeout.module
@@ -33,7 +33,7 @@ function content_lock_timeout_cron() {
     ->condition('c.timestamp', $last_valid_time, '<');
   $count = 0;
   foreach ($query->execute() as $obj) {
-    $lock_service->release($obj->entity_id, $obj->uid, $obj->entity_type);
+    $lock_service->release($obj->entity_id, $obj->form_op, $obj->uid, $obj->entity_type);
     $count++;
   }
 
@@ -82,7 +82,7 @@ function content_lock_timeout_entity_prepare_form(EntityInterface $entity, $oper
       && $user->hasPermission('break content lock')
       && ($user->id() > 0)
     ) {
-      $lock_service->release($entity->id(), $lock->uid, $entity->getEntityTypeId());
+      $lock_service->release($entity->id(), $operation, $lock->uid, $entity->getEntityTypeId());
 
       if ($lock_service->verbose()) {
         $username = User::load($lock->uid)->getDisplayName();
diff --git a/src/ContentLock/ContentLock.php b/src/ContentLock/ContentLock.php
index 6c9ab5f..3ca8d89 100644
--- a/src/ContentLock/ContentLock.php
+++ b/src/ContentLock/ContentLock.php
@@ -26,6 +26,21 @@ class ContentLock extends ServiceProviderBase {
   use StringTranslationTrait;
 
   /**
+   * Form operation mode disabled.
+   */
+  const FORM_OP_MODE_DISABLED = 0;
+
+  /**
+   * Form operation mode whitelist.
+   */
+  const FORM_OP_MODE_WHITELIST = 1;
+
+  /**
+   * Form operation mode blacklist.
+   */
+  const FORM_OP_MODE_BLACKLIST = 2;
+
+  /**
    * The database service.
    *
    * @var \Drupal\Core\Database\Connection
@@ -178,19 +193,27 @@ class ContentLock extends ServiceProviderBase {
    *
    * @param int $entity_id
    *   The entity id.
+   * @param string $form_op
+   *   (optional) The entity form operation.
    * @param string $entity_type
    *   The entity type.
    *
    * @return object
    *   The lock for the node. FALSE, if the document is not locked.
    */
-  public function fetchLock($entity_id, $entity_type = 'node') {
+  public function fetchLock($entity_id, $form_op = NULL, $entity_type = 'node') {
+    if (!$this->isFormOperationLockEnabled($entity_type)) {
+      $form_op = '*';
+    }
     $query = $this->database->select('content_lock', 'c');
     $query->leftJoin('users_field_data', 'u', '%alias.uid = c.uid');
     $query->fields('c')
       ->fields('u', ['name'])
       ->condition('c.entity_type', $entity_type)
       ->condition('c.entity_id', $entity_id);
+    if (isset($form_op)) {
+      $query->condition('c.form_op', $form_op);
+    }
 
     return $query->execute()->fetchObject();
   }
@@ -219,6 +242,8 @@ class ContentLock extends ServiceProviderBase {
    *
    * @param int $entity_id
    *   The entity id.
+   * @param string $form_op
+   *   The entity form operation.
    * @param int $uid
    *   The user id.
    * @param string $entity_type
@@ -227,13 +252,17 @@ class ContentLock extends ServiceProviderBase {
    * @return bool
    *   Return TRUE OR FALSE.
    */
-  public function isLockedBy($entity_id, $uid, $entity_type = 'node') {
+  public function isLockedBy($entity_id, $form_op, $uid, $entity_type = 'node') {
+    if (!$this->isFormOperationLockEnabled($entity_type)) {
+      $form_op = '*';
+    }
     /** @var \Drupal\Core\Database\Query\SelectInterface $query */
     $query = $this->database->select('content_lock', 'c')
       ->fields('c')
       ->condition('entity_id', $entity_id)
       ->condition('uid', $uid)
-      ->condition('entity_type', $entity_type);
+      ->condition('entity_type', $entity_type)
+      ->condition('form_op', $form_op);;
     $num_rows = $query->countQuery()->execute()->fetchField();
     return (bool) $num_rows;
   }
@@ -243,18 +272,23 @@ class ContentLock extends ServiceProviderBase {
    *
    * @param int $entity_id
    *   The entity id.
+   * @param string $form_op
+   *   (optional) The entity form operation.
    * @param int $uid
    *   If set, verify that a lock belongs to this user prior to release.
    * @param string $entity_type
    *   The entity type.
    */
-  public function release($entity_id, $uid = NULL, $entity_type = 'node') {
+  public function release($entity_id, $form_op = NULL, $uid = NULL, $entity_type = 'node') {
+    if (!$this->isFormOperationLockEnabled($entity_type)) {
+      $form_op = '*';
+    }
     // Delete locking item from database.
-    $this->lockingDelete($entity_id, $uid, $entity_type);
+    $this->lockingDelete($entity_id, $form_op, $uid, $entity_type);
 
     $this->moduleHandler->invokeAll(
       'content_lock_release',
-      [$entity_id, $entity_type]
+      [$entity_id, $form_op, $entity_type]
     );
   }
 
@@ -320,6 +354,8 @@ class ContentLock extends ServiceProviderBase {
    *
    * @param int $entity_id
    *   The entity id.
+   * @param string $form_op
+   *   The entity form operation.
    * @param int $uid
    *   The user uid.
    * @param string $entity_type
@@ -328,15 +364,20 @@ class ContentLock extends ServiceProviderBase {
    * @return bool
    *   The result of the merge query.
    */
-  protected function lockingSave($entity_id, $uid, $entity_type = 'node') {
+  protected function lockingSave($entity_id, $form_op, $uid, $entity_type = 'node') {
+    if (!$this->isFormOperationLockEnabled($entity_type)) {
+      $form_op = '*';
+    }
     $result = $this->database->merge('content_lock')
       ->key([
         'entity_id' => $entity_id,
         'entity_type' => $entity_type,
+        'form_op' => $form_op,
       ])
       ->fields([
         'entity_id' => $entity_id,
         'entity_type' => $entity_type,
+        'form_op' => $form_op,
         'uid' => $uid,
         'timestamp' => REQUEST_TIME,
       ])
@@ -350,6 +391,8 @@ class ContentLock extends ServiceProviderBase {
    *
    * @param int $entity_id
    *   The entity id.
+   * @param string $form_op
+   *   (optional) The entity form operation.
    * @param int $uid
    *   The user uid.
    * @param string $entity_type
@@ -358,10 +401,16 @@ class ContentLock extends ServiceProviderBase {
    * @return bool
    *   The result of the delete query.
    */
-  protected function lockingDelete($entity_id, $uid, $entity_type = 'node') {
+  protected function lockingDelete($entity_id, $form_op = NULL, $uid, $entity_type = 'node') {
+    if (!$this->isFormOperationLockEnabled($entity_type)) {
+      $form_op = '*';
+    }
     $query = $this->database->delete('content_lock')
       ->condition('entity_type', $entity_type)
       ->condition('entity_id', $entity_id);
+    if (isset($form_op)) {
+     $query->condition('form_op', $form_op);
+    }
     if (!empty($uid)) {
       $query->condition('uid', $uid);
     }
@@ -386,6 +435,8 @@ class ContentLock extends ServiceProviderBase {
    *
    * @param int $entity_id
    *   The entity id.
+   * @param string $form_op
+   *   The entity form operation.
    * @param int $uid
    *   The user id to lock the node for.
    * @param string $entity_type
@@ -395,15 +446,22 @@ class ContentLock extends ServiceProviderBase {
    *
    * @return bool
    *   FALSE, if a document has already been locked by someone else.
+   *
+   * @throws \InvalidArgumentException
+   *   An exception will be thrown if the
    */
-  public function locking($entity_id, $uid, $entity_type = 'node', $quiet = FALSE) {
+  public function locking($entity_id, $form_op, $uid, $entity_type = 'node', $quiet = FALSE) {
+    if (!$this->isFormOperationLockEnabled($entity_type)) {
+      $form_op = '*';
+    }
+
     // Check locking status.
-    $lock = $this->fetchLock($entity_id, $entity_type);
+    $lock = $this->fetchLock($entity_id, $form_op, $entity_type);
 
     // No lock yet.
     if ($lock === FALSE || !is_object($lock)) {
       // Save locking into database.
-      $this->lockingSave($entity_id, $uid, $entity_type);
+      $this->lockingSave($entity_id, $form_op, $uid, $entity_type);
 
       if ($this->verbose() && !$quiet) {
         drupal_set_message($this->t('This content is now locked against simultaneous editing. This content will remain locked if you navigate away from this page without saving or unlocking it.'), 'status', FALSE);
@@ -411,8 +469,9 @@ class ContentLock extends ServiceProviderBase {
       // Post locking hook.
       $this->moduleHandler->invokeAll('content_lock_locked', [
         $entity_id,
+        $form_op,
         $uid,
-        $entity_type,
+        $entity_type
       ]);
 
       // Send success flag.
@@ -431,7 +490,7 @@ class ContentLock extends ServiceProviderBase {
           $link = Link::createFromRoute(
             $this->t('Break lock'),
             'content_lock.break_lock.' . $entity_type,
-            ['entity' => $entity_id],
+            ['entity' => $entity_id, 'form_op' => $form_op],
             ['query' => ['destination' => $this->currentRequest->getRequestUri()]]
           )->toString();
 
@@ -444,7 +503,7 @@ class ContentLock extends ServiceProviderBase {
       }
       else {
         // Save locking into database.
-        $this->lockingSave($entity_id, $uid, $entity_type);
+        $this->lockingSave($entity_id, $form_op, $uid, $entity_type);
 
         // Locked by current user.
         if ($this->verbose() && !$quiet) {
@@ -462,11 +521,13 @@ class ContentLock extends ServiceProviderBase {
    *
    * @param \Drupal\Core\Entity\EntityInterface $entity
    *   The entity to check.
+   * @param string $form_op
+   *   (optional) The entity form operation.
    *
    * @return bool
    *   TRUE is entity is lockable
    */
-  public function isLockable(EntityInterface $entity) {
+  public function isLockable(EntityInterface $entity, $form_op = NULL) {
     $entity_id = $entity->id();
     $entity_type = $entity->getEntityTypeId();
     $bundle = $entity->bundle();
@@ -476,12 +537,26 @@ class ContentLock extends ServiceProviderBase {
     $this->moduleHandler->invokeAll('content_lock_entity_lockable', [
       $entity,
       $entity_id,
+      $form_op,
       $entity_type,
       $bundle,
       $config,
     ]);
 
     if (is_array($config) && in_array($bundle, $config)) {
+      if (isset($form_op) && $this->isFormOperationLockEnabled($entity_type)) {
+        $mode = $this->configFactory->get('content_lock.settings')
+          ->get("form_op_lock.$entity_type.mode");
+        $values = $this->configFactory->get('content_lock.settings')
+          ->get("form_op_lock.$entity_type.values");
+
+        if ($mode == self::FORM_OP_MODE_BLACKLIST) {
+          return !in_array($form_op, $values);
+        }
+        elseif ($mode == self::FORM_OP_MODE_WHITELIST) {
+          return in_array($form_op, $values);
+        }
+      }
       return TRUE;
     }
 
@@ -496,17 +571,23 @@ class ContentLock extends ServiceProviderBase {
    *   The entity type of the content.
    * @param int $entity_id
    *   The entity id of the content.
+   * @param string $form_op
+   *   The entity form operation.
    * @param string $destination
    *   The destination query parameter to build the link with.
    *
    * @return array
    *   The link form element.
    */
-  public function unlockButton($entity_type, $entity_id, $destination) {
+  public function unlockButton($entity_type, $entity_id, $form_op, $destination) {
     $unlock_url_options = [];
     if ($destination) {
       $unlock_url_options['query'] = ['destination' => $destination];
     }
+    $route_parameters = [
+      'entity' => $entity_id,
+      'form_op' => $this->isFormOperationLockEnabled($entity_type) ? $form_op : '*',
+    ];
     return [
       '#type' => 'link',
       '#title' => $this->t('Unlock'),
@@ -514,9 +595,23 @@ class ContentLock extends ServiceProviderBase {
       '#attributes' => [
         'class' => ['button'],
       ],
-      '#url' => Url::fromRoute('content_lock.break_lock.' . $entity_type, ['entity' => $entity_id], $unlock_url_options),
+      '#url' => Url::fromRoute('content_lock.break_lock.' . $entity_type, $route_parameters, $unlock_url_options),
       '#weight' => 200,
     ];
   }
 
+  /**
+   * Checks whether the entity type is lockable on translation level.
+   *
+   * @param $entity_type_id
+   *   The entity type ID.
+   *
+   * @return bool
+   *   TRUE if the entity type should be locked on translation level, FALSE if
+   *   it should be locked on entity level.
+   */
+  public function isFormOperationLockEnabled($entity_type_id) {
+    return $this->configFactory->get('content_lock.settings')->get("form_op_lock.$entity_type_id.mode") != self::FORM_OP_MODE_DISABLED;
+  }
+
 }
diff --git a/src/Form/ContentLockSettingsForm.php b/src/Form/ContentLockSettingsForm.php
index 2a1d384..b382dce 100644
--- a/src/Form/ContentLockSettingsForm.php
+++ b/src/Form/ContentLockSettingsForm.php
@@ -2,6 +2,7 @@
 
 namespace Drupal\content_lock\Form;
 
+use Drupal\content_lock\ContentLock\ContentLock;
 use Drupal\Core\Entity\ContentEntityTypeInterface;
 use Drupal\Core\Form\ConfigFormBase;
 use Drupal\Core\Form\FormStateInterface;
@@ -101,7 +102,7 @@ class ContentLockSettingsForm extends ConfigFormBase {
           $options[$bundle->id()] = $bundle->label();
         }
         if ($options) {
-          $form['entities'][$definition->id()] = [
+          $form['entities'][$definition->id()]['bundles'] = [
             '#type' => 'checkboxes',
             '#title' => $definition->getLabel(),
             '#description' => $this->t('Select the bundles on which enable content lock'),
@@ -109,6 +110,37 @@ class ContentLockSettingsForm extends ConfigFormBase {
             '#default_value' => $config->get('types.' . $definition->id()) ?: [],
           ];
         }
+
+        if (!empty($definition->getHandlerClasses()['form'])) {
+          $form['entities'][$definition->id()]['form_op_lock'] = [
+            '#tree' => 1,
+          ];
+          $form['entities'][$definition->id()]['form_op_lock']['mode'] = [
+            '#type' => 'radios',
+            '#title' => $this->t('Lock only on entity form operation level.'),
+            '#options' => [
+              ContentLock::FORM_OP_MODE_DISABLED => $this->t('Disabled'),
+              ContentLock::FORM_OP_MODE_WHITELIST => $this->t('Enable lock for selected form operations'),
+              ContentLock::FORM_OP_MODE_BLACKLIST => $this->t('Disable lock for selected form operations'),
+            ],
+            '#default_value' => $config->get('form_op_lock.' . $definition->id() . '.mode') ?: ContentLock::FORM_OP_MODE_DISABLED,
+            '#description' => $this->t('Activating this options allows users to edit different entity forms concurrently')
+          ];
+
+          $form_ops = array_keys($definition->getHandlerClasses()['form']);
+          $form_ops = array_combine($form_ops, $form_ops);
+          $form['entities'][$definition->id()]['form_op_lock']['values'] = [
+            '#type' => 'checkboxes',
+            '#title' => $this->t('Form operations'),
+            '#options' => $form_ops,
+            '#default_value' => (array) $config->get('form_op_lock.' . $definition->id() . '.values'),
+            '#states' => [
+              'invisible' => [
+                ':input[name="' . $definition->id() . '[form_op_lock][mode]"]' => ['value' => ContentLock::FORM_OP_MODE_DISABLED],
+              ],
+            ],
+          ];
+        }
       }
     }
 
@@ -125,8 +157,10 @@ class ContentLockSettingsForm extends ConfigFormBase {
     foreach ($definitions as $definition) {
       if ($definition instanceof ContentEntityTypeInterface && $definition->getBundleEntityType()) {
         if ($form_state->getValue($definition->id())) {
-          $this->config('content_lock.settings')
-            ->set('types.' . $definition->id(), $this->removeEmptyValue($form_state->getValue($definition->id())));
+          $content_lock = $this->config('content_lock.settings');
+          $content_lock->set('types.' . $definition->id(), $this->removeEmptyValue($form_state->getValue([$definition->id(), 'bundles'])));
+          $content_lock->set('form_op_lock.' . $definition->id() . '.mode', $form_state->getValue([$definition->id(), 'form_op_lock', 'mode']));
+          $content_lock->set('form_op_lock.' . $definition->id() . '.values', $this->removeEmptyValue((array) $form_state->getValue([$definition->id(), 'form_op_lock', 'values'])));
         }
       }
     }
diff --git a/src/Form/EntityBreakLockForm.php b/src/Form/EntityBreakLockForm.php
index ca5a29f..41bacb6 100644
--- a/src/Form/EntityBreakLockForm.php
+++ b/src/Form/EntityBreakLockForm.php
@@ -60,8 +60,9 @@ class EntityBreakLockForm extends FormBase {
   public function submitForm(array &$form, FormStateInterface $form_state) {
     $entity_type = $form_state->getValue('entity_type_id');
     $entity_id = $form_state->getValue('entity_id');
+    $form_op = $form_state->getValue('form_op') ?: NULL;
 
-    $this->lockService->release($entity_id, NULL, $entity_type);
+    $this->lockService->release($entity_id, $form_op, NULL, $entity_type);
     drupal_set_message($this->t('Lock broken. Anyone can now edit this content.'));
 
     // Redirect URL to the request destination or the canonical entity view.
@@ -84,7 +85,11 @@ class EntityBreakLockForm extends FormBase {
   /**
    * {@inheritdoc}
    */
-  public function buildForm(array $form, FormStateInterface $form_state, ContentEntityInterface $entity = NULL) {
+  public function buildForm(array $form, FormStateInterface $form_state, ContentEntityInterface $entity = NULL, $form_op = NULL) {
+    $form_op_lock = $this->lockService->isFormOperationLockEnabled($entity->getEntityTypeId());
+    if (!$form_op_lock) {
+      $form_op = '*';
+    }
     $form['#title'] = $this->t('Break Lock for content @label', ['@label' => $entity->label()]);
     $form['entity_id'] = [
       '#type' => 'value',
@@ -94,6 +99,10 @@ class EntityBreakLockForm extends FormBase {
       '#type' => 'value',
       '#value' => $entity->getEntityTypeId(),
     ];
+    $form['form_op'] = [
+      '#type' => 'value',
+      '#value' => $form_op,
+    ];
     $form['submit'] = [
       '#type' => 'submit',
       '#value' => $this->t('Confirm break lock'),
diff --git a/src/Routing/BreakLockRoutes.php b/src/Routing/BreakLockRoutes.php
index 146f90d..4ed3f55 100644
--- a/src/Routing/BreakLockRoutes.php
+++ b/src/Routing/BreakLockRoutes.php
@@ -43,7 +43,7 @@ class BreakLockRoutes implements ContainerInjectionInterface {
     foreach ($definitions as $definition) {
       if ($definition instanceof ContentEntityTypeInterface && $definition->getBundleEntityType()) {
         $routes['content_lock.break_lock.' . $definition->id()] = new Route(
-          '/admin/break-lock/' . $definition->id() . '/{entity}',
+          '/admin/break-lock/' . $definition->id() . '/{entity}/{form_op}',
           [
             '_form' => $definition->getHandlerClass('break_lock_form'),
             '_title' => 'Break lock',
diff --git a/src/Tests/ContentLockTestBase.php b/src/Tests/ContentLockTestBase.php
index 720cd45..0ce1373 100644
--- a/src/Tests/ContentLockTestBase.php
+++ b/src/Tests/ContentLockTestBase.php
@@ -213,7 +213,7 @@ class ContentLockTestBase extends WebTestBase {
     // We protect the bundle created.
     $this->drupalLogin($this->adminUser);
     $edit = [
-      'node[article]' => 1,
+      'node[bundles][article]' => 1,
     ];
     $this->drupalPostForm('admin/config/content/contentlocksettings', $edit, t('Save configuration'));
 
@@ -275,7 +275,7 @@ class ContentLockTestBase extends WebTestBase {
     // We protect the bundle created.
     $this->drupalLogin($this->adminUser);
     $edit = [
-      'block_content[basic]' => 1,
+      'block_content[bundles][basic]' => 1,
     ];
     $this->drupalPostForm('admin/config/content/contentlocksettings', $edit, t('Save configuration'));
 
@@ -334,7 +334,7 @@ class ContentLockTestBase extends WebTestBase {
     // We protect the bundle created.
     $this->drupalLogin($this->adminUser);
     $edit = [
-      'taxonomy_term[' . $this->term1->bundle() . ']' => 1,
+      'taxonomy_term[bundles][' . $this->term1->bundle() . ']' => 1,
     ];
     $this->drupalPostForm('admin/config/content/contentlocksettings', $edit, t('Save configuration'));