diff --git a/.github/CONTRIBUTING.md b/.github/CONTRIBUTING.md
index c05aedb..534a5d5 100644
--- a/.github/CONTRIBUTING.md
+++ b/.github/CONTRIBUTING.md
@@ -23,8 +23,8 @@ We accept contributions via Pull Requests on [GitHub](https://github.com/stauden
 ## Running Tests & Static Analysis
 
 ```
-docker compose run --rm php8.3 composer install
-docker compose run --rm php8.3 vendor/bin/phpunit
-docker compose run --rm php8.3 vendor/bin/phpstan analyse --memory-limit=-1
-docker compose run --rm php8.3 vendor/bin/phpstan analyse --configuration=phpstan.types.neon.dist --memory-limit=-1
+docker compose run --rm php8.4 composer install
+docker compose run --rm php8.4 vendor/bin/phpunit
+docker compose run --rm php8.4 vendor/bin/phpstan analyse --memory-limit=-1
+docker compose run --rm php8.4 vendor/bin/phpstan analyse --configuration=phpstan.types.neon.dist --memory-limit=-1
 ```
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index f9a65df..d8d9571 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -15,7 +15,7 @@ jobs:
         php: [ 8.4, 8.3, 8.2 ]
         release: [ stable, lowest ]
         include:
-          - php: 8.3
+          - php: 8.4
             release: stable
             coverage: true
 
diff --git a/.github/workflows/static-analysis.yml b/.github/workflows/static-analysis.yml
index 2e0e258..f1af585 100644
--- a/.github/workflows/static-analysis.yml
+++ b/.github/workflows/static-analysis.yml
@@ -12,7 +12,7 @@ jobs:
 
     strategy:
       matrix:
-        php: [ 8.3 ]
+        php: [ 8.4 ]
         release: [ stable ]
 
     steps:
diff --git a/composer.json b/composer.json
index 97070a9..fa9572c 100644
--- a/composer.json
+++ b/composer.json
@@ -18,8 +18,8 @@
     },
     "require-dev": {
         "barryvdh/laravel-ide-helper": "^3.0",
-        "laravel/framework": "^11.0",
         "larastan/larastan": "^3.0",
+        "laravel/framework": "^11.0",
         "mockery/mockery": "^1.5.1",
         "orchestra/testbench-core": "^9.5",
         "phpunit/phpunit": "^11.0"
diff --git a/docker-compose.ci.yml b/docker-compose.ci.yml
index b586723..f25a144 100644
--- a/docker-compose.ci.yml
+++ b/docker-compose.ci.yml
@@ -11,16 +11,16 @@ services:
     volumes:
       - .:/var/www/html:delegated
       - ~/.cache/composer/files:/root/.composer/cache/files
-  php8.3-xdebug:
-    image: ghcr.io/staudenmeir/php:8.3
+  php8.4:
+    image: ghcr.io/staudenmeir/php:8.4
     working_dir: /var/www/html
     volumes:
       - .:/var/www/html:delegated
-      - .docker/xdebug.ci.ini:/usr/local/etc/php/conf.d/docker-php-ext-xdebug.ini
       - ~/.cache/composer/files:/root/.composer/cache/files
-  php8.4:
+  php8.4-xdebug:
     image: ghcr.io/staudenmeir/php:8.4
     working_dir: /var/www/html
     volumes:
       - .:/var/www/html:delegated
+      - .docker/xdebug.ci.ini:/usr/local/etc/php/conf.d/docker-php-ext-xdebug.ini
       - ~/.cache/composer/files:/root/.composer/cache/files
diff --git a/docker-compose.yml b/docker-compose.yml
index 6532ab6..a75622d 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -16,4 +16,4 @@ services:
     working_dir: /var/www/html
     volumes:
       - .:/var/www/html:delegated
-      #- .docker/xdebug.ini:/usr/local/etc/php/conf.d/docker-php-ext-xdebug.ini
+      - .docker/xdebug.ini:/usr/local/etc/php/conf.d/docker-php-ext-xdebug.ini
diff --git a/src/Traits/BelongsToThrough.php b/src/Traits/BelongsToThrough.php
index d6f499b..92b6a19 100644
--- a/src/Traits/BelongsToThrough.php
+++ b/src/Traits/BelongsToThrough.php
@@ -20,8 +20,8 @@ trait BelongsToThrough
      * @param non-empty-list<class-string<\Illuminate\Database\Eloquent\Model>>|non-empty-list<array{0: class-string<\Illuminate\Database\Eloquent\Model>, 1: string}>|class-string<\Illuminate\Database\Eloquent\Model> $through
      * @param string|null $localKey
      * @param string $prefix
-     * @param array<class-string<\Illuminate\Database\Eloquent\Model>, string> $foreignKeyLookup
-     * @param array<class-string<\Illuminate\Database\Eloquent\Model>, string> $localKeyLookup
+     * @param array<int, class-string<\Illuminate\Database\Eloquent\Model>, string> $foreignKeyLookup
+     * @param array<int, class-string<\Illuminate\Database\Eloquent\Model>, string> $localKeyLookup
      * @return \Znck\Eloquent\Relations\BelongsToThrough<TRelatedModel, $this>
      */
     public function belongsToThrough(
@@ -77,7 +77,7 @@ public function belongsToThrough(
     /**
      * Map keys to an associative array where the key is the table name and the value is the key from the lookup.
      *
-     * @param array<class-string<\Illuminate\Database\Eloquent\Model>, string> $keyLookup
+     * @param array<int, class-string<\Illuminate\Database\Eloquent\Model>, string> $keyLookup
      * @return array<string, string>
      */
     protected function mapKeys(array $keyLookup): array