diff --git a/.castor/docker.php b/.castor/docker.php
index 6fffbda..6965b66 100644
--- a/.castor/docker.php
+++ b/.castor/docker.php
@@ -2,8 +2,8 @@
 
 namespace docker;
 
+use Castor\Attribute\AsArgsAfterOptionEnd;
 use Castor\Attribute\AsOption;
-use Castor\Attribute\AsRawTokens;
 use Castor\Attribute\AsTask;
 use Castor\Context;
 use Castor\Helper\PathHelper;
@@ -158,7 +158,7 @@ function stop(
  * @param array<string> $params
  */
 #[AsTask(description: 'Opens a shell (bash) or proxy any command to the builder container', aliases: ['builder'])]
-function builder(#[AsRawTokens] array $params = []): int
+function builder(#[AsArgsAfterOptionEnd] array $params = []): int
 {
     $c = context()->withEnvironment($_ENV + $_SERVER);
 
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index b50942f..8bb2d2b 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -58,7 +58,7 @@ jobs:
             - name: "Run PHPStan"
               run: |
                 # PHPStan need the container to be compiled
-                castor --context=ci builder  bin/console about --env=dev
+                castor --context=ci builder -- bin/console about --env=dev
                 castor qa:phpstan
 
             - name: "Run PHPUnit"