diff --git a/.github/workflows/phpunit.yml b/.github/workflows/phpunit.yml
index c0ecd01..741b0ac 100644
--- a/.github/workflows/phpunit.yml
+++ b/.github/workflows/phpunit.yml
@@ -12,24 +12,14 @@ jobs:
     runs-on: ubuntu-latest
 
     strategy:
+      fail-fast: false
       matrix:
-        php: [7.3, 7.4]
-        phpunit: ['default', '~8.5.0', '~8.4.0', '~8.2.0', '~7.0']
-        include:
-        - php: 7.2
-          phpunit: '~7.0'
-        - php: 7.2
-          phpunit: '~8.0'
-        - php: 7.2
-          phpunit: '~8.2.0'
-        - php: 7.2
-          phpunit: '~8.4.0'
-        - php: 7.2
-          phpunit: '~8.5.0'
+        php: [7.3, 7.4, 8.0, 8.1, 8.2]
+        phpunit: ['default', '~9.6.13']
 
     steps:
     - name: Checkout code
-      uses: actions/checkout@v2
+      uses: actions/checkout@v4
 
     - name: Setup PHP ${{ matrix.php }}
       uses: shivammathur/setup-php@v2
@@ -45,7 +35,7 @@ jobs:
 
     - name: Cache Composer packages
       id: composer-cache
-      uses: actions/cache@v2
+      uses: actions/cache@v3
       with:
         path: vendor
         key: ${{ runner.os }}-php-${{ matrix.php }}-${{ hashFiles('composer.json') }}
diff --git a/.gitignore b/.gitignore
index 19bdef3..cc8e973 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,5 @@
 /vendor/
 /tests/.phpunit.result.cache
 composer.lock
+.vscode/settings.json
+.vscode/launch.json
diff --git a/classes/Drivers/MySqliDriver.php b/classes/Drivers/MySqliDriver.php
index d266fc7..a654f20 100644
--- a/classes/Drivers/MySqliDriver.php
+++ b/classes/Drivers/MySqliDriver.php
@@ -82,7 +82,7 @@ public function createResultSet($resultSet)
     /**
      * @return  MySqliResult
      */
-    public function createResultDriver(mysqli_result $result): Drivers\MySqliResult
+    public function createResultDriver(/*mysqli_result*/ $result): Drivers\MySqliResult
     {
         return new MySqliResult($result);
     }
diff --git a/classes/Drivers/PdoDriver.php b/classes/Drivers/PdoDriver.php
index 7bbc2ff..9a89250 100644
--- a/classes/Drivers/PdoDriver.php
+++ b/classes/Drivers/PdoDriver.php
@@ -74,7 +74,7 @@ public function createResultSet($resultSet)
     /**
      * @throws  PdoResult
      */
-    public function createResultDriver(PDOStatement $result): Drivers\PdoResult
+    public function createResultDriver(/*PDOStatement*/ $result): Drivers\PdoResult
     {
         return new PdoResult($result, $this->driverName);
     }
diff --git a/classes/Drivers/SqliteDriver.php b/classes/Drivers/SqliteDriver.php
index b99b440..3da0335 100644
--- a/classes/Drivers/SqliteDriver.php
+++ b/classes/Drivers/SqliteDriver.php
@@ -69,7 +69,7 @@ public function createResultSet($resultSet)
      * @param   NativeSQLiteResult  $result
      * @return  SqliteResult
      */
-    public function createResultDriver(NativeSQLiteResult $result): Drivers\SqliteResult
+    public function createResultDriver(/*NativeSQLiteResult*/ $result): Drivers\SqliteResult
     {
         return new SqliteResult($result);
     }
diff --git a/composer.json b/composer.json
index 4fde0d0..ada2b06 100644
--- a/composer.json
+++ b/composer.json
@@ -1,5 +1,5 @@
 {
-    "name": "czukowski/phpunit-mock-dibi",
+    "name": "tombrain/phpunit-mock-dibi",
     "type": "library",
     "description": "Dibi mocking helpers for PHPUnit",
     "keywords": ["phpunit", "dibi", "database", "mock"],
@@ -11,13 +11,23 @@
             "homepage": "http://xn----0tbl7bn.com"
         }
     ],
+    "repositories": [
+        {
+            "type": "vcs",
+            "url": "https://github.com/tombrain/phpunit-sql.git"
+        },
+        {
+            "type": "vcs",
+            "url": "https://github.com/tombrain/phpunit-mock-db.git"
+        }
+    ],
     "support": {
         "issues": "https://github.com/czukowski/phpunit-mock-dibi/issues"
     },
     "require": {
-        "czukowski/phpunit-mock-db": "^7.0 || >= 8.2",
-        "czukowski/phpunit-sql": "^7.0.2 || ^8.0 || ^9.0",
-        "dibi/dibi": "4.2.x-dev"
+        "tombrain/phpunit-sql": "dev-master",
+        "tombrain/phpunit-mock-db": "dev-master",
+        "dibi/dibi": "^4.2.x-dev"
     },
     "autoload": {
         "psr-4": {