diff --git a/config/rector/sets/cakephp60.php b/config/rector/sets/cakephp60.php
index 9f262bf..7ecce92 100644
--- a/config/rector/sets/cakephp60.php
+++ b/config/rector/sets/cakephp60.php
@@ -12,6 +12,7 @@
 use PHPStan\Type\ObjectType;
 use Rector\Config\RectorConfig;
 use Rector\Renaming\Rector\MethodCall\RenameMethodRector;
+use Rector\Renaming\Rector\Name\RenameClassRector;
 use Rector\Renaming\Rector\PropertyFetch\RenamePropertyRector;
 use Rector\Renaming\Rector\String_\RenameStringRector;
 use Rector\Renaming\ValueObject\MethodCallRename;
@@ -53,6 +54,14 @@
         'accessibleFields' => 'patchableFields',
     ]);
 
+    // Move enums to Enum namespace without suffix
+    // @see https://github.com/cakephp/cakephp/pull/19330
+    // @see https://github.com/cakephp/cakephp/pull/19348
+    $rectorConfig->ruleWithConfiguration(RenameClassRector::class, [
+        'Cake\Database\DriverFeatureEnum' => 'Cake\Database\Enum\DriverFeature',
+        'Cake\Http\Cookie\SameSiteEnum' => 'Cake\Http\Cookie\Enum\SameSite',
+    ]);
+
     // ===== Remove underscores from property names =====
 
     $map = [