diff --git a/.github/workflows/component.yml b/.github/workflows/component.yml
index cf7da6ff7..da841080d 100644
--- a/.github/workflows/component.yml
+++ b/.github/workflows/component.yml
@@ -14,8 +14,17 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        php-version: ['8.0', '8.1', '8.2', '8.3', '8.4']
+        php-version: ['8.2', '8.3', '8.4']
         component: [Common, Http, Plugin]
+        include:
+          - php-version: '8.0'
+            component: Http
+          - php-version: '8.0'
+            component: Plugin
+          - php-version: '8.1'
+            component: Http
+          - php-version: '8.1'
+            component: Plugin
 
     name: PHP ${{ matrix.php-version }} / ${{ matrix.component }}
 
diff --git a/.github/workflows/php.yml b/.github/workflows/php.yml
index 8e8fec332..f2f3da952 100644
--- a/.github/workflows/php.yml
+++ b/.github/workflows/php.yml
@@ -12,7 +12,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        php-version: ['8.0', '8.1', '8.2', '8.3', '8.4']
+        php-version: ['8.2', '8.3', '8.4']
         deps: ['low', 'high']
     name: PHP ${{ matrix.php-version }} (${{ matrix.deps }})
     steps:
@@ -63,5 +63,5 @@ jobs:
         extensions: curl
     - name: Install dependencies
       run: composer install --no-progress
-    - name: Run PHPStan
+    - name: Run php-cs-fixer
       run: composer run-script cs
diff --git a/composer.json b/composer.json
index 75acbe149..adb807f49 100644
--- a/composer.json
+++ b/composer.json
@@ -17,7 +17,7 @@
     ],
     "homepage": "http://geocoder-php.org",
     "require": {
-        "php": "^8.0",
+        "php": ">=8.2",
         "igorw/get-in": "^1.0",
         "php-http/discovery": "^1.17",
         "php-http/promise": "^1.0",
diff --git a/src/Common/.github/workflows/component.yml b/src/Common/.github/workflows/component.yml
index 92d63bf06..ccc5cc289 100644
--- a/src/Common/.github/workflows/component.yml
+++ b/src/Common/.github/workflows/component.yml
@@ -13,7 +13,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        php-version: ['8.0', '8.1', '8.2', '8.3', '8.4']
+        php-version: ['8.2', '8.3', '8.4']
     steps:
     - uses: actions/checkout@v4
     - name: Use PHP ${{ matrix.php-version }}
diff --git a/src/Common/CHANGELOG.md b/src/Common/CHANGELOG.md
index e060ede27..a9fe24938 100644
--- a/src/Common/CHANGELOG.md
+++ b/src/Common/CHANGELOG.md
@@ -2,6 +2,11 @@
 
 The change log describes what is "Added", "Removed", "Changed" or "Fixed" between each release.
 
+## 5.0.0
+
+- Drop support for PHP < 8.2
+- Added return values on classes and interfaces
+
 ## 4.6.0
 
 ### Removed
diff --git a/src/Common/composer.json b/src/Common/composer.json
index d5d10023f..fd4348f60 100644
--- a/src/Common/composer.json
+++ b/src/Common/composer.json
@@ -17,7 +17,7 @@
         }
     ],
     "require": {
-        "php": "^8.0"
+        "php": ">=8.2"
     },
     "require-dev": {
         "nyholm/nsa": "^1.1",
@@ -29,7 +29,7 @@
     },
     "extra": {
         "branch-alias": {
-            "dev-master": "4.1-dev"
+            "dev-master": "5.1-dev"
         }
     },
     "autoload": {
@@ -49,4 +49,4 @@
             "php-http/discovery": false
         }
     }
-}
\ No newline at end of file
+}
diff --git a/src/Http/composer.json b/src/Http/composer.json
index b3a78447a..982d3834c 100644
--- a/src/Http/composer.json
+++ b/src/Http/composer.json
@@ -18,7 +18,7 @@
         "php-http/discovery": "^1.17",
         "psr/http-client-implementation": "^1.0",
         "psr/http-factory-implementation": "^1.0",
-        "willdurand/geocoder": "^4.0"
+        "willdurand/geocoder": "^4.0|^5.0"
     },
     "require-dev": {
         "nyholm/psr7": "^1.0",
diff --git a/src/Plugin/composer.json b/src/Plugin/composer.json
index 88d7a3a21..70910b2e2 100644
--- a/src/Plugin/composer.json
+++ b/src/Plugin/composer.json
@@ -18,7 +18,7 @@
         "php-http/promise": "^1.0",
         "psr/log": "^1.0|^2.0|^3.0",
         "psr/simple-cache": "^1.0|^2.0|^3.0",
-        "willdurand/geocoder": "^4.0"
+        "willdurand/geocoder": "^4.0|^5.0"
     },
     "require-dev": {
         "cache/void-adapter": "^1.0",