diff --git a/pathauto.install b/pathauto.install
index 7c94088..1f9f330 100644
--- a/pathauto.install
+++ b/pathauto.install
@@ -216,3 +216,34 @@ function pathauto_update_8101() {
     $pattern_config->save();
   }
 }
+
+/**
+ * Update node type conditions from entity_bundle to node_type.
+ */
+function pathauto_update_8102() {
+  // Load all patterns that apply to nodes.
+  $pattern_ids = \Drupal::entityQuery('pathauto_pattern')->condition('type', 'canonical_entities:node')->execute();
+  $pattern_entities = PathautoPattern::loadMultiple($pattern_ids);
+
+  // Loop patterns and change the entity_bundle:node condition by a node_type
+  // condition, while keeping the rest of the configuration intact.
+  foreach ($pattern_entities as $pattern) {
+    foreach ($pattern->getSelectionConditions() as $condition_id => $condition) {
+      if ($condition->getPluginId() == 'entity_bundle:node') {
+        // We found the entity bundle condition. Swap it by a node type one.
+        $configuration = $condition->getConfiguration();
+        $pattern->removeSelectionCondition($condition_id);
+        $pattern->addSelectionCondition([
+          'id' => 'node_type',
+          'bundles' => $configuration['bundles'],
+          'negate' => $configuration['negate'],
+          'context_mapping' => [
+            'node' => 'node',
+          ],
+        ]);
+        $pattern->save();
+        break;
+      }
+    }
+  }
+}
diff --git a/src/Form/PatternEditForm.php b/src/Form/PatternEditForm.php
index 4febcf6..6c443d9 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,19 @@ 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' => [