diff --git a/CHANGELOG.md b/CHANGELOG.md
index c4f9ccde..d3451471 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -5,6 +5,10 @@
 ### Added
 
 - Updated Blackfire to version 1.73.0.
+- Imagick support for PHP 8.1
+- Blackfire support for PHP 8.1
+- AMQP support for PHP 8.1
+- DS support for PHP 8.1
 
 ## 0.11.22
 
diff --git a/layers.json b/layers.json
index a1cc3d8f..cec869d1 100644
--- a/layers.json
+++ b/layers.json
@@ -1,132 +1,187 @@
 {
     "amqp-php-73": {
-        "ca-central-1": 36,
-        "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-south-1": 33,
-        "ap-northeast-1": 33,
-        "ap-northeast-2": 33,
-        "ap-southeast-1": 33,
-        "ap-southeast-2": 33,
-        "eu-south-1": 26,
-        "af-south-1": 26
+        "ca-central-1": 37,
+        "eu-central-1": 34,
+        "eu-north-1": 34,
+        "eu-west-1": 34,
+        "eu-west-2": 34,
+        "eu-west-3": 34,
+        "sa-east-1": 34,
+        "us-east-1": 34,
+        "us-east-2": 34,
+        "us-west-1": 34,
+        "us-west-2": 34,
+        "ap-east-1": 1,
+        "ap-south-1": 34,
+        "ap-northeast-1": 34,
+        "ap-northeast-2": 34,
+        "ap-northeast-3": 1,
+        "ap-southeast-1": 34,
+        "ap-southeast-2": 34,
+        "eu-south-1": 27,
+        "af-south-1": 27,
+        "me-south-1": 1
     },
     "amqp-php-74": {
-        "ca-central-1": 34,
-        "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-south-1": 30,
-        "ap-northeast-1": 30,
-        "ap-northeast-2": 30,
-        "ap-southeast-1": 30,
-        "ap-southeast-2": 30,
-        "eu-south-1": 26,
-        "af-south-1": 26
+        "ca-central-1": 35,
+        "eu-central-1": 31,
+        "eu-north-1": 31,
+        "eu-west-1": 31,
+        "eu-west-2": 31,
+        "eu-west-3": 31,
+        "sa-east-1": 31,
+        "us-east-1": 31,
+        "us-east-2": 31,
+        "us-west-1": 31,
+        "us-west-2": 31,
+        "ap-east-1": 1,
+        "ap-south-1": 31,
+        "ap-northeast-1": 31,
+        "ap-northeast-2": 31,
+        "ap-northeast-3": 1,
+        "ap-southeast-1": 31,
+        "ap-southeast-2": 31,
+        "eu-south-1": 27,
+        "af-south-1": 27,
+        "me-south-1": 1
     },
     "amqp-php-80": {
-        "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-south-1": 4,
-        "ap-northeast-1": 4,
-        "ap-northeast-2": 4,
-        "ap-southeast-1": 4,
-        "ap-southeast-2": 4,
-        "eu-south-1": 4,
-        "af-south-1": 4
+        "ca-central-1": 5,
+        "eu-central-1": 5,
+        "eu-north-1": 5,
+        "eu-west-1": 5,
+        "eu-west-2": 5,
+        "eu-west-3": 5,
+        "sa-east-1": 5,
+        "us-east-1": 5,
+        "us-east-2": 5,
+        "us-west-1": 5,
+        "us-west-2": 5,
+        "ap-east-1": 1,
+        "ap-south-1": 5,
+        "ap-northeast-1": 5,
+        "ap-northeast-2": 5,
+        "ap-northeast-3": 1,
+        "ap-southeast-1": 5,
+        "ap-southeast-2": 5,
+        "eu-south-1": 5,
+        "af-south-1": 5,
+        "me-south-1": 1
+    },
+    "amqp-php-81": {
+        "ca-central-1": 1,
+        "eu-central-1": 1,
+        "eu-north-1": 1,
+        "eu-west-1": 1,
+        "eu-west-2": 1,
+        "eu-west-3": 1,
+        "sa-east-1": 1,
+        "us-east-1": 1,
+        "us-east-2": 1,
+        "us-west-1": 1,
+        "us-west-2": 1,
+        "ap-east-1": 1,
+        "ap-south-1": 1,
+        "ap-northeast-1": 1,
+        "ap-northeast-2": 1,
+        "ap-northeast-3": 1,
+        "ap-southeast-1": 1,
+        "ap-southeast-2": 1,
+        "eu-south-1": 1,
+        "af-south-1": 1,
+        "me-south-1": 1
     },
     "blackfire-php-73": {
-        "ca-central-1": 120,
+        "ca-central-1": 121,
+        "eu-central-1": 118,
+        "eu-north-1": 118,
+        "eu-west-1": 118,
+        "eu-west-2": 118,
+        "eu-west-3": 118,
+        "sa-east-1": 118,
+        "us-east-1": 192,
+        "us-east-2": 117,
+        "us-west-1": 117,
+        "us-west-2": 116,
+        "ap-east-1": 5,
+        "ap-south-1": 105,
+        "ap-northeast-1": 105,
+        "ap-northeast-2": 105,
+        "ap-northeast-3": 5,
+        "ap-southeast-1": 105,
+        "ap-southeast-2": 105,
+        "eu-south-1": 100,
+        "af-south-1": 100,
+        "me-south-1": 5
+    },
+    "blackfire-php-74": {
+        "ca-central-1": 121,
         "eu-central-1": 117,
         "eu-north-1": 117,
         "eu-west-1": 117,
         "eu-west-2": 117,
         "eu-west-3": 117,
         "sa-east-1": 117,
-        "us-east-1": 191,
+        "us-east-1": 192,
         "us-east-2": 116,
         "us-west-1": 116,
         "us-west-2": 115,
-        "ap-east-1": 4,
+        "ap-east-1": 5,
         "ap-south-1": 104,
         "ap-northeast-1": 104,
         "ap-northeast-2": 104,
-        "ap-northeast-3": 4,
+        "ap-northeast-3": 5,
         "ap-southeast-1": 104,
         "ap-southeast-2": 104,
-        "eu-south-1": 99,
-        "af-south-1": 99,
-        "me-south-1": 4
-    },
-    "blackfire-php-74": {
-        "ca-central-1": 120,
-        "eu-central-1": 116,
-        "eu-north-1": 116,
-        "eu-west-1": 116,
-        "eu-west-2": 116,
-        "eu-west-3": 116,
-        "sa-east-1": 116,
-        "us-east-1": 191,
-        "us-east-2": 115,
-        "us-west-1": 115,
-        "us-west-2": 114,
-        "ap-east-1": 4,
-        "ap-south-1": 103,
-        "ap-northeast-1": 103,
-        "ap-northeast-2": 103,
-        "ap-northeast-3": 4,
-        "ap-southeast-1": 103,
-        "ap-southeast-2": 103,
-        "eu-south-1": 99,
-        "af-south-1": 99,
-        "me-south-1": 4
+        "eu-south-1": 100,
+        "af-south-1": 100,
+        "me-south-1": 5
     },
     "blackfire-php-80": {
-        "ca-central-1": 65,
-        "eu-central-1": 65,
-        "eu-north-1": 65,
-        "eu-west-1": 65,
-        "eu-west-2": 65,
-        "eu-west-3": 65,
-        "sa-east-1": 65,
-        "us-east-1": 65,
-        "us-east-2": 65,
-        "us-west-1": 65,
-        "us-west-2": 64,
-        "ap-east-1": 4,
-        "ap-south-1": 53,
-        "ap-northeast-1": 53,
-        "ap-northeast-2": 53,
-        "ap-northeast-3": 4,
-        "ap-southeast-1": 53,
-        "ap-southeast-2": 53,
-        "eu-south-1": 53,
-        "af-south-1": 53,
-        "me-south-1": 4
+        "ca-central-1": 66,
+        "eu-central-1": 66,
+        "eu-north-1": 66,
+        "eu-west-1": 66,
+        "eu-west-2": 66,
+        "eu-west-3": 66,
+        "sa-east-1": 66,
+        "us-east-1": 66,
+        "us-east-2": 66,
+        "us-west-1": 66,
+        "us-west-2": 65,
+        "ap-east-1": 5,
+        "ap-south-1": 54,
+        "ap-northeast-1": 54,
+        "ap-northeast-2": 54,
+        "ap-northeast-3": 5,
+        "ap-southeast-1": 54,
+        "ap-southeast-2": 54,
+        "eu-south-1": 54,
+        "af-south-1": 54,
+        "me-south-1": 5
+    },
+    "blackfire-php-81": {
+        "ca-central-1": 1,
+        "eu-central-1": 1,
+        "eu-north-1": 1,
+        "eu-west-1": 1,
+        "eu-west-2": 1,
+        "eu-west-3": 1,
+        "sa-east-1": 1,
+        "us-east-1": 1,
+        "us-east-2": 1,
+        "us-west-1": 1,
+        "us-west-2": 1,
+        "ap-east-1": 1,
+        "ap-south-1": 1,
+        "ap-northeast-1": 1,
+        "ap-northeast-2": 1,
+        "ap-northeast-3": 1,
+        "ap-southeast-1": 1,
+        "ap-southeast-2": 1,
+        "eu-south-1": 1,
+        "af-south-1": 1,
+        "me-south-1": 1
     },
     "calendar-php-73": {
         "ca-central-1": 4,
@@ -249,64 +304,96 @@
         "af-south-1": 23
     },
     "ds-php-73": {
-        "ca-central-1": 28,
-        "eu-central-1": 24,
-        "eu-north-1": 24,
-        "eu-west-1": 24,
-        "eu-west-2": 24,
-        "eu-west-3": 24,
-        "sa-east-1": 24,
-        "us-east-1": 24,
-        "us-east-2": 24,
-        "us-west-1": 24,
-        "us-west-2": 24,
-        "ap-south-1": 24,
-        "ap-northeast-1": 24,
-        "ap-northeast-2": 24,
-        "ap-southeast-1": 24,
-        "ap-southeast-2": 24,
-        "eu-south-1": 23,
-        "af-south-1": 23
+        "ca-central-1": 29,
+        "eu-central-1": 25,
+        "eu-north-1": 25,
+        "eu-west-1": 25,
+        "eu-west-2": 25,
+        "eu-west-3": 25,
+        "sa-east-1": 25,
+        "us-east-1": 25,
+        "us-east-2": 25,
+        "us-west-1": 25,
+        "us-west-2": 25,
+        "ap-east-1": 1,
+        "ap-south-1": 25,
+        "ap-northeast-1": 25,
+        "ap-northeast-2": 25,
+        "ap-northeast-3": 1,
+        "ap-southeast-1": 25,
+        "ap-southeast-2": 25,
+        "eu-south-1": 24,
+        "af-south-1": 24,
+        "me-south-1": 1
     },
     "ds-php-74": {
-        "ca-central-1": 29,
-        "eu-central-1": 24,
-        "eu-north-1": 24,
-        "eu-west-1": 24,
-        "eu-west-2": 24,
-        "eu-west-3": 24,
-        "sa-east-1": 24,
-        "us-east-1": 24,
-        "us-east-2": 24,
-        "us-west-1": 24,
-        "us-west-2": 24,
-        "ap-south-1": 24,
-        "ap-northeast-1": 24,
-        "ap-northeast-2": 24,
-        "ap-southeast-1": 24,
-        "ap-southeast-2": 24,
-        "eu-south-1": 23,
-        "af-south-1": 23
+        "ca-central-1": 30,
+        "eu-central-1": 25,
+        "eu-north-1": 25,
+        "eu-west-1": 25,
+        "eu-west-2": 25,
+        "eu-west-3": 25,
+        "sa-east-1": 25,
+        "us-east-1": 25,
+        "us-east-2": 25,
+        "us-west-1": 25,
+        "us-west-2": 25,
+        "ap-east-1": 1,
+        "ap-south-1": 25,
+        "ap-northeast-1": 25,
+        "ap-northeast-2": 25,
+        "ap-northeast-3": 1,
+        "ap-southeast-1": 25,
+        "ap-southeast-2": 25,
+        "eu-south-1": 24,
+        "af-south-1": 24,
+        "me-south-1": 1
     },
     "ds-php-80": {
-        "ca-central-1": 13,
-        "eu-central-1": 13,
-        "eu-north-1": 13,
-        "eu-west-1": 13,
-        "eu-west-2": 13,
-        "eu-west-3": 13,
-        "sa-east-1": 13,
-        "us-east-1": 13,
-        "us-east-2": 13,
-        "us-west-1": 13,
-        "us-west-2": 13,
-        "ap-south-1": 13,
-        "ap-northeast-1": 13,
-        "ap-northeast-2": 13,
-        "ap-southeast-1": 13,
-        "ap-southeast-2": 13,
-        "eu-south-1": 13,
-        "af-south-1": 13
+        "ca-central-1": 14,
+        "eu-central-1": 14,
+        "eu-north-1": 14,
+        "eu-west-1": 14,
+        "eu-west-2": 14,
+        "eu-west-3": 14,
+        "sa-east-1": 14,
+        "us-east-1": 14,
+        "us-east-2": 14,
+        "us-west-1": 14,
+        "us-west-2": 14,
+        "ap-east-1": 1,
+        "ap-south-1": 14,
+        "ap-northeast-1": 14,
+        "ap-northeast-2": 14,
+        "ap-northeast-3": 1,
+        "ap-southeast-1": 14,
+        "ap-southeast-2": 14,
+        "eu-south-1": 14,
+        "af-south-1": 14,
+        "me-south-1": 1
+    },
+    "ds-php-81": {
+        "ca-central-1": 1,
+        "eu-central-1": 1,
+        "eu-north-1": 1,
+        "eu-west-1": 1,
+        "eu-west-2": 1,
+        "eu-west-3": 1,
+        "sa-east-1": 1,
+        "us-east-1": 1,
+        "us-east-2": 1,
+        "us-west-1": 1,
+        "us-west-2": 1,
+        "ap-east-1": 1,
+        "ap-south-1": 1,
+        "ap-northeast-1": 1,
+        "ap-northeast-2": 1,
+        "ap-northeast-3": 1,
+        "ap-southeast-1": 1,
+        "ap-southeast-2": 1,
+        "eu-south-1": 1,
+        "af-south-1": 1,
+        "me-south-1": 1
     },
     "gd-php-73": {
         "ca-central-1": 18,
@@ -629,72 +716,95 @@
         "af-south-1": 3
     },
     "imagick-php-73": {
-        "ca-central-1": 26,
-        "eu-central-1": 26,
-        "eu-north-1": 26,
-        "eu-west-1": 26,
-        "eu-west-2": 26,
-        "eu-west-3": 26,
-        "sa-east-1": 26,
-        "us-east-1": 26,
-        "us-east-2": 26,
-        "us-west-1": 26,
-        "us-west-2": 26,
-        "ap-east-1": 1,
-        "ap-south-1": 26,
-        "ap-northeast-1": 26,
-        "ap-northeast-2": 26,
-        "ap-northeast-3": 1,
-        "ap-southeast-1": 26,
-        "ap-southeast-2": 26,
-        "eu-south-1": 25,
-        "af-south-1": 25,
-        "me-south-1": 1
+        "ca-central-1": 27,
+        "eu-central-1": 27,
+        "eu-north-1": 27,
+        "eu-west-1": 27,
+        "eu-west-2": 27,
+        "eu-west-3": 27,
+        "sa-east-1": 27,
+        "us-east-1": 27,
+        "us-east-2": 27,
+        "us-west-1": 27,
+        "us-west-2": 27,
+        "ap-east-1": 2,
+        "ap-south-1": 27,
+        "ap-northeast-1": 27,
+        "ap-northeast-2": 27,
+        "ap-northeast-3": 2,
+        "ap-southeast-1": 27,
+        "ap-southeast-2": 27,
+        "eu-south-1": 26,
+        "af-south-1": 26,
+        "me-south-1": 2
     },
     "imagick-php-74": {
-        "ca-central-1": 29,
-        "eu-central-1": 26,
-        "eu-north-1": 26,
-        "eu-west-1": 26,
-        "eu-west-2": 26,
-        "eu-west-3": 26,
-        "sa-east-1": 26,
-        "us-east-1": 26,
-        "us-east-2": 26,
-        "us-west-1": 26,
-        "us-west-2": 26,
-        "ap-east-1": 1,
-        "ap-south-1": 26,
-        "ap-northeast-1": 26,
-        "ap-northeast-2": 26,
-        "ap-northeast-3": 1,
-        "ap-southeast-1": 26,
-        "ap-southeast-2": 26,
-        "eu-south-1": 25,
-        "af-south-1": 25,
-        "me-south-1": 1
+        "ca-central-1": 30,
+        "eu-central-1": 27,
+        "eu-north-1": 27,
+        "eu-west-1": 27,
+        "eu-west-2": 27,
+        "eu-west-3": 27,
+        "sa-east-1": 27,
+        "us-east-1": 27,
+        "us-east-2": 27,
+        "us-west-1": 27,
+        "us-west-2": 27,
+        "ap-east-1": 2,
+        "ap-south-1": 27,
+        "ap-northeast-1": 27,
+        "ap-northeast-2": 27,
+        "ap-northeast-3": 2,
+        "ap-southeast-1": 27,
+        "ap-southeast-2": 27,
+        "eu-south-1": 26,
+        "af-south-1": 26,
+        "me-south-1": 2
     },
     "imagick-php-80": {
-        "ca-central-1": 9,
-        "eu-central-1": 9,
-        "eu-north-1": 9,
-        "eu-west-1": 9,
-        "eu-west-2": 9,
-        "eu-west-3": 9,
-        "sa-east-1": 9,
-        "us-east-1": 9,
-        "us-east-2": 9,
-        "us-west-1": 9,
-        "us-west-2": 9,
+        "ca-central-1": 10,
+        "eu-central-1": 10,
+        "eu-north-1": 10,
+        "eu-west-1": 10,
+        "eu-west-2": 10,
+        "eu-west-3": 10,
+        "sa-east-1": 10,
+        "us-east-1": 10,
+        "us-east-2": 10,
+        "us-west-1": 10,
+        "us-west-2": 10,
+        "ap-east-1": 2,
+        "ap-south-1": 10,
+        "ap-northeast-1": 10,
+        "ap-northeast-2": 10,
+        "ap-northeast-3": 2,
+        "ap-southeast-1": 10,
+        "ap-southeast-2": 10,
+        "eu-south-1": 10,
+        "af-south-1": 10,
+        "me-south-1": 2
+    },
+    "imagick-php-81": {
+        "ca-central-1": 1,
+        "eu-central-1": 1,
+        "eu-north-1": 1,
+        "eu-west-1": 1,
+        "eu-west-2": 1,
+        "eu-west-3": 1,
+        "sa-east-1": 1,
+        "us-east-1": 1,
+        "us-east-2": 1,
+        "us-west-1": 1,
+        "us-west-2": 1,
         "ap-east-1": 1,
-        "ap-south-1": 9,
-        "ap-northeast-1": 9,
-        "ap-northeast-2": 9,
+        "ap-south-1": 1,
+        "ap-northeast-1": 1,
+        "ap-northeast-2": 1,
         "ap-northeast-3": 1,
-        "ap-southeast-1": 9,
-        "ap-southeast-2": 9,
-        "eu-south-1": 9,
-        "af-south-1": 9,
+        "ap-southeast-1": 1,
+        "ap-southeast-2": 1,
+        "eu-south-1": 1,
+        "af-south-1": 1,
         "me-south-1": 1
     },
     "imap-php-73": {