diff --git a/composer.json b/composer.json
index 9d51433..c26d35e 100644
--- a/composer.json
+++ b/composer.json
@@ -2,13 +2,13 @@
     "name": "craftcms/rector",
     "description": "Rector sets to automate Craft CMS upgrades",
     "require": {
-        "rector/rector": "^1.0.0"
+        "rector/rector": "^2.0.0"
     },
     "require-dev": {
-        "phpunit/phpunit": "^9.0",
-        "craftcms/cms": "^4.0.0|^5.0.0",
+        "phpunit/phpunit": "^12.0",
+        "craftcms/cms": "^4.0.0|^5.0.0|^6.x-dev",
         "craftcms/ecs": "dev-main",
-        "phpstan/phpstan": "^1.10",
+        "phpstan/phpstan": "^2.0.0",
         "symfony/var-exporter": "^6.0"
     },
     "autoload": {
@@ -24,7 +24,8 @@
     "scripts": {
         "phpstan": "phpstan --ansi --memory-limit=1G",
         "check-cs": "ecs check --ansi",
-        "fix-cs": "ecs check --fix --ansi"
+        "fix-cs": "ecs check --fix --ansi",
+        "tests": "phpunit"
     },
     "minimum-stability": "dev",
     "prefer-stable": true,
diff --git a/phpunit.xml b/phpunit.xml
index 3918a27..a4ece7c 100644
--- a/phpunit.xml
+++ b/phpunit.xml
@@ -13,5 +13,14 @@
         <testsuite name="main">
             <directory>tests</directory>
         </testsuite>
+        <testsuite name="craftcms40">
+            <directory>tests/set/craftcms40</directory>
+        </testsuite>
+        <testsuite name="craftcms50">
+            <directory>tests/set/craftcms50</directory>
+        </testsuite>
+        <testsuite name="craftcms60">
+            <directory>tests/set/craftcms60</directory>
+        </testsuite>
     </testsuites>
 </phpunit>
diff --git a/sets/craft-cms-60.php b/sets/craft-cms-60.php
new file mode 100644
index 0000000..8509035
--- /dev/null
+++ b/sets/craft-cms-60.php
@@ -0,0 +1,17 @@
+<?php
+
+declare(strict_types=1);
+
+use craft\rector\SignatureConfigurator;
+use Rector\Config\RectorConfig;
+use Rector\Renaming\Rector\Name\RenameClassRector;
+
+return static function(RectorConfig $rectorConfig): void {
+    // Class renames
+    $rectorConfig->ruleWithConfiguration(RenameClassRector::class, [
+        'craft\enums\Edition' => 'CraftCms\Cms\Edition',
+    ]);
+
+    // Property/method signatures
+    SignatureConfigurator::configure($rectorConfig, 'craft-cms-60');
+};
diff --git a/signatures/craft-cms-60.php b/signatures/craft-cms-60.php
new file mode 100644
index 0000000..a3475c9
--- /dev/null
+++ b/signatures/craft-cms-60.php
@@ -0,0 +1,14 @@
+<?php
+
+declare(strict_types=1);
+
+return [
+    // Property types (empty for now, will be filled as needed)
+    'propertyTypes' => [],
+
+    // Method return types (empty for now, will be filled as needed)
+    'methodReturnTypes' => [],
+
+    // Method param types (empty for now, will be filled as needed)
+    'methodParamTypes' => [],
+];
\ No newline at end of file
diff --git a/src/SetList.php b/src/SetList.php
index 4cf0ecd..4880cc9 100644
--- a/src/SetList.php
+++ b/src/SetList.php
@@ -18,6 +18,11 @@ final class SetList implements SetListInterface
      */
     public const CRAFT_CMS_50 = __DIR__ . '/../sets/craft-cms-50.php';
 
+    /**
+     * @var string
+     */
+    public const CRAFT_CMS_60 = __DIR__ . '/../sets/craft-cms-60.php';
+
     /**
      * @var string
      */
diff --git a/tests/set/craftcms60/CraftCMS60Test.php b/tests/set/craftcms60/CraftCMS60Test.php
new file mode 100644
index 0000000..d7ca95b
--- /dev/null
+++ b/tests/set/craftcms60/CraftCMS60Test.php
@@ -0,0 +1,30 @@
+<?php
+
+declare(strict_types=1);
+
+namespace craft\rector\tests\set\craftcms60;
+
+use craft\rector\SetList;
+use Iterator;
+use Rector\Testing\PHPUnit\AbstractRectorTestCase;
+
+final class CraftCMS60Test extends AbstractRectorTestCase
+{
+    /**
+     * @dataProvider provideData()
+     */
+    public function test(string $filePath): void
+    {
+        $this->doTestFile($filePath);
+    }
+
+    public function provideData(): Iterator
+    {
+        return $this->yieldFilesFromDirectory(__DIR__ . '/fixture');
+    }
+
+    public function provideConfigFilePath(): string
+    {
+        return SetList::CRAFT_CMS_60;
+    }
+}
diff --git a/tests/set/craftcms60/fixture/plugin.php.inc b/tests/set/craftcms60/fixture/plugin.php.inc
new file mode 100644
index 0000000..bd4a74b
--- /dev/null
+++ b/tests/set/craftcms60/fixture/plugin.php.inc
@@ -0,0 +1,11 @@
+<?php
+
+public \craft\enums\Edition $minCmsEdition = \craft\enums\Edition::Pro;
+
+?>
+-----
+<?php
+
+public \CraftCms\Cms\Edition $minCmsEdition = CraftCms\Cms\Edition::Pro;
+
+?>