diff --git a/composer.json b/composer.json
index 30e705a03c..3f47b06766 100644
--- a/composer.json
+++ b/composer.json
@@ -33,7 +33,7 @@
     "php": ">=8.2",
     "ext-dom": "*",
     "composer-runtime-api": "^2.2",
-    "chi-teck/drupal-code-generator": "^3.5 || 4.x-dev",
+    "chi-teck/drupal-code-generator": "^3.6 || 4.x-dev",
     "composer/semver": "^1.4 || ^3",
     "consolidation/annotated-command": "^4.9.2",
     "consolidation/config": "^2.1.2 || ^3",
diff --git a/src/Commands/generate/Generators/Drush/drush-command-file.php.twig b/src/Commands/generate/Generators/Drush/drush-command-file.php.twig
index a282e243eb..7737e30b9f 100644
--- a/src/Commands/generate/Generators/Drush/drush-command-file.php.twig
+++ b/src/Commands/generate/Generators/Drush/drush-command-file.php.twig
@@ -3,7 +3,7 @@
 
 namespace Drupal\{{ machine_name }}\Drush\Commands;
 
-{% sort %}
+{% apply sort_namespaces %}
 use Consolidation\OutputFormatters\StructuredData\RowsOfFields;
 use Drush\Attributes as CLI;
 use Drush\Commands\DrushCommands;
@@ -11,7 +11,7 @@ use Drush\Commands\DrushCommands;
 use Drush\Commands\AutowireTrait;
 {{ di.use(services) }}
   {% endif %}
-{% endsort %}
+{% endapply %}
 
 /**
  * A Drush commandfile.