diff --git a/pathauto.install b/pathauto.install
index 7c94088..71c007f 100644
--- a/pathauto.install
+++ b/pathauto.install
@@ -216,3 +216,27 @@ function pathauto_update_8101() {
     $pattern_config->save();
   }
 }
+
+/**
+ * Update node type conditions from entity_bundle to node_type.
+ */
+function pathauto_update_8102() {
+  // Load all pattern configuration entities.
+  foreach (\Drupal::configFactory()->listAll('pathauto.pattern.') as $pattern_config_name) {
+    $pattern_config = \Drupal::configFactory()->getEditable($pattern_config_name);
+
+    // Loop patterns and swap the entity_bundle:node plugin by the node_type
+    // plugin.
+    if ($pattern_config->get('type') == 'canonical_entities:node') {
+      $selection_criteria = $pattern_config->get('selection_criteria');
+      foreach ($selection_criteria as $uuid => $condition) {
+        if ($condition['id'] == 'entity_bundle:node') {
+          $selection_criteria[$uuid]['id'] = 'node_type';
+          $pattern_config->set('selection_criteria', $selection_criteria);
+          $pattern_config->save();
+          break;
+        }
+      }
+    }
+  }
+}
diff --git a/src/Form/PatternEditForm.php b/src/Form/PatternEditForm.php
index 4febcf6..f7abd1e 100644
--- a/src/Form/PatternEditForm.php
+++ b/src/Form/PatternEditForm.php
@@ -136,7 +136,7 @@ class PatternEditForm extends EntityForm {
         $default_bundles = [];
         $default_languages = [];
         foreach ($this->entity->getSelectionConditions() as $condition_id => $condition) {
-          if ($condition->getPluginId() == 'entity_bundle:' . $entity_type->id()) {
+          if (in_array($condition->getPluginId(), ['entity_bundle:' . $entity_type->id(), 'node_type'])) {
             $default_bundles = $condition->getConfiguration()['bundles'];
           }
           elseif ($condition->getPluginId() == 'language') {
@@ -211,17 +211,17 @@ class PatternEditForm extends EntityForm {
       $entity_type = $alias_type->getDerivativeId();
       // First, remove bundle and language conditions.
       foreach ($entity->getSelectionConditions() as $condition_id => $condition) {
-
-        if ($condition->getPluginId() == 'entity_bundle:' . $entity_type || $condition->getPluginId() == 'language') {
+        if (in_array($condition->getPluginId(), ['entity_bundle:' . $entity_type, 'node_type', 'language'])) {
           $entity->removeSelectionCondition($condition_id);
         }
       }
 
       if ($bundles = array_filter((array) $form_state->getValue('bundles'))) {
         $default_weight -= 5;
+        $plugin_id = $entity_type == 'node' ? 'node_type' : 'entity_bundle:' . $entity_type;
         $entity->addSelectionCondition(
           [
-            'id' => 'entity_bundle:' . $entity_type,
+            'id' => $plugin_id,
             'bundles' => $bundles,
             'negate' => FALSE,
             'context_mapping' => [
diff --git a/src/Tests/PathautoTestHelperTrait.php b/src/Tests/PathautoTestHelperTrait.php
index d0886d7..705920b 100644
--- a/src/Tests/PathautoTestHelperTrait.php
+++ b/src/Tests/PathautoTestHelperTrait.php
@@ -55,9 +55,11 @@ trait PathautoTestHelperTrait {
    *   The bundle
    */
   protected function addBundleCondition(PathautoPatternInterface $pattern, $entity_type, $bundle) {
+    $plugin_id = $entity_type == 'node' ? 'node_type' : 'entity_bundle:' . $entity_type;
+
     $pattern->addSelectionCondition(
       [
-        'id' => 'entity_bundle:' . $entity_type,
+        'id' => $plugin_id,
         'bundles' => [
           $bundle => $bundle,
         ],