diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
index 4487b85..fa0f657 100644
--- a/.github/workflows/tests.yml
+++ b/.github/workflows/tests.yml
@@ -36,24 +36,14 @@ jobs:
           max_attempts: 5
           command: composer update --prefer-dist --no-interaction --no-progress
 
-      - name: Execute style
-        run: composer run style -- --bail
+      - name: Execute architectural layers static analysis
+        run: composer run deptrac
 
-      - name: Execute static analysis
+      - name: Execute code static analysis
         run: composer run static
 
+      - name: Execute style
+        run: composer run style -- --bail
+
       - name: Execute tests
         run: composer run test
-
-  deptrac:
-
-    runs-on: ubuntu-latest
-
-    steps:
-      - name: Checkout Code
-        uses: actions/checkout@v4
-
-      - name: Run Deptrac
-        uses: docker://smoench/deptrac-action:latest
-        with:
-          args: analyse --report-uncovered --fail-on-uncovered
diff --git a/composer.json b/composer.json
index e0b95a5..353218e 100644
--- a/composer.json
+++ b/composer.json
@@ -29,7 +29,8 @@
     "require-dev": {
         "laravel/pint": "^1.19",
         "phpstan/phpstan": "^2.1",
-        "phpunit/phpunit": "^10.5"
+        "phpunit/phpunit": "^10.5",
+        "qossmic/deptrac": "^2.0"
     },
     "autoload": {
         "psr-4": {
diff --git a/deptrac.yaml b/deptrac.yaml
index 8ce51a8..7b95f4f 100644
--- a/deptrac.yaml
+++ b/deptrac.yaml
@@ -4,33 +4,33 @@ deptrac:
   layers:
     - name: Toolkit
       collectors:
-        - type: className
+        - type: classLike
           value: CloudCreativity\\Modules\\Contracts\\Toolkit\\*
-        - type: className
+        - type: classLike
           value: CloudCreativity\\Modules\\Toolkit\\*
-        - type: className
+        - type: classLike
           value: Ramsey\\Uuid\\*
     - name: Domain
       collectors:
-        - type: className
+        - type: classLike
           value: CloudCreativity\\Modules\\Contracts\\Domain\\*
-        - type: className
+        - type: classLike
           value: CloudCreativity\\Modules\\Domain\\*
     - name: Application
       collectors:
-        - type: className
+        - type: classLike
           value: CloudCreativity\\Modules\\Contracts\\Application\\*
-        - type: className
+        - type: classLike
           value: CloudCreativity\\Modules\\Application\\*
     - name: Infrastructure
       collectors:
-        - type: className
+        - type: classLike
           value: CloudCreativity\\Modules\\Contracts\\Infrastructure\\*
-        - type: className
+        - type: classLike
           value: CloudCreativity\\Modules\\Infrastructure\\*
     - name: PSR Log
       collectors:
-        - type: className
+        - type: classLike
           value: Psr\\Log\\*
   ruleset:
     Toolkit: