diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index e0cab01e7..ed5ca7b0a 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -16,7 +16,7 @@ jobs:
         timeout-minutes: 15
         strategy:
             matrix:
-                php: [ '8.2', '8.1', '8.0' ]
+                php: [ '8.3', '8.2', '8.1', '8.0' ]
                 dependency-version: [ '' ]
                 platform-reqs: [ '' ]
                 include:
@@ -24,11 +24,14 @@ jobs:
                         dependency-version: '--prefer-lowest'
         steps:
             -   name: Checkout
-                uses: actions/checkout@v2
+                uses: actions/checkout@v3
             # Node is required by some tests
-            -   uses: actions/setup-node@v1
+            -   uses: actions/setup-node@v3
                 with:
-                    node-version: 12
+                    node-version: 18
+            # serverless is required by some tests
+            -   name: Install serverless
+                run: npm i -g serverless
             -   name: Setup PHP
                 uses: shivammathur/setup-php@v2
                 with:
@@ -46,15 +49,15 @@ jobs:
         name: PHPStan
         steps:
             -   name: Checkout
-                uses: actions/checkout@v2
+                uses: actions/checkout@v3
             -   name: Setup PHP
                 uses: shivammathur/setup-php@v2
                 with:
-                    php-version: 8.1
+                    php-version: '8.2'
                     tools: composer:v2, cs2pr
                     coverage: none
             -   name: Cache Composer dependencies
-                uses: actions/cache@v2
+                uses: actions/cache@v3
                 with:
                     path: ~/.composer/cache
                     key: php-composer-locked-${{ hashFiles('composer.lock') }}
@@ -69,15 +72,15 @@ jobs:
         name: PHP CodeSniffer
         steps:
             -   name: Checkout
-                uses: actions/checkout@v2
+                uses: actions/checkout@v3
             -   name: Setup PHP
                 uses: shivammathur/setup-php@v2
                 with:
-                    php-version: 8.1
+                    php-version: '8.2'
                     tools: composer:v2, cs2pr
                     coverage: none
             -   name: Cache Composer dependencies
-                uses: actions/cache@v2
+                uses: actions/cache@v3
                 with:
                     path: ~/.composer/cache
                     key: php-composer-locked-${{ hashFiles('composer.lock') }}
@@ -95,7 +98,7 @@ jobs:
             - uses: actions/setup-node@v3
               with:
                   node-version: 18
-            - uses: actions/cache@v2
+            - uses: actions/cache@v3
               with:
                   path: ~/.npm
                   key: ${{ runner.os }}-node-${{ hashFiles('**/package.json') }}
diff --git a/.github/workflows/update-layer-versions.yml b/.github/workflows/update-layer-versions.yml
index ace094888..8dc3c4b48 100644
--- a/.github/workflows/update-layer-versions.yml
+++ b/.github/workflows/update-layer-versions.yml
@@ -5,13 +5,10 @@ on:
     workflow_dispatch:
         inputs:
             release_url:
-                required: true
                 type: string
             release_html_url:
-                required: true
                 type: string
             release_name:
-                required: true
                 type: string
 
 # Necessary to connect to AWS using OIDC
@@ -32,7 +29,7 @@ jobs:
                     ref: master
 
             -   name: Set AWS credentials
-                uses: aws-actions/configure-aws-credentials@v1
+                uses: aws-actions/configure-aws-credentials@v2
                 with:
                     role-to-assume: arn:aws:iam::534081306603:role/bref-github-actions
                     role-session-name: bref-github-actions
@@ -41,7 +38,7 @@ jobs:
             -   name: Setup PHP
                 uses: shivammathur/setup-php@v2
                 with:
-                    php-version: 8.1
+                    php-version: '8.2'
                     tools: composer
 
             -   name: Install Composer dependencies
@@ -50,7 +47,7 @@ jobs:
             -   run: make layers.json
 
             -   name: Create Pull Request
-                uses: peter-evans/create-pull-request@v4
+                uses: peter-evans/create-pull-request@v5
                 with:
                     commit-message: Update layer versions
                     title: Update Lambda layers [${{ inputs.release_name }}](${{ inputs.release_html_url }})
diff --git a/composer.json b/composer.json
index c5b9cbd52..148a6061d 100644
--- a/composer.json
+++ b/composer.json
@@ -27,10 +27,10 @@
         "hollodotme/fast-cgi-client": "^3.0.1",
         "nyholm/psr7": "^1.4.1",
         "psr/container": "^1.0|^2.0",
-        "psr/http-message": "^1.0",
+        "psr/http-message": "^1.0|^2.0",
         "psr/http-server-handler": "^1.0",
         "riverline/multipart-parser": "^2.0.6",
-        "symfony/process": "^4.4|^5.0|^6.0"
+        "symfony/process": "^4.4|^5.0|^6.0|^7.0"
     },
     "require-dev": {
         "async-aws/core": "^1.0",
@@ -40,9 +40,10 @@
         "dms/phpunit-arraysubset-asserts": "^0.4",
         "doctrine/coding-standard": "^8.0",
         "guzzlehttp/guzzle": "^7.5",
-        "phpstan/phpstan": "^1.0",
-        "phpunit/phpunit": "^9.0",
-        "symfony/console": "^4.4|^5.0|^6.0"
+        "phpstan/phpstan": "^1.10.26",
+        "phpunit/phpunit": "^9.6.10",
+        "symfony/console": "^4.4|^5.0|^6.0|^7.0",
+        "symfony/yaml": "^4.4|^5.0|^6.0|^7.0"
     },
     "scripts": {
         "test": [
diff --git a/index.js b/index.js
index b60582236..c4ee46b8f 100644
--- a/index.js
+++ b/index.js
@@ -47,7 +47,7 @@ class ServerlessPlugin {
             .filter(name => !name.startsWith('arm-'));
         // Console runtimes must have a PHP version provided
         this.runtimes = this.runtimes.filter(name => name !== 'console');
-        this.runtimes.push('php-80-console', 'php-81-console', 'php-82-console');
+        this.runtimes.push('php-80-console', 'php-81-console', 'php-82-console', 'php-83-console');
 
         this.checkCompatibleRuntime();
 
@@ -197,23 +197,27 @@ class ServerlessPlugin {
 
         const config = this.serverless.service;
         const isArmGlobally = config.provider.architecture === 'arm64';
-
-        // Check provider config
-        if (this.runtimes.includes(config.provider.runtime || '')) {
-            config.provider.layers = includeBrefLayers(
-                config.provider.runtime,
-                config.provider.layers || [], // make sure it's an array
-                isArmGlobally,
-            );
-            config.provider.runtime = 'provided.al2';
-        }
+        const isBrefRuntimeGlobally = this.runtimes.includes(config.provider.runtime || '');
 
         // Check functions config
         for (const f of Object.values(config.functions || {})) {
-            if (f.runtime && this.runtimes.includes(f.runtime)) {
+            if (
+              (f.runtime && this.runtimes.includes(f.runtime)) ||
+              (!f.runtime && isBrefRuntimeGlobally)
+            ) {
+                // The logic here is a bit custom:
+                // If there are layers on the function, we preserve them
+                let existingLayers = f.layers || []; // make sure it's an array
+                // Else, we merge with the layers defined at the root.
+                // Indeed, SF overrides the layers defined at the root with the ones defined on the function.
+                if (existingLayers.length === 0) {
+                    // for some reason it's not always an array
+                    existingLayers = Array.from(config.provider.layers || []);
+                }
+
                 f.layers = includeBrefLayers(
-                    f.runtime,
-                    f.layers || [], // make sure it's an array
+                    f.runtime || config.provider.runtime,
+                    existingLayers,
                     f.architecture === 'arm64' || (isArmGlobally && !f.architecture),
                 );
                 f.runtime = 'provided.al2';
@@ -224,9 +228,9 @@ class ServerlessPlugin {
         for (const construct of Object.values(this.serverless.configurationInput.constructs || {})) {
             if (construct.type !== 'queue' && construct.type !== 'webhook') continue;
             const f = construct.type === 'queue' ? construct.worker : construct.authorizer;
-            if (f && f.runtime && this.runtimes.includes(f.runtime)) {
+            if (f && (f.runtime && this.runtimes.includes(f.runtime) || !f.runtime && isBrefRuntimeGlobally) ) {
                 f.layers = includeBrefLayers(
-                    f.runtime,
+                    f.runtime || config.provider.runtime,
                     f.layers || [], // make sure it's an array
                     f.architecture === 'arm64' || (isArmGlobally && !f.architecture),
                 );
diff --git a/layers.json b/layers.json
index a8ffce5b9..54472726d 100644
--- a/layers.json
+++ b/layers.json
@@ -1,314 +1,410 @@
 {
+    "php-83": {
+        "ca-central-1": "4",
+        "eu-central-1": "4",
+        "eu-north-1": "4",
+        "eu-west-1": "4",
+        "eu-west-2": "4",
+        "eu-west-3": "4",
+        "sa-east-1": "4",
+        "us-east-1": "4",
+        "us-east-2": "4",
+        "us-west-1": "4",
+        "us-west-2": "4",
+        "ap-east-1": "4",
+        "ap-south-1": "4",
+        "ap-northeast-1": "4",
+        "ap-northeast-2": "4",
+        "ap-northeast-3": "4",
+        "ap-southeast-1": "4",
+        "ap-southeast-2": "4",
+        "eu-south-1": "4",
+        "eu-south-2": "4",
+        "af-south-1": "4",
+        "me-south-1": "4"
+    },
+    "php-83-fpm": {
+        "ca-central-1": "4",
+        "eu-central-1": "4",
+        "eu-north-1": "4",
+        "eu-west-1": "4",
+        "eu-west-2": "4",
+        "eu-west-3": "4",
+        "sa-east-1": "4",
+        "us-east-1": "4",
+        "us-east-2": "4",
+        "us-west-1": "4",
+        "us-west-2": "4",
+        "ap-east-1": "4",
+        "ap-south-1": "4",
+        "ap-northeast-1": "4",
+        "ap-northeast-2": "4",
+        "ap-northeast-3": "4",
+        "ap-southeast-1": "4",
+        "ap-southeast-2": "4",
+        "eu-south-1": "4",
+        "eu-south-2": "4",
+        "af-south-1": "4",
+        "me-south-1": "4"
+    },
     "php-82": {
-        "ca-central-1": "42",
-        "eu-central-1": "42",
-        "eu-north-1": "42",
-        "eu-west-1": "42",
-        "eu-west-2": "42",
-        "eu-west-3": "42",
-        "sa-east-1": "42",
-        "us-east-1": "42",
-        "us-east-2": "42",
-        "us-west-1": "42",
-        "us-west-2": "42",
-        "ap-east-1": "42",
-        "ap-south-1": "42",
-        "ap-northeast-1": "42",
-        "ap-northeast-2": "42",
-        "ap-northeast-3": "42",
-        "ap-southeast-1": "42",
-        "ap-southeast-2": "42",
-        "eu-south-1": "42",
-        "eu-south-2": "41",
-        "af-south-1": "42",
-        "me-south-1": "42"
+        "ca-central-1": "48",
+        "eu-central-1": "48",
+        "eu-north-1": "48",
+        "eu-west-1": "48",
+        "eu-west-2": "48",
+        "eu-west-3": "48",
+        "sa-east-1": "48",
+        "us-east-1": "48",
+        "us-east-2": "48",
+        "us-west-1": "48",
+        "us-west-2": "48",
+        "ap-east-1": "48",
+        "ap-south-1": "48",
+        "ap-northeast-1": "48",
+        "ap-northeast-2": "48",
+        "ap-northeast-3": "48",
+        "ap-southeast-1": "48",
+        "ap-southeast-2": "48",
+        "eu-south-1": "48",
+        "eu-south-2": "47",
+        "af-south-1": "48",
+        "me-south-1": "48"
     },
     "php-82-fpm": {
-        "ca-central-1": "42",
-        "eu-central-1": "42",
-        "eu-north-1": "42",
-        "eu-west-1": "42",
-        "eu-west-2": "42",
-        "eu-west-3": "42",
-        "sa-east-1": "42",
-        "us-east-1": "42",
-        "us-east-2": "42",
-        "us-west-1": "42",
-        "us-west-2": "42",
-        "ap-east-1": "42",
-        "ap-south-1": "42",
-        "ap-northeast-1": "42",
-        "ap-northeast-2": "42",
-        "ap-northeast-3": "42",
-        "ap-southeast-1": "42",
-        "ap-southeast-2": "42",
-        "eu-south-1": "42",
-        "eu-south-2": "41",
-        "af-south-1": "42",
-        "me-south-1": "42"
+        "ca-central-1": "48",
+        "eu-central-1": "48",
+        "eu-north-1": "48",
+        "eu-west-1": "48",
+        "eu-west-2": "48",
+        "eu-west-3": "48",
+        "sa-east-1": "48",
+        "us-east-1": "48",
+        "us-east-2": "48",
+        "us-west-1": "48",
+        "us-west-2": "48",
+        "ap-east-1": "48",
+        "ap-south-1": "48",
+        "ap-northeast-1": "48",
+        "ap-northeast-2": "48",
+        "ap-northeast-3": "48",
+        "ap-southeast-1": "48",
+        "ap-southeast-2": "48",
+        "eu-south-1": "48",
+        "eu-south-2": "47",
+        "af-south-1": "48",
+        "me-south-1": "48"
     },
     "php-81": {
-        "ca-central-1": "53",
-        "eu-central-1": "53",
-        "eu-north-1": "53",
-        "eu-west-1": "53",
-        "eu-west-2": "53",
-        "eu-west-3": "53",
-        "sa-east-1": "53",
-        "us-east-1": "53",
-        "us-east-2": "53",
-        "us-west-1": "53",
-        "us-west-2": "53",
-        "ap-east-1": "45",
-        "ap-south-1": "52",
-        "ap-northeast-1": "52",
-        "ap-northeast-2": "52",
-        "ap-northeast-3": "52",
-        "ap-southeast-1": "52",
-        "ap-southeast-2": "52",
-        "eu-south-1": "45",
-        "eu-south-2": "42",
-        "af-south-1": "45",
-        "me-south-1": "45"
+        "ca-central-1": "59",
+        "eu-central-1": "59",
+        "eu-north-1": "59",
+        "eu-west-1": "59",
+        "eu-west-2": "59",
+        "eu-west-3": "59",
+        "sa-east-1": "59",
+        "us-east-1": "59",
+        "us-east-2": "59",
+        "us-west-1": "59",
+        "us-west-2": "59",
+        "ap-east-1": "51",
+        "ap-south-1": "58",
+        "ap-northeast-1": "58",
+        "ap-northeast-2": "58",
+        "ap-northeast-3": "58",
+        "ap-southeast-1": "58",
+        "ap-southeast-2": "58",
+        "eu-south-1": "51",
+        "eu-south-2": "48",
+        "af-south-1": "51",
+        "me-south-1": "51"
     },
     "php-81-fpm": {
-        "ca-central-1": "52",
-        "eu-central-1": "52",
-        "eu-north-1": "53",
-        "eu-west-1": "53",
-        "eu-west-2": "52",
-        "eu-west-3": "52",
-        "sa-east-1": "52",
-        "us-east-1": "53",
-        "us-east-2": "52",
-        "us-west-1": "52",
-        "us-west-2": "53",
-        "ap-east-1": "45",
-        "ap-south-1": "51",
-        "ap-northeast-1": "52",
-        "ap-northeast-2": "51",
-        "ap-northeast-3": "51",
-        "ap-southeast-1": "51",
-        "ap-southeast-2": "51",
-        "eu-south-1": "44",
-        "eu-south-2": "41",
-        "af-south-1": "44",
-        "me-south-1": "44"
+        "ca-central-1": "58",
+        "eu-central-1": "58",
+        "eu-north-1": "59",
+        "eu-west-1": "59",
+        "eu-west-2": "58",
+        "eu-west-3": "58",
+        "sa-east-1": "58",
+        "us-east-1": "59",
+        "us-east-2": "58",
+        "us-west-1": "58",
+        "us-west-2": "59",
+        "ap-east-1": "51",
+        "ap-south-1": "57",
+        "ap-northeast-1": "58",
+        "ap-northeast-2": "57",
+        "ap-northeast-3": "57",
+        "ap-southeast-1": "57",
+        "ap-southeast-2": "57",
+        "eu-south-1": "50",
+        "eu-south-2": "47",
+        "af-south-1": "50",
+        "me-south-1": "50"
     },
     "php-80": {
-        "ca-central-1": "56",
-        "eu-central-1": "55",
-        "eu-north-1": "56",
-        "eu-west-1": "56",
-        "eu-west-2": "56",
-        "eu-west-3": "56",
-        "sa-east-1": "56",
-        "us-east-1": "56",
-        "us-east-2": "56",
-        "us-west-1": "56",
-        "us-west-2": "56",
-        "ap-east-1": "46",
-        "ap-south-1": "55",
-        "ap-northeast-1": "53",
-        "ap-northeast-2": "52",
-        "ap-northeast-3": "53",
-        "ap-southeast-1": "52",
-        "ap-southeast-2": "54",
-        "eu-south-1": "46",
-        "eu-south-2": "42",
-        "af-south-1": "46",
-        "me-south-1": "46"
+        "ca-central-1": "62",
+        "eu-central-1": "61",
+        "eu-north-1": "62",
+        "eu-west-1": "62",
+        "eu-west-2": "62",
+        "eu-west-3": "62",
+        "sa-east-1": "62",
+        "us-east-1": "62",
+        "us-east-2": "62",
+        "us-west-1": "62",
+        "us-west-2": "62",
+        "ap-east-1": "52",
+        "ap-south-1": "61",
+        "ap-northeast-1": "59",
+        "ap-northeast-2": "58",
+        "ap-northeast-3": "59",
+        "ap-southeast-1": "58",
+        "ap-southeast-2": "60",
+        "eu-south-1": "52",
+        "eu-south-2": "48",
+        "af-south-1": "52",
+        "me-south-1": "52"
     },
     "php-80-fpm": {
-        "ca-central-1": "53",
-        "eu-central-1": "53",
-        "eu-north-1": "53",
-        "eu-west-1": "53",
-        "eu-west-2": "53",
-        "eu-west-3": "53",
-        "sa-east-1": "53",
-        "us-east-1": "53",
-        "us-east-2": "53",
-        "us-west-1": "53",
-        "us-west-2": "53",
-        "ap-east-1": "45",
-        "ap-south-1": "52",
-        "ap-northeast-1": "52",
-        "ap-northeast-2": "52",
-        "ap-northeast-3": "52",
-        "ap-southeast-1": "52",
-        "ap-southeast-2": "52",
-        "eu-south-1": "45",
-        "eu-south-2": "42",
-        "af-south-1": "45",
-        "me-south-1": "45"
+        "ca-central-1": "59",
+        "eu-central-1": "59",
+        "eu-north-1": "59",
+        "eu-west-1": "59",
+        "eu-west-2": "59",
+        "eu-west-3": "59",
+        "sa-east-1": "59",
+        "us-east-1": "59",
+        "us-east-2": "59",
+        "us-west-1": "59",
+        "us-west-2": "59",
+        "ap-east-1": "51",
+        "ap-south-1": "58",
+        "ap-northeast-1": "58",
+        "ap-northeast-2": "58",
+        "ap-northeast-3": "58",
+        "ap-southeast-1": "58",
+        "ap-southeast-2": "58",
+        "eu-south-1": "51",
+        "eu-south-2": "48",
+        "af-south-1": "51",
+        "me-south-1": "51"
+    },
+    "arm-php-83": {
+        "ca-central-1": "4",
+        "eu-central-1": "4",
+        "eu-north-1": "4",
+        "eu-west-1": "4",
+        "eu-west-2": "4",
+        "eu-west-3": "4",
+        "sa-east-1": "4",
+        "us-east-1": "4",
+        "us-east-2": "4",
+        "us-west-1": "4",
+        "us-west-2": "4",
+        "ap-east-1": "4",
+        "ap-south-1": "4",
+        "ap-northeast-1": "4",
+        "ap-northeast-2": "4",
+        "ap-northeast-3": "4",
+        "ap-southeast-1": "4",
+        "ap-southeast-2": "4",
+        "eu-south-1": "4",
+        "eu-south-2": "4",
+        "af-south-1": "4",
+        "me-south-1": "4"
+    },
+    "arm-php-83-fpm": {
+        "ca-central-1": "4",
+        "eu-central-1": "4",
+        "eu-north-1": "4",
+        "eu-west-1": "4",
+        "eu-west-2": "4",
+        "eu-west-3": "4",
+        "sa-east-1": "4",
+        "us-east-1": "4",
+        "us-east-2": "4",
+        "us-west-1": "4",
+        "us-west-2": "4",
+        "ap-east-1": "4",
+        "ap-south-1": "4",
+        "ap-northeast-1": "4",
+        "ap-northeast-2": "4",
+        "ap-northeast-3": "4",
+        "ap-southeast-1": "4",
+        "ap-southeast-2": "4",
+        "eu-south-1": "4",
+        "eu-south-2": "4",
+        "af-south-1": "4",
+        "me-south-1": "4"
     },
     "arm-php-82": {
-        "ca-central-1": "30",
-        "eu-central-1": "30",
-        "eu-north-1": "30",
-        "eu-west-1": "30",
-        "eu-west-2": "30",
-        "eu-west-3": "30",
-        "sa-east-1": "30",
-        "us-east-1": "30",
-        "us-east-2": "30",
-        "us-west-1": "30",
-        "us-west-2": "30",
-        "ap-east-1": "30",
-        "ap-south-1": "30",
-        "ap-northeast-1": "30",
-        "ap-northeast-2": "30",
-        "ap-northeast-3": "30",
-        "ap-southeast-1": "30",
-        "ap-southeast-2": "30",
-        "eu-south-1": "30",
-        "eu-south-2": "30",
-        "af-south-1": "30",
-        "me-south-1": "30"
+        "ca-central-1": "36",
+        "eu-central-1": "36",
+        "eu-north-1": "36",
+        "eu-west-1": "36",
+        "eu-west-2": "36",
+        "eu-west-3": "36",
+        "sa-east-1": "36",
+        "us-east-1": "36",
+        "us-east-2": "36",
+        "us-west-1": "36",
+        "us-west-2": "36",
+        "ap-east-1": "36",
+        "ap-south-1": "36",
+        "ap-northeast-1": "36",
+        "ap-northeast-2": "36",
+        "ap-northeast-3": "36",
+        "ap-southeast-1": "36",
+        "ap-southeast-2": "36",
+        "eu-south-1": "36",
+        "eu-south-2": "36",
+        "af-south-1": "36",
+        "me-south-1": "36"
     },
     "arm-php-82-fpm": {
-        "ca-central-1": "30",
-        "eu-central-1": "30",
-        "eu-north-1": "30",
-        "eu-west-1": "30",
-        "eu-west-2": "30",
-        "eu-west-3": "30",
-        "sa-east-1": "30",
-        "us-east-1": "30",
-        "us-east-2": "30",
-        "us-west-1": "30",
-        "us-west-2": "30",
-        "ap-east-1": "30",
-        "ap-south-1": "30",
-        "ap-northeast-1": "30",
-        "ap-northeast-2": "30",
-        "ap-northeast-3": "30",
-        "ap-southeast-1": "30",
-        "ap-southeast-2": "30",
-        "eu-south-1": "30",
-        "eu-south-2": "30",
-        "af-south-1": "30",
-        "me-south-1": "30"
+        "ca-central-1": "36",
+        "eu-central-1": "36",
+        "eu-north-1": "36",
+        "eu-west-1": "36",
+        "eu-west-2": "36",
+        "eu-west-3": "36",
+        "sa-east-1": "36",
+        "us-east-1": "36",
+        "us-east-2": "36",
+        "us-west-1": "36",
+        "us-west-2": "36",
+        "ap-east-1": "36",
+        "ap-south-1": "36",
+        "ap-northeast-1": "36",
+        "ap-northeast-2": "36",
+        "ap-northeast-3": "36",
+        "ap-southeast-1": "36",
+        "ap-southeast-2": "36",
+        "eu-south-1": "36",
+        "eu-south-2": "36",
+        "af-south-1": "36",
+        "me-south-1": "36"
     },
     "arm-php-81": {
-        "ca-central-1": "33",
-        "eu-central-1": "33",
-        "eu-north-1": "33",
-        "eu-west-1": "33",
-        "eu-west-2": "33",
-        "eu-west-3": "33",
-        "sa-east-1": "33",
-        "us-east-1": "33",
-        "us-east-2": "33",
-        "us-west-1": "33",
-        "us-west-2": "33",
-        "ap-east-1": "33",
-        "ap-south-1": "33",
-        "ap-northeast-1": "33",
-        "ap-northeast-2": "33",
-        "ap-northeast-3": "33",
-        "ap-southeast-1": "33",
-        "ap-southeast-2": "33",
-        "eu-south-1": "33",
-        "eu-south-2": "33",
-        "af-south-1": "33",
-        "me-south-1": "33"
+        "ca-central-1": "39",
+        "eu-central-1": "39",
+        "eu-north-1": "39",
+        "eu-west-1": "39",
+        "eu-west-2": "39",
+        "eu-west-3": "39",
+        "sa-east-1": "39",
+        "us-east-1": "39",
+        "us-east-2": "39",
+        "us-west-1": "39",
+        "us-west-2": "39",
+        "ap-east-1": "39",
+        "ap-south-1": "39",
+        "ap-northeast-1": "39",
+        "ap-northeast-2": "39",
+        "ap-northeast-3": "39",
+        "ap-southeast-1": "39",
+        "ap-southeast-2": "39",
+        "eu-south-1": "39",
+        "eu-south-2": "39",
+        "af-south-1": "39",
+        "me-south-1": "39"
     },
     "arm-php-81-fpm": {
-        "ca-central-1": "33",
-        "eu-central-1": "33",
-        "eu-north-1": "33",
-        "eu-west-1": "33",
-        "eu-west-2": "33",
-        "eu-west-3": "33",
-        "sa-east-1": "33",
-        "us-east-1": "33",
-        "us-east-2": "33",
-        "us-west-1": "33",
-        "us-west-2": "33",
-        "ap-east-1": "33",
-        "ap-south-1": "33",
-        "ap-northeast-1": "33",
-        "ap-northeast-2": "33",
-        "ap-northeast-3": "33",
-        "ap-southeast-1": "33",
-        "ap-southeast-2": "33",
-        "eu-south-1": "33",
-        "eu-south-2": "33",
-        "af-south-1": "33",
-        "me-south-1": "33"
+        "ca-central-1": "39",
+        "eu-central-1": "39",
+        "eu-north-1": "39",
+        "eu-west-1": "39",
+        "eu-west-2": "39",
+        "eu-west-3": "39",
+        "sa-east-1": "39",
+        "us-east-1": "39",
+        "us-east-2": "39",
+        "us-west-1": "39",
+        "us-west-2": "39",
+        "ap-east-1": "39",
+        "ap-south-1": "39",
+        "ap-northeast-1": "39",
+        "ap-northeast-2": "39",
+        "ap-northeast-3": "39",
+        "ap-southeast-1": "39",
+        "ap-southeast-2": "39",
+        "eu-south-1": "39",
+        "eu-south-2": "39",
+        "af-south-1": "39",
+        "me-south-1": "39"
     },
     "arm-php-80": {
-        "ca-central-1": "55",
-        "eu-central-1": "54",
-        "eu-north-1": "55",
-        "eu-west-1": "55",
-        "eu-west-2": "55",
-        "eu-west-3": "55",
-        "sa-east-1": "55",
-        "us-east-1": "55",
-        "us-east-2": "55",
-        "us-west-1": "55",
-        "us-west-2": "55",
-        "ap-east-1": "47",
-        "ap-south-1": "54",
-        "ap-northeast-1": "54",
-        "ap-northeast-2": "54",
-        "ap-northeast-3": "54",
-        "ap-southeast-1": "54",
-        "ap-southeast-2": "54",
-        "eu-south-1": "47",
-        "eu-south-2": "43",
-        "af-south-1": "47",
-        "me-south-1": "47"
+        "ca-central-1": "61",
+        "eu-central-1": "60",
+        "eu-north-1": "61",
+        "eu-west-1": "61",
+        "eu-west-2": "61",
+        "eu-west-3": "61",
+        "sa-east-1": "61",
+        "us-east-1": "61",
+        "us-east-2": "61",
+        "us-west-1": "61",
+        "us-west-2": "61",
+        "ap-east-1": "53",
+        "ap-south-1": "60",
+        "ap-northeast-1": "60",
+        "ap-northeast-2": "60",
+        "ap-northeast-3": "60",
+        "ap-southeast-1": "60",
+        "ap-southeast-2": "60",
+        "eu-south-1": "53",
+        "eu-south-2": "49",
+        "af-south-1": "53",
+        "me-south-1": "53"
     },
     "arm-php-80-fpm": {
-        "ca-central-1": "54",
-        "eu-central-1": "53",
-        "eu-north-1": "54",
-        "eu-west-1": "54",
-        "eu-west-2": "53",
-        "eu-west-3": "53",
-        "sa-east-1": "53",
-        "us-east-1": "54",
-        "us-east-2": "54",
-        "us-west-1": "53",
-        "us-west-2": "54",
-        "ap-east-1": "46",
-        "ap-south-1": "52",
-        "ap-northeast-1": "53",
-        "ap-northeast-2": "52",
-        "ap-northeast-3": "52",
-        "ap-southeast-1": "52",
-        "ap-southeast-2": "52",
-        "eu-south-1": "45",
-        "eu-south-2": "42",
-        "af-south-1": "46",
-        "me-south-1": "45"
+        "ca-central-1": "60",
+        "eu-central-1": "59",
+        "eu-north-1": "60",
+        "eu-west-1": "60",
+        "eu-west-2": "59",
+        "eu-west-3": "59",
+        "sa-east-1": "59",
+        "us-east-1": "60",
+        "us-east-2": "60",
+        "us-west-1": "59",
+        "us-west-2": "60",
+        "ap-east-1": "52",
+        "ap-south-1": "58",
+        "ap-northeast-1": "59",
+        "ap-northeast-2": "58",
+        "ap-northeast-3": "58",
+        "ap-southeast-1": "58",
+        "ap-southeast-2": "58",
+        "eu-south-1": "51",
+        "eu-south-2": "48",
+        "af-south-1": "52",
+        "me-south-1": "51"
     },
     "console": {
-        "ca-central-1": "52",
-        "eu-central-1": "52",
-        "eu-north-1": "52",
-        "eu-west-1": "52",
-        "eu-west-2": "52",
-        "eu-west-3": "52",
-        "sa-east-1": "52",
-        "us-east-1": "52",
-        "us-east-2": "52",
-        "us-west-1": "52",
-        "us-west-2": "52",
-        "ap-east-1": "44",
-        "ap-south-1": "51",
-        "ap-northeast-1": "51",
-        "ap-northeast-2": "51",
-        "ap-northeast-3": "51",
-        "ap-southeast-1": "51",
-        "ap-southeast-2": "51",
-        "eu-south-1": "44",
-        "eu-south-2": "41",
-        "af-south-1": "44",
-        "me-south-1": "44"
+        "ca-central-1": "58",
+        "eu-central-1": "58",
+        "eu-north-1": "58",
+        "eu-west-1": "58",
+        "eu-west-2": "58",
+        "eu-west-3": "58",
+        "sa-east-1": "58",
+        "us-east-1": "58",
+        "us-east-2": "58",
+        "us-west-1": "58",
+        "us-west-2": "58",
+        "ap-east-1": "50",
+        "ap-south-1": "57",
+        "ap-northeast-1": "57",
+        "ap-northeast-2": "57",
+        "ap-northeast-3": "57",
+        "ap-southeast-1": "57",
+        "ap-southeast-2": "57",
+        "eu-south-1": "50",
+        "eu-south-2": "47",
+        "af-south-1": "50",
+        "me-south-1": "50"
     }
 }
\ No newline at end of file
diff --git a/phpunit.xml b/phpunit.xml
index 6fd8c028a..f8a3f2026 100644
--- a/phpunit.xml
+++ b/phpunit.xml
@@ -15,4 +15,7 @@
       <directory>./tests/Sam</directory>
     </testsuite>
   </testsuites>
+  <php>
+    <env name="AWS_REGION" value="eu-west-1" force="true" />
+  </php>
 </phpunit>
diff --git a/serverless.yml b/serverless.yml
index 32e235968..43244fa3d 100644
--- a/serverless.yml
+++ b/serverless.yml
@@ -25,14 +25,14 @@ package:
 functions:
     function:
         handler: demo/function.php
-        runtime: php-81
+        runtime: php-83
         description: 'Bref function demo'
         environment:
             BREF_LOOP_MAX: 100
 
     http:
         handler: demo/http.php
-        runtime: php-81-fpm
+        runtime: php-83-fpm
         architecture: arm64
         description: 'Bref HTTP demo'
         timeout: 5 # in seconds (API Gateway has a timeout of 29 seconds)
@@ -41,7 +41,7 @@ functions:
 
     psr7:
         handler: demo/psr7.php
-        runtime: php-81
+        runtime: php-83
         description: 'Bref HTTP demo with a PSR-7 handler'
         timeout: 5 # in seconds (API Gateway has a timeout of 29 seconds)
         events:
@@ -52,7 +52,7 @@ functions:
 
     http-api:
         handler: demo/http.php
-        runtime: php-81-fpm
+        runtime: php-83-fpm
         description: 'Bref HTTP demo'
         timeout: 5 # in seconds (API Gateway has a timeout of 29 seconds)
         events:
@@ -60,6 +60,6 @@ functions:
 
     console:
         handler: demo/console.php
-        runtime: php-81-console
+        runtime: php-83-console
         description: 'Bref console command demo'
         timeout: 5
diff --git a/src/ConsoleRuntime/Main.php b/src/ConsoleRuntime/Main.php
index d42435b55..b5c3bbeeb 100755
--- a/src/ConsoleRuntime/Main.php
+++ b/src/ConsoleRuntime/Main.php
@@ -25,7 +25,7 @@ public static function run(): void
         $appRoot = getenv('LAMBDA_TASK_ROOT');
         $handlerFile = $appRoot . '/' . getenv('_HANDLER');
         if (! is_file($handlerFile)) {
-            $lambdaRuntime->failInitialization("Handler `$handlerFile` doesn't exist");
+            $lambdaRuntime->failInitialization("Handler `$handlerFile` doesn't exist", 'Runtime.NoSuchHandler');
         }
 
         /** @phpstan-ignore-next-line */
diff --git a/src/Event/ApiGateway/WebsocketEvent.php b/src/Event/ApiGateway/WebsocketEvent.php
index 55c62cea3..3e0c13b6b 100644
--- a/src/Event/ApiGateway/WebsocketEvent.php
+++ b/src/Event/ApiGateway/WebsocketEvent.php
@@ -105,7 +105,6 @@ public function getStage(): string
 
     public function getRegion(): string
     {
-        [, , $region] = explode('.', $this->getDomainName(), 4);
-        return $region;
+        return getenv('AWS_REGION');
     }
 }
diff --git a/src/FpmRuntime/Main.php b/src/FpmRuntime/Main.php
index 6c8aa842b..d3241b5d1 100755
--- a/src/FpmRuntime/Main.php
+++ b/src/FpmRuntime/Main.php
@@ -5,6 +5,7 @@
 use Bref\Bref;
 use Bref\LazySecretsLoader;
 use Bref\Runtime\LambdaRuntime;
+use RuntimeException;
 use Throwable;
 
 /**
@@ -27,14 +28,14 @@ public static function run(): void
         $appRoot = getenv('LAMBDA_TASK_ROOT');
         $handlerFile = $appRoot . '/' . getenv('_HANDLER');
         if (! is_file($handlerFile)) {
-            $lambdaRuntime->failInitialization("Handler `$handlerFile` doesn't exist");
+            $lambdaRuntime->failInitialization("Handler `$handlerFile` doesn't exist", 'Runtime.NoSuchHandler');
         }
 
         $phpFpm = new FpmHandler($handlerFile);
         try {
             $phpFpm->start();
         } catch (Throwable $e) {
-            $lambdaRuntime->failInitialization('Error while starting PHP-FPM', $e);
+            $lambdaRuntime->failInitialization(new RuntimeException('Error while starting PHP-FPM: ' . $e->getMessage(), 0, $e));
         }
 
         /** @phpstan-ignore-next-line */
diff --git a/src/FunctionRuntime/Main.php b/src/FunctionRuntime/Main.php
index c4843eda4..f6925ca06 100644
--- a/src/FunctionRuntime/Main.php
+++ b/src/FunctionRuntime/Main.php
@@ -25,7 +25,7 @@ public static function run(): void
         try {
             $handler = $container->get(getenv('_HANDLER'));
         } catch (Throwable $e) {
-            $lambdaRuntime->failInitialization($e->getMessage());
+            $lambdaRuntime->failInitialization($e, 'Runtime.NoSuchHandler');
         }
 
         $loopMax = getenv('BREF_LOOP_MAX') ?: 1;
diff --git a/src/Runtime/LambdaRuntime.php b/src/Runtime/LambdaRuntime.php
index 6fbadb316..0b4014c4c 100755
--- a/src/Runtime/LambdaRuntime.php
+++ b/src/Runtime/LambdaRuntime.php
@@ -239,42 +239,57 @@ private function signalFailure(string $invocationId, Throwable $error): void
      *
      * @see https://docs.aws.amazon.com/lambda/latest/dg/runtimes-api.html#runtimes-api-initerror
      *
+     * @phpstan-param 'Runtime.NoSuchHandler'|'Runtime.UnknownReason' $lambdaInitializationReason
      * @phpstan-return never-returns
      */
-    public function failInitialization(string $message, ?Throwable $error = null): void
-    {
+    public function failInitialization(
+        string|Throwable $error,
+        string $lambdaInitializationReason = 'Runtime.UnknownReason',
+    ): void {
         // Log the exception in CloudWatch
-        echo "$message\n";
-        if ($error) {
-            if ($error instanceof Exception) {
-                $errorMessage = get_class($error) . ': ' . $error->getMessage();
-            } else {
-                $errorMessage = $error->getMessage();
-            }
+        if ($error instanceof Throwable) {
+            $traceAsArray = explode(PHP_EOL, $error->getTraceAsString());
+            $data = [
+                'errorMessage' => $error->getMessage(),
+                'errorType' => get_class($error),
+                'stackTrace' => $traceAsArray,
+            ];
             printf(
-                "Fatal error: %s in %s:%d\nStack trace:\n%s",
-                $errorMessage,
+                "Fatal error: %s in %s:%d\n %s\n",
+                get_class($error) . ': ' . $error->getMessage(),
                 $error->getFile(),
                 $error->getLine(),
-                $error->getTraceAsString()
+                json_encode([
+                    'message' => $error->getMessage(),
+                    'type' => get_class($error),
+                    'stackTrace' => $traceAsArray,
+                ], JSON_THROW_ON_ERROR),
             );
+        } else {
+            $data = [
+                'errorMessage' => $error,
+                'errorType' => 'Internal',
+                'stackTrace' => [],
+            ];
+            echo "Fatal error: $error\n";
         }
 
+        echo "The function failed to start. AWS Lambda will restart the process, do not be surprised if you see the error message twice.\n";
+
         $url = "http://$this->apiUrl/2018-06-01/runtime/init/error";
-        $this->postJson($url, [
-            'errorMessage' => $message . ' ' . ($error ? $error->getMessage() : ''),
-            'errorType' => $error ? get_class($error) : 'Internal',
-            'stackTrace' => $error ? explode(PHP_EOL, $error->getTraceAsString()) : [],
+        $this->postJson($url, $data, [
+            "Lambda-Runtime-Function-Error-Type: $lambdaInitializationReason",
         ]);
 
         exit(1);
     }
 
     /**
-     * @throws ResponseTooBig
+     * @param string[] $headers
      * @throws Exception
+     * @throws ResponseTooBig
      */
-    private function postJson(string $url, mixed $data): void
+    private function postJson(string $url, mixed $data, array $headers = []): void
     {
         /** @noinspection JsonEncodingApiUsageInspection */
         $jsonData = json_encode($data);
@@ -296,6 +311,7 @@ private function postJson(string $url, mixed $data): void
         curl_setopt($this->curlHandleResult, CURLOPT_HTTPHEADER, [
             'Content-Type: application/json',
             'Content-Length: ' . strlen($jsonData),
+            ...$headers,
         ]);
 
         $body = curl_exec($this->curlHandleResult);
diff --git a/src/bref-local b/src/bref-local
index d370bc924..63e77d5ac 100755
--- a/src/bref-local
+++ b/src/bref-local
@@ -18,6 +18,16 @@ if (file_exists(__DIR__ . '/../vendor/autoload.php')) {
 
 $handler = $argv[1] ?? '';
 $data = $argv[2] ?? null;
+$opts = getopt('', ['path:']);
+
+if (isset($opts['path'])) {
+    if (! file_exists($opts['path'])) {
+        throw new Exception('The file ' . $opts['path'] . ' could not be found.');
+    }
+
+    $handler = $argv[array_key_last($argv)];
+    $data = file_get_contents($opts['path']);
+}
 
 try {
     $handler = Bref::getContainer()->get($handler);
diff --git a/tests/Plugin/serverless-runtime-root-with-layers.yml b/tests/Plugin/serverless-runtime-root-with-layers.yml
new file mode 100644
index 000000000..074fe4bd5
--- /dev/null
+++ b/tests/Plugin/serverless-runtime-root-with-layers.yml
@@ -0,0 +1,27 @@
+service: bref
+provider:
+    name: aws
+    runtime: php-83
+    layers:
+        - arn:aws:lambda:us-east-1:1234567890:layer:foo:1
+
+plugins:
+    - ../../index.js
+
+functions:
+
+    function:
+        handler: function.php
+    function-arm:
+        handler: function.php
+        architecture: arm64
+
+    function-with-layers:
+        handler: function.php
+        layers:
+            - arn:aws:lambda:us-east-1:1234567890:layer:bar:1
+    function-arm-with-layers:
+        handler: function.php
+        architecture: arm64
+        layers:
+            - arn:aws:lambda:us-east-1:1234567890:layer:bar:1
diff --git a/tests/Plugin/serverless-runtime-root.yml b/tests/Plugin/serverless-runtime-root.yml
new file mode 100644
index 000000000..206332e32
--- /dev/null
+++ b/tests/Plugin/serverless-runtime-root.yml
@@ -0,0 +1,14 @@
+service: bref
+provider:
+    name: aws
+    runtime: php-83
+
+plugins:
+    - ../../index.js
+
+functions:
+    function:
+        handler: function.php
+    function-arm:
+        handler: function.php
+        architecture: arm64
diff --git a/tests/Plugin/serverless-with-layers.yml b/tests/Plugin/serverless-with-layers.yml
new file mode 100644
index 000000000..89cc2010f
--- /dev/null
+++ b/tests/Plugin/serverless-with-layers.yml
@@ -0,0 +1,30 @@
+service: bref
+provider:
+    name: aws
+    layers:
+        - arn:aws:lambda:us-east-1:1234567890:layer:foo:1
+
+plugins:
+    - ../../index.js
+
+functions:
+
+    function:
+        handler: function.php
+        runtime: php-83
+    function-arm:
+        handler: function.php
+        runtime: php-83
+        architecture: arm64
+
+    function-with-layers:
+        handler: function.php
+        runtime: php-83
+        layers:
+            - arn:aws:lambda:us-east-1:1234567890:layer:bar:1
+    function-arm-with-layers:
+        handler: function.php
+        runtime: php-83
+        architecture: arm64
+        layers:
+            - arn:aws:lambda:us-east-1:1234567890:layer:bar:1
diff --git a/tests/Plugin/serverless.yml b/tests/Plugin/serverless.yml
new file mode 100644
index 000000000..867f2253a
--- /dev/null
+++ b/tests/Plugin/serverless.yml
@@ -0,0 +1,30 @@
+service: bref
+provider:
+    name: aws
+
+plugins:
+    - ../../index.js
+
+functions:
+    function:
+        handler: function.php
+        runtime: php-83
+    fpm:
+        handler: fpm.php
+        runtime: php-83-fpm
+    console:
+        handler: console.php
+        runtime: php-83-console
+
+    function-arm:
+        handler: function.php
+        architecture: arm64
+        runtime: php-83
+    fpm-arm:
+        handler: fpm.php
+        architecture: arm64
+        runtime: php-83-fpm
+    console-arm:
+        handler: console.php
+        architecture: arm64
+        runtime: php-83-console
diff --git a/tests/PluginTest.php b/tests/PluginTest.php
new file mode 100644
index 000000000..afc00d6d6
--- /dev/null
+++ b/tests/PluginTest.php
@@ -0,0 +1,122 @@
+<?php declare(strict_types=1);
+
+namespace Bref\Test;
+
+use PHPUnit\Framework\TestCase;
+use Symfony\Component\Process\Process;
+use Symfony\Component\Yaml\Yaml;
+
+class PluginTest extends TestCase
+{
+    public function test the plugin adds the layers(): void
+    {
+        $output = $this->slsPrint('serverless.yml');
+
+        self::assertFunction($output['functions']['function'], [
+            'arn:aws:lambda:us-east-1:534081306603:layer:php-83:',
+        ]);
+        self::assertFunction($output['functions']['fpm'], [
+            'arn:aws:lambda:us-east-1:534081306603:layer:php-83-fpm:',
+        ]);
+        self::assertFunction($output['functions']['console'], [
+            'arn:aws:lambda:us-east-1:534081306603:layer:php-83:',
+            'arn:aws:lambda:us-east-1:534081306603:layer:console:',
+        ]);
+
+        self::assertFunction($output['functions']['function-arm'], [
+            'arn:aws:lambda:us-east-1:534081306603:layer:arm-php-83:',
+        ]);
+        self::assertFunction($output['functions']['fpm-arm'], [
+            'arn:aws:lambda:us-east-1:534081306603:layer:arm-php-83-fpm:',
+        ]);
+        self::assertFunction($output['functions']['console-arm'], [
+            'arn:aws:lambda:us-east-1:534081306603:layer:arm-php-83:',
+            'arn:aws:lambda:us-east-1:534081306603:layer:console:',
+        ]);
+    }
+
+    public function test the plugin adds the layers when the runtime is set in the provider(): void
+    {
+        $output = $this->slsPrint('serverless-runtime-root.yml');
+
+        self::assertFunction($output['functions']['function'], [
+            'arn:aws:lambda:us-east-1:534081306603:layer:php-83:',
+        ]);
+        self::assertFunction($output['functions']['function-arm'], [
+            'arn:aws:lambda:us-east-1:534081306603:layer:arm-php-83:',
+        ]);
+    }
+
+    public function test the plugin doesnt break layers added separately(): void
+    {
+        $output = $this->slsPrint('serverless-with-layers.yml');
+
+        self::assertFunction($output['functions']['function'], [
+            'arn:aws:lambda:us-east-1:534081306603:layer:php-83:',
+            'arn:aws:lambda:us-east-1:1234567890:layer:foo:1',
+        ]);
+        self::assertFunction($output['functions']['function-arm'], [
+            'arn:aws:lambda:us-east-1:534081306603:layer:arm-php-83:',
+            'arn:aws:lambda:us-east-1:1234567890:layer:foo:1',
+        ]);
+        self::assertFunction($output['functions']['function-with-layers'], [
+            'arn:aws:lambda:us-east-1:534081306603:layer:php-83:',
+            // This function doesn't have the `foo` layer because that's how SF works:
+            // layers in the function completely override the layers in the root
+            'arn:aws:lambda:us-east-1:1234567890:layer:bar:1',
+        ]);
+        self::assertFunction($output['functions']['function-arm-with-layers'], [
+            'arn:aws:lambda:us-east-1:534081306603:layer:arm-php-83:',
+            // This function doesn't have the `foo` layer because that's how SF works:
+            // layers in the function completely override the layers in the root
+            'arn:aws:lambda:us-east-1:1234567890:layer:bar:1',
+        ]);
+    }
+
+    public function test the plugin doesnt break layers added separately with the runtime set at the root(): void
+    {
+        $output = $this->slsPrint('serverless-runtime-root-with-layers.yml');
+
+        self::assertFunction($output['functions']['function'], [
+            'arn:aws:lambda:us-east-1:534081306603:layer:php-83:',
+            'arn:aws:lambda:us-east-1:1234567890:layer:foo:1',
+        ]);
+        self::assertFunction($output['functions']['function-arm'], [
+            'arn:aws:lambda:us-east-1:534081306603:layer:arm-php-83:',
+            'arn:aws:lambda:us-east-1:1234567890:layer:foo:1',
+        ]);
+        self::assertFunction($output['functions']['function-with-layers'], [
+            'arn:aws:lambda:us-east-1:534081306603:layer:php-83:',
+            // This function doesn't have the `foo` layer because that's how SF works:
+            // layers in the function completely override the layers in the root
+            'arn:aws:lambda:us-east-1:1234567890:layer:bar:1',
+        ]);
+        self::assertFunction($output['functions']['function-arm-with-layers'], [
+            'arn:aws:lambda:us-east-1:534081306603:layer:arm-php-83:',
+            // This function doesn't have the `foo` layer because that's how SF works:
+            // layers in the function completely override the layers in the root
+            'arn:aws:lambda:us-east-1:1234567890:layer:bar:1',
+        ]);
+    }
+
+    private function slsPrint(string $configFile): array
+    {
+        $process = (new Process(
+            ['serverless', 'print', '-c', $configFile],
+            cwd: __DIR__ . '/Plugin',
+            env: [
+                'SLS_TELEMETRY_DISABLED' => '1', // else we sometimes get HTTP errors (and its faster)
+            ],
+        ))->mustRun();
+        return Yaml::parse($process->getOutput());
+    }
+
+    private static function assertFunction(array $config, array $layers): void
+    {
+        self::assertEquals('provided.al2', $config['runtime']);
+        self::assertCount(count($layers), $config['layers'], sprintf('Expected %d layers, got %d: %s', count($layers), count($config['layers']), json_encode($config['layers'], JSON_THROW_ON_ERROR)));
+        foreach ($layers as $index => $layer) {
+            self::assertStringStartsWith($layer, $config['layers'][$index]);
+        }
+    }
+}
diff --git a/tests/Sam/PhpRuntimeTest.php b/tests/Sam/PhpRuntimeTest.php
index bc30607e9..bbd379463 100644
--- a/tests/Sam/PhpRuntimeTest.php
+++ b/tests/Sam/PhpRuntimeTest.php
@@ -188,7 +188,7 @@ public function test php config()
         self::assertArraySubset([
             // On the CLI we want errors to be sent to stdout -> those will end up in CloudWatch
             'display_errors' => '1',
-            // This means `stderr` in php-cli (http://php.net/manual/errorfunc.configuration.php#ini.error-log)
+            // This means `stderr` in php-cli (https://www.php.net/manual/en/errorfunc.configuration.php#ini.error-log)
             'error_log' => null,
             // This is the default production value
             'error_reporting' => (string) (E_ALL & ~E_DEPRECATED & ~E_STRICT),
diff --git a/tests/server.js b/tests/server.js
index 1c7a49e81..5d416feca 100644
--- a/tests/server.js
+++ b/tests/server.js
@@ -56,7 +56,7 @@
  *      > DELETE /guzzle-server
  *      > Host: 127.0.0.1:8126
  *
- * @package Guzzle PHP <http://www.guzzlephp.org>
+ * @package Guzzle PHP <https://docs.guzzlephp.org/en/stable/>
  * @license See the LICENSE file that was distributed with this source code.
  */
 
diff --git a/utils/layers.json/update.php b/utils/layers.json/update.php
index c20f67dd1..06c149eb7 100644
--- a/utils/layers.json/update.php
+++ b/utils/layers.json/update.php
@@ -13,12 +13,16 @@
 require_once __DIR__ . '/../../vendor/autoload.php';
 
 const LAYER_NAMES = [
+    'php-83',
+    'php-83-fpm',
     'php-82',
     'php-82-fpm',
     'php-81',
     'php-81-fpm',
     'php-80',
     'php-80-fpm',
+    'arm-php-83',
+    'arm-php-83-fpm',
     'arm-php-82',
     'arm-php-82-fpm',
     'arm-php-81',
diff --git a/website/template/enterprise.twig b/website/template/enterprise.twig
index 225c41e40..d1ad54b6c 100644
--- a/website/template/enterprise.twig
+++ b/website/template/enterprise.twig
@@ -119,14 +119,10 @@
                 <div class="p-6">
                     <h3 class="text-3xl font-bref font-bold leading-6 text-gray-900">Bref Enterprise</h3>
                     <p class="mt-8">
-                        <span class="text-base font-medium text-gray-500">Starting at</span>
-                        <span class="text-xl font-bold tracking-tight text-gray-900">$1000</span>
-                        <span class="text-base font-medium text-gray-500">/mo</span>
+                        <span class="text-base font-medium text-gray-500">Get in touch</span>
                     </p>
-                    <p class="h-4 mt-1 text-gray-500 text-xs">
-                        * cancel anytime, first month refund if not satisfied
-                    </p>
-                    <a href="mailto:matthieu@null.tc?subject=Bref%20Enterprise" class="mt-6 block w-full rounded-md bg-gray-800 py-3 text-center text-sm font-semibold text-white hover:bg-gray-900 hover:text-white">Get In Touch</a>
+                    <p class="h-4 mt-1"></p>
+                    <a href="mailto:matthieu@bref.sh?subject=Bref%20Enterprise" class="mt-6 block w-full rounded-md bg-gray-800 py-3 text-center text-sm font-semibold text-white hover:bg-gray-900 hover:text-white">Get In Touch</a>
                 </div>
                 <div class="px-6 pt-6 pb-8">
                     <ul role="list" class="space-y-4 pl-0">
@@ -176,7 +172,7 @@
                                 <path fill-rule="evenodd" d="M16.704 4.153a.75.75 0 01.143 1.052l-8 10.5a.75.75 0 01-1.127.075l-4.5-4.5a.75.75 0 011.06-1.06l3.894 3.893 7.48-9.817a.75.75 0 011.05-.143z" clip-rule="evenodd" />
                             </svg>
                             <span class="text-sm text-gray-600">
-                                Tailor-made AWS Lambda runtimes optimized for your project (opt-in)
+                                Self-built, tailor-made AWS Lambda runtimes optimized for your project (opt-in)
                             </span>
                         </li>
 
diff --git a/website/template/home.twig b/website/template/home.twig
index 907a7b993..7ed9f5e5d 100644
--- a/website/template/home.twig
+++ b/website/template/home.twig
@@ -240,7 +240,7 @@
                         <img class="w-36" src="/img/logo-laravel.svg" alt="Laravel">
                     </a>
                     <a class="flex justify-center items-center" href="https://depot.dev/?ref=bref.sh" title="Depot">
-                        <img class="h-10" src="/img/logo-depot.png" alt="Depot">
+                        <img class="h-6" src="/img/logo-depot.svg" alt="Depot">
                     </a>
                     <a class="flex justify-center items-center" href="https://secumailer.com/?ref=bref.sh" title="SecuMailer">
                         <img class="w-28" src="/img/logo-secumailer.svg" alt="SecuMailer">
diff --git a/website/template/img/logo-depot.svg b/website/template/img/logo-depot.svg
new file mode 100644
index 000000000..53869e015
--- /dev/null
+++ b/website/template/img/logo-depot.svg
@@ -0,0 +1,23 @@
+<svg width="256" height="64" viewBox="0 0 256 64" fill="none" xmlns="http://www.w3.org/2000/svg">
+  <path
+    d="M93.152 51.192C90.464 51.192 88.0107 50.4453 85.792 48.952C83.5733 47.416 81.8027 45.3893 80.48 42.872C79.2 40.312 78.56 37.496 78.56 34.424C78.56 31.3093 79.2427 28.5147 80.608 26.04C81.9733 23.5227 83.808 21.5173 86.112 20.024C88.4587 18.5307 91.0613 17.784 93.92 17.784C95.6693 17.784 97.2907 18.1253 98.784 18.808C100.32 19.4907 101.643 20.472 102.752 21.752V5.432L113.12 3.832V51H102.88V46.712C101.813 48.0773 100.405 49.1653 98.656 49.976C96.9493 50.7867 95.1147 51.192 93.152 51.192ZM96.608 42.616C97.8453 42.616 98.976 42.4027 100 41.976C101.024 41.5067 101.941 40.8453 102.752 39.992V28.856C101.941 28.0027 101.003 27.3627 99.936 26.936C98.912 26.5093 97.8027 26.296 96.608 26.296C95.1147 26.296 93.7707 26.6587 92.576 27.384C91.3813 28.0667 90.4427 29.0267 89.76 30.264C89.0773 31.5013 88.736 32.9093 88.736 34.488C88.736 36.024 89.0773 37.4107 89.76 38.648C90.4427 39.8853 91.3813 40.8667 92.576 41.592C93.7707 42.2747 95.1147 42.616 96.608 42.616ZM133.893 51.64C130.65 51.64 127.706 50.8933 125.061 49.4C122.458 47.864 120.368 45.816 118.789 43.256C117.253 40.6533 116.485 37.752 116.485 34.552C116.485 31.3093 117.21 28.408 118.661 25.848C120.112 23.288 122.096 21.2613 124.613 19.768C127.13 18.232 129.968 17.464 133.125 17.464C136.325 17.464 139.141 18.2107 141.573 19.704C144.005 21.1973 145.904 23.2667 147.269 25.912C148.677 28.5147 149.381 31.5227 149.381 34.936V37.176H126.661C127.002 38.4133 127.536 39.5013 128.261 40.44C128.986 41.3787 129.882 42.104 130.949 42.616C132.016 43.128 133.168 43.384 134.405 43.384C135.77 43.384 137.008 43.1493 138.117 42.68C139.269 42.2107 140.208 41.528 140.933 40.632L147.781 46.328C145.648 48.2053 143.493 49.5707 141.317 50.424C139.141 51.2347 136.666 51.64 133.893 51.64ZM126.661 31.288H139.781C139.482 30.0933 139.013 29.0693 138.373 28.216C137.733 27.3627 136.965 26.7013 136.069 26.232C135.173 25.7627 134.17 25.528 133.061 25.528C131.994 25.528 131.013 25.7627 130.117 26.232C129.264 26.6587 128.538 27.2987 127.941 28.152C127.386 29.0053 126.96 30.0507 126.661 31.288ZM152.632 64.376V17.976H162.872V22.584C163.981 21.0907 165.389 19.9173 167.096 19.064C168.845 18.2107 170.701 17.784 172.664 17.784C175.395 17.784 177.848 18.552 180.024 20.088C182.243 21.5813 183.992 23.5867 185.272 26.104C186.595 28.6213 187.256 31.4373 187.256 34.552C187.256 37.624 186.573 40.4187 185.208 42.936C183.843 45.4533 181.987 47.4587 179.64 48.952C177.336 50.4453 174.755 51.192 171.896 51.192C170.104 51.192 168.44 50.872 166.904 50.232C165.411 49.5493 164.109 48.5893 163 47.352V64.376H152.632ZM169.208 42.68C170.744 42.68 172.088 42.3387 173.24 41.656C174.435 40.9307 175.373 39.9493 176.056 38.712C176.739 37.4747 177.08 36.0667 177.08 34.488C177.08 32.9093 176.739 31.5227 176.056 30.328C175.373 29.0907 174.435 28.1307 173.24 27.448C172.045 26.7227 170.701 26.36 169.208 26.36C167.928 26.36 166.776 26.5947 165.752 27.064C164.771 27.4907 163.853 28.152 163 29.048V40.056C163.811 40.8667 164.749 41.5067 165.816 41.976C166.883 42.4453 168.013 42.68 169.208 42.68ZM206.428 51.64C203.142 51.64 200.198 50.8933 197.596 49.4C194.993 47.9067 192.924 45.88 191.388 43.32C189.894 40.7173 189.148 37.7947 189.148 34.552C189.148 31.3093 189.894 28.408 191.388 25.848C192.924 23.2453 194.993 21.1973 197.596 19.704C200.198 18.2107 203.121 17.464 206.364 17.464C209.649 17.464 212.572 18.2107 215.132 19.704C217.734 21.1973 219.782 23.2453 221.276 25.848C222.812 28.408 223.58 31.3093 223.58 34.552C223.58 37.7947 222.812 40.7173 221.276 43.32C219.782 45.88 217.734 47.9067 215.132 49.4C212.572 50.8933 209.67 51.64 206.428 51.64ZM206.364 43C207.772 43 209.009 42.6373 210.076 41.912C211.142 41.1867 211.974 40.184 212.572 38.904C213.169 37.624 213.468 36.1733 213.468 34.552C213.468 32.888 213.169 31.4373 212.572 30.2C211.974 28.92 211.142 27.9173 210.076 27.192C209.009 26.4667 207.772 26.104 206.364 26.104C204.998 26.104 203.761 26.4667 202.652 27.192C201.585 27.9173 200.753 28.92 200.156 30.2C199.558 31.4373 199.26 32.888 199.26 34.552C199.26 36.1733 199.558 37.624 200.156 38.904C200.753 40.184 201.585 41.1867 202.652 41.912C203.761 42.6373 204.998 43 206.364 43ZM242.174 51.64C238.291 51.64 235.347 50.744 233.342 48.952C231.337 47.16 230.334 44.5147 230.334 41.016V25.976H223.934V17.976H230.334V8.824L240.702 6.712V17.976H249.534V25.976H240.702V38.968C240.702 40.4187 241.022 41.4427 241.662 42.04C242.345 42.6373 243.475 42.936 245.054 42.936C245.651 42.936 246.249 42.8933 246.846 42.808C247.443 42.7227 248.254 42.5307 249.278 42.232V50.616C248.339 50.9147 247.187 51.1493 245.822 51.32C244.457 51.5333 243.241 51.64 242.174 51.64Z"
+    fill="#191719" />
+  <path
+    d="M0 10C0 4.47715 4.47715 0 10 0H16C17.1046 0 18 0.895431 18 2V10C18 11.1046 17.1046 12 16 12H2C0.89543 12 0 11.1046 0 10V10Z"
+    fill="#191719" />
+  <rect y="32" width="18" height="12" rx="2" fill="#191719" />
+  <path
+    d="M0 50C0 48.8954 0.895431 48 2 48H16C17.1046 48 18 48.8954 18 50V58C18 59.1046 17.1046 60 16 60H10C4.47715 60 0 55.5228 0 50V50Z"
+    fill="#191719" />
+  <rect x="22" y="48" width="20" height="12" rx="2" fill="#191719" />
+  <path
+    d="M46 50C46 48.8954 46.8954 48 48 48H62C63.1046 48 64 48.8954 64 50V50C64 55.5228 59.5228 60 54 60H48C46.8954 60 46 59.1046 46 58V50Z"
+    fill="#191719" />
+  <rect x="46" y="32" width="18" height="12" rx="2" fill="#191719" />
+  <rect x="46" y="16" width="18" height="12" rx="2" fill="#191719" />
+  <path
+    d="M22 2C22 0.895431 22.8954 0 24 0H54C59.5228 0 64 4.47715 64 10V10C64 11.1046 63.1046 12 62 12H24C22.8954 12 22 11.1046 22 10V2Z"
+    fill="#46A759" />
+  <rect y="16" width="42" height="12" rx="2" fill="#46A759" />
+  <rect x="22" y="32" width="20" height="12" rx="2" fill="#46A759" />
+</svg>
diff --git a/website/template/layout.twig b/website/template/layout.twig
index c7086a959..08d59eee3 100644
--- a/website/template/layout.twig
+++ b/website/template/layout.twig
@@ -27,7 +27,7 @@
     <link rel="icon" type="image/png" href="/img/favicon-16x16.png" sizes="16x16" />
     <link href="https://fonts.googleapis.com/css?family=Dosis:300,400|Open+Sans:300,400,700|Poppins:400,600&display=swap" rel="stylesheet">
     <link href="/output.css" rel="stylesheet">
-    <script async defer data-domain="bref.sh" src="https://meter.bref.sh/js/plausible.outbound-links.js"></script>
+    <script defer data-domain="bref.sh" data-api="/pl/api/event" src="https://bref.sh/pl/js/script.js"></script>
 </head>
 <body class="font-sans antialiased">
     {% block body %}{% endblock %}