diff --git a/packages/@aws-cdk-testing/framework-integ/test/aws-lambda/test/integ.lambda-adot.js.snapshot/Stack1.assets.json b/packages/@aws-cdk-testing/framework-integ/test/aws-lambda/test/integ.lambda-adot.js.snapshot/Stack1.assets.json
index 60fd0587a2830..ab5cc895e502e 100644
--- a/packages/@aws-cdk-testing/framework-integ/test/aws-lambda/test/integ.lambda-adot.js.snapshot/Stack1.assets.json
+++ b/packages/@aws-cdk-testing/framework-integ/test/aws-lambda/test/integ.lambda-adot.js.snapshot/Stack1.assets.json
@@ -1,7 +1,7 @@
 {
   "version": "34.0.0",
   "files": {
-    "ae04dd3f0004ce77c36dcaada8149a164df570df8fcdcdbcbde1e696dc1c10b1": {
+    "75e2bf084797f71f99ed5cb6f35bb6f1ee8a42cbbdb4ccd99008c5792941bbed": {
       "source": {
         "path": "Stack1.template.json",
         "packaging": "file"
@@ -9,7 +9,7 @@
       "destinations": {
         "current_account-current_region": {
           "bucketName": "cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}",
-          "objectKey": "ae04dd3f0004ce77c36dcaada8149a164df570df8fcdcdbcbde1e696dc1c10b1.json",
+          "objectKey": "75e2bf084797f71f99ed5cb6f35bb6f1ee8a42cbbdb4ccd99008c5792941bbed.json",
           "assumeRoleArn": "arn:${AWS::Partition}:iam::${AWS::AccountId}:role/cdk-hnb659fds-file-publishing-role-${AWS::AccountId}-${AWS::Region}"
         }
       }
diff --git a/packages/@aws-cdk-testing/framework-integ/test/aws-lambda/test/integ.lambda-adot.js.snapshot/Stack1.template.json b/packages/@aws-cdk-testing/framework-integ/test/aws-lambda/test/integ.lambda-adot.js.snapshot/Stack1.template.json
index 54413ca5a65fd..4a1fc9fb25200 100644
--- a/packages/@aws-cdk-testing/framework-integ/test/aws-lambda/test/integ.lambda-adot.js.snapshot/Stack1.template.json
+++ b/packages/@aws-cdk-testing/framework-integ/test/aws-lambda/test/integ.lambda-adot.js.snapshot/Stack1.template.json
@@ -72,12 +72,15 @@
     "Handler": "index.handler",
     "Layers": [
      {
-      "Fn::FindInMap": [
-       "AdotlambdalayerMap",
-       {
-        "Ref": "AWS::Region"
-       },
-       "JAVASCRIPTxSDKx1x17x1xarm64"
+      "Fn::Join": [
+       "",
+       [
+        "arn:aws:lambda:",
+        {
+         "Ref": "AWS::Region"
+        },
+        ":901920570463:layer:aws-otel-nodejs-arm64-ver-1-17-1:1"
+       ]
       ]
      }
     ],
@@ -166,12 +169,15 @@
     "Handler": "index.handler",
     "Layers": [
      {
-      "Fn::FindInMap": [
-       "AdotlambdalayerMap",
-       {
-        "Ref": "AWS::Region"
-       },
-       "PYTHONxSDKx1x20x0x1xx86x64"
+      "Fn::Join": [
+       "",
+       [
+        "arn:aws:lambda:",
+        {
+         "Ref": "AWS::Region"
+        },
+        ":901920570463:layer:aws-otel-python-amd64-ver-1-20-0:3"
+       ]
       ]
      }
     ],
@@ -260,12 +266,15 @@
     "Handler": "index.handler",
     "Layers": [
      {
-      "Fn::FindInMap": [
-       "AdotlambdalayerMap",
-       {
-        "Ref": "AWS::Region"
-       },
-       "JAVAxSDKx1x31x0xx86x64"
+      "Fn::Join": [
+       "",
+       [
+        "arn:aws:lambda:",
+        {
+         "Ref": "AWS::Region"
+        },
+        ":901920570463:layer:aws-otel-java-wrapper-amd64-ver-1-31-0:1"
+       ]
       ]
      }
     ],
@@ -354,12 +363,15 @@
     "Handler": "index.handler",
     "Layers": [
      {
-      "Fn::FindInMap": [
-       "AdotlambdalayerMap",
-       {
-        "Ref": "AWS::Region"
-       },
-       "JAVAxAUTOxINSTRUMENTATIONx1x31x0xx86x64"
+      "Fn::Join": [
+       "",
+       [
+        "arn:aws:lambda:",
+        {
+         "Ref": "AWS::Region"
+        },
+        ":901920570463:layer:aws-otel-java-agent-amd64-ver-1-31-0:1"
+       ]
       ]
      }
     ],
@@ -448,12 +460,15 @@
     "Handler": "index.handler",
     "Layers": [
      {
-      "Fn::FindInMap": [
-       "AdotlambdalayerMap",
-       {
-        "Ref": "AWS::Region"
-       },
-       "GENERICx0x88x0xx86x64"
+      "Fn::Join": [
+       "",
+       [
+        "arn:aws:lambda:",
+        {
+         "Ref": "AWS::Region"
+        },
+        ":901920570463:layer:aws-otel-collector-amd64-ver-0-88-0:1"
+       ]
       ]
      }
     ],
@@ -474,164 +489,6 @@
    ]
   }
  },
- "Mappings": {
-  "AdotlambdalayerMap": {
-   "af-south-1": {
-    "JAVASCRIPTxSDKx1x17x1xarm64": "arn:aws:lambda:af-south-1:901920570463:layer:aws-otel-nodejs-arm64-ver-1-17-1:1",
-    "PYTHONxSDKx1x20x0x1xx86x64": "arn:aws:lambda:af-south-1:901920570463:layer:aws-otel-python-amd64-ver-1-20-0:3",
-    "JAVAxSDKx1x31x0xx86x64": "arn:aws:lambda:af-south-1:901920570463:layer:aws-otel-java-wrapper-amd64-ver-1-31-0:1",
-    "JAVAxAUTOxINSTRUMENTATIONx1x31x0xx86x64": "arn:aws:lambda:af-south-1:901920570463:layer:aws-otel-java-agent-amd64-ver-1-31-0:1",
-    "GENERICx0x88x0xx86x64": "arn:aws:lambda:af-south-1:901920570463:layer:aws-otel-collector-amd64-ver-0-88-0:1"
-   },
-   "ap-east-1": {
-    "JAVASCRIPTxSDKx1x17x1xarm64": "arn:aws:lambda:ap-east-1:901920570463:layer:aws-otel-nodejs-arm64-ver-1-17-1:1",
-    "PYTHONxSDKx1x20x0x1xx86x64": "arn:aws:lambda:ap-east-1:901920570463:layer:aws-otel-python-amd64-ver-1-20-0:3",
-    "JAVAxSDKx1x31x0xx86x64": "arn:aws:lambda:ap-east-1:901920570463:layer:aws-otel-java-wrapper-amd64-ver-1-31-0:1",
-    "JAVAxAUTOxINSTRUMENTATIONx1x31x0xx86x64": "arn:aws:lambda:ap-east-1:901920570463:layer:aws-otel-java-agent-amd64-ver-1-31-0:1",
-    "GENERICx0x88x0xx86x64": "arn:aws:lambda:ap-east-1:901920570463:layer:aws-otel-collector-amd64-ver-0-88-0:1"
-   },
-   "ap-northeast-1": {
-    "JAVASCRIPTxSDKx1x17x1xarm64": "arn:aws:lambda:ap-northeast-1:901920570463:layer:aws-otel-nodejs-arm64-ver-1-17-1:1",
-    "PYTHONxSDKx1x20x0x1xx86x64": "arn:aws:lambda:ap-northeast-1:901920570463:layer:aws-otel-python-amd64-ver-1-20-0:3",
-    "JAVAxSDKx1x31x0xx86x64": "arn:aws:lambda:ap-northeast-1:901920570463:layer:aws-otel-java-wrapper-amd64-ver-1-31-0:1",
-    "JAVAxAUTOxINSTRUMENTATIONx1x31x0xx86x64": "arn:aws:lambda:ap-northeast-1:901920570463:layer:aws-otel-java-agent-amd64-ver-1-31-0:1",
-    "GENERICx0x88x0xx86x64": "arn:aws:lambda:ap-northeast-1:901920570463:layer:aws-otel-collector-amd64-ver-0-88-0:1"
-   },
-   "ap-northeast-2": {
-    "JAVASCRIPTxSDKx1x17x1xarm64": "arn:aws:lambda:ap-northeast-2:901920570463:layer:aws-otel-nodejs-arm64-ver-1-17-1:1",
-    "PYTHONxSDKx1x20x0x1xx86x64": "arn:aws:lambda:ap-northeast-2:901920570463:layer:aws-otel-python-amd64-ver-1-20-0:3",
-    "JAVAxSDKx1x31x0xx86x64": "arn:aws:lambda:ap-northeast-2:901920570463:layer:aws-otel-java-wrapper-amd64-ver-1-31-0:1",
-    "JAVAxAUTOxINSTRUMENTATIONx1x31x0xx86x64": "arn:aws:lambda:ap-northeast-2:901920570463:layer:aws-otel-java-agent-amd64-ver-1-31-0:1",
-    "GENERICx0x88x0xx86x64": "arn:aws:lambda:ap-northeast-2:901920570463:layer:aws-otel-collector-amd64-ver-0-88-0:1"
-   },
-   "ap-south-1": {
-    "JAVASCRIPTxSDKx1x17x1xarm64": "arn:aws:lambda:ap-south-1:901920570463:layer:aws-otel-nodejs-arm64-ver-1-17-1:1",
-    "PYTHONxSDKx1x20x0x1xx86x64": "arn:aws:lambda:ap-south-1:901920570463:layer:aws-otel-python-amd64-ver-1-20-0:3",
-    "JAVAxSDKx1x31x0xx86x64": "arn:aws:lambda:ap-south-1:901920570463:layer:aws-otel-java-wrapper-amd64-ver-1-31-0:1",
-    "JAVAxAUTOxINSTRUMENTATIONx1x31x0xx86x64": "arn:aws:lambda:ap-south-1:901920570463:layer:aws-otel-java-agent-amd64-ver-1-31-0:1",
-    "GENERICx0x88x0xx86x64": "arn:aws:lambda:ap-south-1:901920570463:layer:aws-otel-collector-amd64-ver-0-88-0:1"
-   },
-   "ap-southeast-1": {
-    "JAVASCRIPTxSDKx1x17x1xarm64": "arn:aws:lambda:ap-southeast-1:901920570463:layer:aws-otel-nodejs-arm64-ver-1-17-1:1",
-    "PYTHONxSDKx1x20x0x1xx86x64": "arn:aws:lambda:ap-southeast-1:901920570463:layer:aws-otel-python-amd64-ver-1-20-0:3",
-    "JAVAxSDKx1x31x0xx86x64": "arn:aws:lambda:ap-southeast-1:901920570463:layer:aws-otel-java-wrapper-amd64-ver-1-31-0:1",
-    "JAVAxAUTOxINSTRUMENTATIONx1x31x0xx86x64": "arn:aws:lambda:ap-southeast-1:901920570463:layer:aws-otel-java-agent-amd64-ver-1-31-0:1",
-    "GENERICx0x88x0xx86x64": "arn:aws:lambda:ap-southeast-1:901920570463:layer:aws-otel-collector-amd64-ver-0-88-0:1"
-   },
-   "ap-southeast-2": {
-    "JAVASCRIPTxSDKx1x17x1xarm64": "arn:aws:lambda:ap-southeast-2:901920570463:layer:aws-otel-nodejs-arm64-ver-1-17-1:1",
-    "PYTHONxSDKx1x20x0x1xx86x64": "arn:aws:lambda:ap-southeast-2:901920570463:layer:aws-otel-python-amd64-ver-1-20-0:3",
-    "JAVAxSDKx1x31x0xx86x64": "arn:aws:lambda:ap-southeast-2:901920570463:layer:aws-otel-java-wrapper-amd64-ver-1-31-0:1",
-    "JAVAxAUTOxINSTRUMENTATIONx1x31x0xx86x64": "arn:aws:lambda:ap-southeast-2:901920570463:layer:aws-otel-java-agent-amd64-ver-1-31-0:1",
-    "GENERICx0x88x0xx86x64": "arn:aws:lambda:ap-southeast-2:901920570463:layer:aws-otel-collector-amd64-ver-0-88-0:1"
-   },
-   "ca-central-1": {
-    "JAVASCRIPTxSDKx1x17x1xarm64": "arn:aws:lambda:ca-central-1:901920570463:layer:aws-otel-nodejs-arm64-ver-1-17-1:1",
-    "PYTHONxSDKx1x20x0x1xx86x64": "arn:aws:lambda:ca-central-1:901920570463:layer:aws-otel-python-amd64-ver-1-20-0:3",
-    "JAVAxSDKx1x31x0xx86x64": "arn:aws:lambda:ca-central-1:901920570463:layer:aws-otel-java-wrapper-amd64-ver-1-31-0:1",
-    "JAVAxAUTOxINSTRUMENTATIONx1x31x0xx86x64": "arn:aws:lambda:ca-central-1:901920570463:layer:aws-otel-java-agent-amd64-ver-1-31-0:1",
-    "GENERICx0x88x0xx86x64": "arn:aws:lambda:ca-central-1:901920570463:layer:aws-otel-collector-amd64-ver-0-88-0:1"
-   },
-   "cn-north-1": {
-    "JAVASCRIPTxSDKx1x17x1xarm64": "arn:aws-cn:lambda:cn-north-1:901920570463:layer:aws-otel-nodejs-arm64-ver-1-17-1:1",
-    "PYTHONxSDKx1x20x0x1xx86x64": "arn:aws-cn:lambda:cn-north-1:901920570463:layer:aws-otel-python-amd64-ver-1-20-0:3",
-    "JAVAxSDKx1x31x0xx86x64": "arn:aws-cn:lambda:cn-north-1:901920570463:layer:aws-otel-java-wrapper-amd64-ver-1-31-0:1",
-    "JAVAxAUTOxINSTRUMENTATIONx1x31x0xx86x64": "arn:aws-cn:lambda:cn-north-1:901920570463:layer:aws-otel-java-agent-amd64-ver-1-31-0:1",
-    "GENERICx0x88x0xx86x64": "arn:aws-cn:lambda:cn-north-1:901920570463:layer:aws-otel-collector-amd64-ver-0-88-0:1"
-   },
-   "cn-northwest-1": {
-    "JAVASCRIPTxSDKx1x17x1xarm64": "arn:aws-cn:lambda:cn-northwest-1:901920570463:layer:aws-otel-nodejs-arm64-ver-1-17-1:1",
-    "PYTHONxSDKx1x20x0x1xx86x64": "arn:aws-cn:lambda:cn-northwest-1:901920570463:layer:aws-otel-python-amd64-ver-1-20-0:3",
-    "JAVAxSDKx1x31x0xx86x64": "arn:aws-cn:lambda:cn-northwest-1:901920570463:layer:aws-otel-java-wrapper-amd64-ver-1-31-0:1",
-    "JAVAxAUTOxINSTRUMENTATIONx1x31x0xx86x64": "arn:aws-cn:lambda:cn-northwest-1:901920570463:layer:aws-otel-java-agent-amd64-ver-1-31-0:1",
-    "GENERICx0x88x0xx86x64": "arn:aws-cn:lambda:cn-northwest-1:901920570463:layer:aws-otel-collector-amd64-ver-0-88-0:1"
-   },
-   "eu-central-1": {
-    "JAVASCRIPTxSDKx1x17x1xarm64": "arn:aws:lambda:eu-central-1:901920570463:layer:aws-otel-nodejs-arm64-ver-1-17-1:1",
-    "PYTHONxSDKx1x20x0x1xx86x64": "arn:aws:lambda:eu-central-1:901920570463:layer:aws-otel-python-amd64-ver-1-20-0:3",
-    "JAVAxSDKx1x31x0xx86x64": "arn:aws:lambda:eu-central-1:901920570463:layer:aws-otel-java-wrapper-amd64-ver-1-31-0:1",
-    "JAVAxAUTOxINSTRUMENTATIONx1x31x0xx86x64": "arn:aws:lambda:eu-central-1:901920570463:layer:aws-otel-java-agent-amd64-ver-1-31-0:1",
-    "GENERICx0x88x0xx86x64": "arn:aws:lambda:eu-central-1:901920570463:layer:aws-otel-collector-amd64-ver-0-88-0:1"
-   },
-   "eu-north-1": {
-    "JAVASCRIPTxSDKx1x17x1xarm64": "arn:aws:lambda:eu-north-1:901920570463:layer:aws-otel-nodejs-arm64-ver-1-17-1:1",
-    "PYTHONxSDKx1x20x0x1xx86x64": "arn:aws:lambda:eu-north-1:901920570463:layer:aws-otel-python-amd64-ver-1-20-0:3",
-    "JAVAxSDKx1x31x0xx86x64": "arn:aws:lambda:eu-north-1:901920570463:layer:aws-otel-java-wrapper-amd64-ver-1-31-0:1",
-    "JAVAxAUTOxINSTRUMENTATIONx1x31x0xx86x64": "arn:aws:lambda:eu-north-1:901920570463:layer:aws-otel-java-agent-amd64-ver-1-31-0:1",
-    "GENERICx0x88x0xx86x64": "arn:aws:lambda:eu-north-1:901920570463:layer:aws-otel-collector-amd64-ver-0-88-0:1"
-   },
-   "eu-south-1": {
-    "JAVASCRIPTxSDKx1x17x1xarm64": "arn:aws:lambda:eu-south-1:901920570463:layer:aws-otel-nodejs-arm64-ver-1-17-1:1",
-    "PYTHONxSDKx1x20x0x1xx86x64": "arn:aws:lambda:eu-south-1:901920570463:layer:aws-otel-python-amd64-ver-1-20-0:3",
-    "JAVAxSDKx1x31x0xx86x64": "arn:aws:lambda:eu-south-1:901920570463:layer:aws-otel-java-wrapper-amd64-ver-1-31-0:1",
-    "JAVAxAUTOxINSTRUMENTATIONx1x31x0xx86x64": "arn:aws:lambda:eu-south-1:901920570463:layer:aws-otel-java-agent-amd64-ver-1-31-0:1",
-    "GENERICx0x88x0xx86x64": "arn:aws:lambda:eu-south-1:901920570463:layer:aws-otel-collector-amd64-ver-0-88-0:1"
-   },
-   "eu-west-1": {
-    "JAVASCRIPTxSDKx1x17x1xarm64": "arn:aws:lambda:eu-west-1:901920570463:layer:aws-otel-nodejs-arm64-ver-1-17-1:1",
-    "PYTHONxSDKx1x20x0x1xx86x64": "arn:aws:lambda:eu-west-1:901920570463:layer:aws-otel-python-amd64-ver-1-20-0:3",
-    "JAVAxSDKx1x31x0xx86x64": "arn:aws:lambda:eu-west-1:901920570463:layer:aws-otel-java-wrapper-amd64-ver-1-31-0:1",
-    "JAVAxAUTOxINSTRUMENTATIONx1x31x0xx86x64": "arn:aws:lambda:eu-west-1:901920570463:layer:aws-otel-java-agent-amd64-ver-1-31-0:1",
-    "GENERICx0x88x0xx86x64": "arn:aws:lambda:eu-west-1:901920570463:layer:aws-otel-collector-amd64-ver-0-88-0:1"
-   },
-   "eu-west-2": {
-    "JAVASCRIPTxSDKx1x17x1xarm64": "arn:aws:lambda:eu-west-2:901920570463:layer:aws-otel-nodejs-arm64-ver-1-17-1:1",
-    "PYTHONxSDKx1x20x0x1xx86x64": "arn:aws:lambda:eu-west-2:901920570463:layer:aws-otel-python-amd64-ver-1-20-0:3",
-    "JAVAxSDKx1x31x0xx86x64": "arn:aws:lambda:eu-west-2:901920570463:layer:aws-otel-java-wrapper-amd64-ver-1-31-0:1",
-    "JAVAxAUTOxINSTRUMENTATIONx1x31x0xx86x64": "arn:aws:lambda:eu-west-2:901920570463:layer:aws-otel-java-agent-amd64-ver-1-31-0:1",
-    "GENERICx0x88x0xx86x64": "arn:aws:lambda:eu-west-2:901920570463:layer:aws-otel-collector-amd64-ver-0-88-0:1"
-   },
-   "eu-west-3": {
-    "JAVASCRIPTxSDKx1x17x1xarm64": "arn:aws:lambda:eu-west-3:901920570463:layer:aws-otel-nodejs-arm64-ver-1-17-1:1",
-    "PYTHONxSDKx1x20x0x1xx86x64": "arn:aws:lambda:eu-west-3:901920570463:layer:aws-otel-python-amd64-ver-1-20-0:3",
-    "JAVAxSDKx1x31x0xx86x64": "arn:aws:lambda:eu-west-3:901920570463:layer:aws-otel-java-wrapper-amd64-ver-1-31-0:1",
-    "JAVAxAUTOxINSTRUMENTATIONx1x31x0xx86x64": "arn:aws:lambda:eu-west-3:901920570463:layer:aws-otel-java-agent-amd64-ver-1-31-0:1",
-    "GENERICx0x88x0xx86x64": "arn:aws:lambda:eu-west-3:901920570463:layer:aws-otel-collector-amd64-ver-0-88-0:1"
-   },
-   "me-south-1": {
-    "JAVASCRIPTxSDKx1x17x1xarm64": "arn:aws:lambda:me-south-1:901920570463:layer:aws-otel-nodejs-arm64-ver-1-17-1:1",
-    "PYTHONxSDKx1x20x0x1xx86x64": "arn:aws:lambda:me-south-1:901920570463:layer:aws-otel-python-amd64-ver-1-20-0:3",
-    "JAVAxSDKx1x31x0xx86x64": "arn:aws:lambda:me-south-1:901920570463:layer:aws-otel-java-wrapper-amd64-ver-1-31-0:1",
-    "JAVAxAUTOxINSTRUMENTATIONx1x31x0xx86x64": "arn:aws:lambda:me-south-1:901920570463:layer:aws-otel-java-agent-amd64-ver-1-31-0:1",
-    "GENERICx0x88x0xx86x64": "arn:aws:lambda:me-south-1:901920570463:layer:aws-otel-collector-amd64-ver-0-88-0:1"
-   },
-   "sa-east-1": {
-    "JAVASCRIPTxSDKx1x17x1xarm64": "arn:aws:lambda:sa-east-1:901920570463:layer:aws-otel-nodejs-arm64-ver-1-17-1:1",
-    "PYTHONxSDKx1x20x0x1xx86x64": "arn:aws:lambda:sa-east-1:901920570463:layer:aws-otel-python-amd64-ver-1-20-0:3",
-    "JAVAxSDKx1x31x0xx86x64": "arn:aws:lambda:sa-east-1:901920570463:layer:aws-otel-java-wrapper-amd64-ver-1-31-0:1",
-    "JAVAxAUTOxINSTRUMENTATIONx1x31x0xx86x64": "arn:aws:lambda:sa-east-1:901920570463:layer:aws-otel-java-agent-amd64-ver-1-31-0:1",
-    "GENERICx0x88x0xx86x64": "arn:aws:lambda:sa-east-1:901920570463:layer:aws-otel-collector-amd64-ver-0-88-0:1"
-   },
-   "us-east-1": {
-    "JAVASCRIPTxSDKx1x17x1xarm64": "arn:aws:lambda:us-east-1:901920570463:layer:aws-otel-nodejs-arm64-ver-1-17-1:1",
-    "PYTHONxSDKx1x20x0x1xx86x64": "arn:aws:lambda:us-east-1:901920570463:layer:aws-otel-python-amd64-ver-1-20-0:3",
-    "JAVAxSDKx1x31x0xx86x64": "arn:aws:lambda:us-east-1:901920570463:layer:aws-otel-java-wrapper-amd64-ver-1-31-0:1",
-    "JAVAxAUTOxINSTRUMENTATIONx1x31x0xx86x64": "arn:aws:lambda:us-east-1:901920570463:layer:aws-otel-java-agent-amd64-ver-1-31-0:1",
-    "GENERICx0x88x0xx86x64": "arn:aws:lambda:us-east-1:901920570463:layer:aws-otel-collector-amd64-ver-0-88-0:1"
-   },
-   "us-east-2": {
-    "JAVASCRIPTxSDKx1x17x1xarm64": "arn:aws:lambda:us-east-2:901920570463:layer:aws-otel-nodejs-arm64-ver-1-17-1:1",
-    "PYTHONxSDKx1x20x0x1xx86x64": "arn:aws:lambda:us-east-2:901920570463:layer:aws-otel-python-amd64-ver-1-20-0:3",
-    "JAVAxSDKx1x31x0xx86x64": "arn:aws:lambda:us-east-2:901920570463:layer:aws-otel-java-wrapper-amd64-ver-1-31-0:1",
-    "JAVAxAUTOxINSTRUMENTATIONx1x31x0xx86x64": "arn:aws:lambda:us-east-2:901920570463:layer:aws-otel-java-agent-amd64-ver-1-31-0:1",
-    "GENERICx0x88x0xx86x64": "arn:aws:lambda:us-east-2:901920570463:layer:aws-otel-collector-amd64-ver-0-88-0:1"
-   },
-   "us-west-1": {
-    "JAVASCRIPTxSDKx1x17x1xarm64": "arn:aws:lambda:us-west-1:901920570463:layer:aws-otel-nodejs-arm64-ver-1-17-1:1",
-    "PYTHONxSDKx1x20x0x1xx86x64": "arn:aws:lambda:us-west-1:901920570463:layer:aws-otel-python-amd64-ver-1-20-0:3",
-    "JAVAxSDKx1x31x0xx86x64": "arn:aws:lambda:us-west-1:901920570463:layer:aws-otel-java-wrapper-amd64-ver-1-31-0:1",
-    "JAVAxAUTOxINSTRUMENTATIONx1x31x0xx86x64": "arn:aws:lambda:us-west-1:901920570463:layer:aws-otel-java-agent-amd64-ver-1-31-0:1",
-    "GENERICx0x88x0xx86x64": "arn:aws:lambda:us-west-1:901920570463:layer:aws-otel-collector-amd64-ver-0-88-0:1"
-   },
-   "us-west-2": {
-    "JAVASCRIPTxSDKx1x17x1xarm64": "arn:aws:lambda:us-west-2:901920570463:layer:aws-otel-nodejs-arm64-ver-1-17-1:1",
-    "PYTHONxSDKx1x20x0x1xx86x64": "arn:aws:lambda:us-west-2:901920570463:layer:aws-otel-python-amd64-ver-1-20-0:3",
-    "JAVAxSDKx1x31x0xx86x64": "arn:aws:lambda:us-west-2:901920570463:layer:aws-otel-java-wrapper-amd64-ver-1-31-0:1",
-    "JAVAxAUTOxINSTRUMENTATIONx1x31x0xx86x64": "arn:aws:lambda:us-west-2:901920570463:layer:aws-otel-java-agent-amd64-ver-1-31-0:1",
-    "GENERICx0x88x0xx86x64": "arn:aws:lambda:us-west-2:901920570463:layer:aws-otel-collector-amd64-ver-0-88-0:1"
-   }
-  }
- },
  "Parameters": {
   "BootstrapVersion": {
    "Type": "AWS::SSM::Parameter::Value<String>",
diff --git a/packages/@aws-cdk-testing/framework-integ/test/aws-lambda/test/integ.lambda-adot.js.snapshot/Stack2.assets.json b/packages/@aws-cdk-testing/framework-integ/test/aws-lambda/test/integ.lambda-adot.js.snapshot/Stack2.assets.json
index 817ca076bcb9b..51b95077e58b4 100644
--- a/packages/@aws-cdk-testing/framework-integ/test/aws-lambda/test/integ.lambda-adot.js.snapshot/Stack2.assets.json
+++ b/packages/@aws-cdk-testing/framework-integ/test/aws-lambda/test/integ.lambda-adot.js.snapshot/Stack2.assets.json
@@ -1,7 +1,7 @@
 {
   "version": "34.0.0",
   "files": {
-    "35c3cbd685ecc049b0fe621b126e29c0518b393ecf0f71216f8c03148b4cd0e1": {
+    "0a53257b39135563c9bc8a0266ed700fb15d8858f13e44c476dbfd549668a4c6": {
       "source": {
         "path": "Stack2.template.json",
         "packaging": "file"
@@ -9,7 +9,7 @@
       "destinations": {
         "current_account-current_region": {
           "bucketName": "cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}",
-          "objectKey": "35c3cbd685ecc049b0fe621b126e29c0518b393ecf0f71216f8c03148b4cd0e1.json",
+          "objectKey": "0a53257b39135563c9bc8a0266ed700fb15d8858f13e44c476dbfd549668a4c6.json",
           "assumeRoleArn": "arn:${AWS::Partition}:iam::${AWS::AccountId}:role/cdk-hnb659fds-file-publishing-role-${AWS::AccountId}-${AWS::Region}"
         }
       }
diff --git a/packages/@aws-cdk-testing/framework-integ/test/aws-lambda/test/integ.lambda-adot.js.snapshot/Stack2.template.json b/packages/@aws-cdk-testing/framework-integ/test/aws-lambda/test/integ.lambda-adot.js.snapshot/Stack2.template.json
index a07e065d220a7..3a6b00dffb107 100644
--- a/packages/@aws-cdk-testing/framework-integ/test/aws-lambda/test/integ.lambda-adot.js.snapshot/Stack2.template.json
+++ b/packages/@aws-cdk-testing/framework-integ/test/aws-lambda/test/integ.lambda-adot.js.snapshot/Stack2.template.json
@@ -72,12 +72,15 @@
     "Handler": "index.handler",
     "Layers": [
      {
-      "Fn::FindInMap": [
-       "AdotlambdalayerMap",
-       {
-        "Ref": "AWS::Region"
-       },
-       "JAVASCRIPTxSDKx1x17x1xx86x64"
+      "Fn::Join": [
+       "",
+       [
+        "arn:aws:lambda:",
+        {
+         "Ref": "AWS::Region"
+        },
+        ":901920570463:layer:aws-otel-nodejs-amd64-ver-1-17-1:1"
+       ]
       ]
      }
     ],
@@ -166,12 +169,15 @@
     "Handler": "index.handler",
     "Layers": [
      {
-      "Fn::FindInMap": [
-       "AdotlambdalayerMap",
-       {
-        "Ref": "AWS::Region"
-       },
-       "PYTHONxSDKx1x20x0x1xx86x64"
+      "Fn::Join": [
+       "",
+       [
+        "arn:aws:lambda:",
+        {
+         "Ref": "AWS::Region"
+        },
+        ":901920570463:layer:aws-otel-python-amd64-ver-1-20-0:3"
+       ]
       ]
      }
     ],
@@ -260,12 +266,15 @@
     "Handler": "index.handler",
     "Layers": [
      {
-      "Fn::FindInMap": [
-       "AdotlambdalayerMap",
-       {
-        "Ref": "AWS::Region"
-       },
-       "JAVAxSDKx1x31x0xx86x64"
+      "Fn::Join": [
+       "",
+       [
+        "arn:aws:lambda:",
+        {
+         "Ref": "AWS::Region"
+        },
+        ":901920570463:layer:aws-otel-java-wrapper-amd64-ver-1-31-0:1"
+       ]
       ]
      }
     ],
@@ -354,12 +363,15 @@
     "Handler": "index.handler",
     "Layers": [
      {
-      "Fn::FindInMap": [
-       "AdotlambdalayerMap",
-       {
-        "Ref": "AWS::Region"
-       },
-       "JAVAxAUTOxINSTRUMENTATIONx1x31x0xx86x64"
+      "Fn::Join": [
+       "",
+       [
+        "arn:aws:lambda:",
+        {
+         "Ref": "AWS::Region"
+        },
+        ":901920570463:layer:aws-otel-java-agent-amd64-ver-1-31-0:1"
+       ]
       ]
      }
     ],
@@ -448,12 +460,15 @@
     "Handler": "index.handler",
     "Layers": [
      {
-      "Fn::FindInMap": [
-       "AdotlambdalayerMap",
-       {
-        "Ref": "AWS::Region"
-       },
-       "GENERICx0x88x0xx86x64"
+      "Fn::Join": [
+       "",
+       [
+        "arn:aws:lambda:",
+        {
+         "Ref": "AWS::Region"
+        },
+        ":901920570463:layer:aws-otel-collector-amd64-ver-0-88-0:1"
+       ]
       ]
      }
     ],
@@ -474,164 +489,6 @@
    ]
   }
  },
- "Mappings": {
-  "AdotlambdalayerMap": {
-   "af-south-1": {
-    "JAVASCRIPTxSDKx1x17x1xx86x64": "arn:aws:lambda:af-south-1:901920570463:layer:aws-otel-nodejs-amd64-ver-1-17-1:1",
-    "PYTHONxSDKx1x20x0x1xx86x64": "arn:aws:lambda:af-south-1:901920570463:layer:aws-otel-python-amd64-ver-1-20-0:3",
-    "JAVAxSDKx1x31x0xx86x64": "arn:aws:lambda:af-south-1:901920570463:layer:aws-otel-java-wrapper-amd64-ver-1-31-0:1",
-    "JAVAxAUTOxINSTRUMENTATIONx1x31x0xx86x64": "arn:aws:lambda:af-south-1:901920570463:layer:aws-otel-java-agent-amd64-ver-1-31-0:1",
-    "GENERICx0x88x0xx86x64": "arn:aws:lambda:af-south-1:901920570463:layer:aws-otel-collector-amd64-ver-0-88-0:1"
-   },
-   "ap-east-1": {
-    "JAVASCRIPTxSDKx1x17x1xx86x64": "arn:aws:lambda:ap-east-1:901920570463:layer:aws-otel-nodejs-amd64-ver-1-17-1:1",
-    "PYTHONxSDKx1x20x0x1xx86x64": "arn:aws:lambda:ap-east-1:901920570463:layer:aws-otel-python-amd64-ver-1-20-0:3",
-    "JAVAxSDKx1x31x0xx86x64": "arn:aws:lambda:ap-east-1:901920570463:layer:aws-otel-java-wrapper-amd64-ver-1-31-0:1",
-    "JAVAxAUTOxINSTRUMENTATIONx1x31x0xx86x64": "arn:aws:lambda:ap-east-1:901920570463:layer:aws-otel-java-agent-amd64-ver-1-31-0:1",
-    "GENERICx0x88x0xx86x64": "arn:aws:lambda:ap-east-1:901920570463:layer:aws-otel-collector-amd64-ver-0-88-0:1"
-   },
-   "ap-northeast-1": {
-    "JAVASCRIPTxSDKx1x17x1xx86x64": "arn:aws:lambda:ap-northeast-1:901920570463:layer:aws-otel-nodejs-amd64-ver-1-17-1:1",
-    "PYTHONxSDKx1x20x0x1xx86x64": "arn:aws:lambda:ap-northeast-1:901920570463:layer:aws-otel-python-amd64-ver-1-20-0:3",
-    "JAVAxSDKx1x31x0xx86x64": "arn:aws:lambda:ap-northeast-1:901920570463:layer:aws-otel-java-wrapper-amd64-ver-1-31-0:1",
-    "JAVAxAUTOxINSTRUMENTATIONx1x31x0xx86x64": "arn:aws:lambda:ap-northeast-1:901920570463:layer:aws-otel-java-agent-amd64-ver-1-31-0:1",
-    "GENERICx0x88x0xx86x64": "arn:aws:lambda:ap-northeast-1:901920570463:layer:aws-otel-collector-amd64-ver-0-88-0:1"
-   },
-   "ap-northeast-2": {
-    "JAVASCRIPTxSDKx1x17x1xx86x64": "arn:aws:lambda:ap-northeast-2:901920570463:layer:aws-otel-nodejs-amd64-ver-1-17-1:1",
-    "PYTHONxSDKx1x20x0x1xx86x64": "arn:aws:lambda:ap-northeast-2:901920570463:layer:aws-otel-python-amd64-ver-1-20-0:3",
-    "JAVAxSDKx1x31x0xx86x64": "arn:aws:lambda:ap-northeast-2:901920570463:layer:aws-otel-java-wrapper-amd64-ver-1-31-0:1",
-    "JAVAxAUTOxINSTRUMENTATIONx1x31x0xx86x64": "arn:aws:lambda:ap-northeast-2:901920570463:layer:aws-otel-java-agent-amd64-ver-1-31-0:1",
-    "GENERICx0x88x0xx86x64": "arn:aws:lambda:ap-northeast-2:901920570463:layer:aws-otel-collector-amd64-ver-0-88-0:1"
-   },
-   "ap-south-1": {
-    "JAVASCRIPTxSDKx1x17x1xx86x64": "arn:aws:lambda:ap-south-1:901920570463:layer:aws-otel-nodejs-amd64-ver-1-17-1:1",
-    "PYTHONxSDKx1x20x0x1xx86x64": "arn:aws:lambda:ap-south-1:901920570463:layer:aws-otel-python-amd64-ver-1-20-0:3",
-    "JAVAxSDKx1x31x0xx86x64": "arn:aws:lambda:ap-south-1:901920570463:layer:aws-otel-java-wrapper-amd64-ver-1-31-0:1",
-    "JAVAxAUTOxINSTRUMENTATIONx1x31x0xx86x64": "arn:aws:lambda:ap-south-1:901920570463:layer:aws-otel-java-agent-amd64-ver-1-31-0:1",
-    "GENERICx0x88x0xx86x64": "arn:aws:lambda:ap-south-1:901920570463:layer:aws-otel-collector-amd64-ver-0-88-0:1"
-   },
-   "ap-southeast-1": {
-    "JAVASCRIPTxSDKx1x17x1xx86x64": "arn:aws:lambda:ap-southeast-1:901920570463:layer:aws-otel-nodejs-amd64-ver-1-17-1:1",
-    "PYTHONxSDKx1x20x0x1xx86x64": "arn:aws:lambda:ap-southeast-1:901920570463:layer:aws-otel-python-amd64-ver-1-20-0:3",
-    "JAVAxSDKx1x31x0xx86x64": "arn:aws:lambda:ap-southeast-1:901920570463:layer:aws-otel-java-wrapper-amd64-ver-1-31-0:1",
-    "JAVAxAUTOxINSTRUMENTATIONx1x31x0xx86x64": "arn:aws:lambda:ap-southeast-1:901920570463:layer:aws-otel-java-agent-amd64-ver-1-31-0:1",
-    "GENERICx0x88x0xx86x64": "arn:aws:lambda:ap-southeast-1:901920570463:layer:aws-otel-collector-amd64-ver-0-88-0:1"
-   },
-   "ap-southeast-2": {
-    "JAVASCRIPTxSDKx1x17x1xx86x64": "arn:aws:lambda:ap-southeast-2:901920570463:layer:aws-otel-nodejs-amd64-ver-1-17-1:1",
-    "PYTHONxSDKx1x20x0x1xx86x64": "arn:aws:lambda:ap-southeast-2:901920570463:layer:aws-otel-python-amd64-ver-1-20-0:3",
-    "JAVAxSDKx1x31x0xx86x64": "arn:aws:lambda:ap-southeast-2:901920570463:layer:aws-otel-java-wrapper-amd64-ver-1-31-0:1",
-    "JAVAxAUTOxINSTRUMENTATIONx1x31x0xx86x64": "arn:aws:lambda:ap-southeast-2:901920570463:layer:aws-otel-java-agent-amd64-ver-1-31-0:1",
-    "GENERICx0x88x0xx86x64": "arn:aws:lambda:ap-southeast-2:901920570463:layer:aws-otel-collector-amd64-ver-0-88-0:1"
-   },
-   "ca-central-1": {
-    "JAVASCRIPTxSDKx1x17x1xx86x64": "arn:aws:lambda:ca-central-1:901920570463:layer:aws-otel-nodejs-amd64-ver-1-17-1:1",
-    "PYTHONxSDKx1x20x0x1xx86x64": "arn:aws:lambda:ca-central-1:901920570463:layer:aws-otel-python-amd64-ver-1-20-0:3",
-    "JAVAxSDKx1x31x0xx86x64": "arn:aws:lambda:ca-central-1:901920570463:layer:aws-otel-java-wrapper-amd64-ver-1-31-0:1",
-    "JAVAxAUTOxINSTRUMENTATIONx1x31x0xx86x64": "arn:aws:lambda:ca-central-1:901920570463:layer:aws-otel-java-agent-amd64-ver-1-31-0:1",
-    "GENERICx0x88x0xx86x64": "arn:aws:lambda:ca-central-1:901920570463:layer:aws-otel-collector-amd64-ver-0-88-0:1"
-   },
-   "cn-north-1": {
-    "JAVASCRIPTxSDKx1x17x1xx86x64": "arn:aws-cn:lambda:cn-north-1:901920570463:layer:aws-otel-nodejs-amd64-ver-1-17-1:1",
-    "PYTHONxSDKx1x20x0x1xx86x64": "arn:aws-cn:lambda:cn-north-1:901920570463:layer:aws-otel-python-amd64-ver-1-20-0:3",
-    "JAVAxSDKx1x31x0xx86x64": "arn:aws-cn:lambda:cn-north-1:901920570463:layer:aws-otel-java-wrapper-amd64-ver-1-31-0:1",
-    "JAVAxAUTOxINSTRUMENTATIONx1x31x0xx86x64": "arn:aws-cn:lambda:cn-north-1:901920570463:layer:aws-otel-java-agent-amd64-ver-1-31-0:1",
-    "GENERICx0x88x0xx86x64": "arn:aws-cn:lambda:cn-north-1:901920570463:layer:aws-otel-collector-amd64-ver-0-88-0:1"
-   },
-   "cn-northwest-1": {
-    "JAVASCRIPTxSDKx1x17x1xx86x64": "arn:aws-cn:lambda:cn-northwest-1:901920570463:layer:aws-otel-nodejs-amd64-ver-1-17-1:1",
-    "PYTHONxSDKx1x20x0x1xx86x64": "arn:aws-cn:lambda:cn-northwest-1:901920570463:layer:aws-otel-python-amd64-ver-1-20-0:3",
-    "JAVAxSDKx1x31x0xx86x64": "arn:aws-cn:lambda:cn-northwest-1:901920570463:layer:aws-otel-java-wrapper-amd64-ver-1-31-0:1",
-    "JAVAxAUTOxINSTRUMENTATIONx1x31x0xx86x64": "arn:aws-cn:lambda:cn-northwest-1:901920570463:layer:aws-otel-java-agent-amd64-ver-1-31-0:1",
-    "GENERICx0x88x0xx86x64": "arn:aws-cn:lambda:cn-northwest-1:901920570463:layer:aws-otel-collector-amd64-ver-0-88-0:1"
-   },
-   "eu-central-1": {
-    "JAVASCRIPTxSDKx1x17x1xx86x64": "arn:aws:lambda:eu-central-1:901920570463:layer:aws-otel-nodejs-amd64-ver-1-17-1:1",
-    "PYTHONxSDKx1x20x0x1xx86x64": "arn:aws:lambda:eu-central-1:901920570463:layer:aws-otel-python-amd64-ver-1-20-0:3",
-    "JAVAxSDKx1x31x0xx86x64": "arn:aws:lambda:eu-central-1:901920570463:layer:aws-otel-java-wrapper-amd64-ver-1-31-0:1",
-    "JAVAxAUTOxINSTRUMENTATIONx1x31x0xx86x64": "arn:aws:lambda:eu-central-1:901920570463:layer:aws-otel-java-agent-amd64-ver-1-31-0:1",
-    "GENERICx0x88x0xx86x64": "arn:aws:lambda:eu-central-1:901920570463:layer:aws-otel-collector-amd64-ver-0-88-0:1"
-   },
-   "eu-north-1": {
-    "JAVASCRIPTxSDKx1x17x1xx86x64": "arn:aws:lambda:eu-north-1:901920570463:layer:aws-otel-nodejs-amd64-ver-1-17-1:1",
-    "PYTHONxSDKx1x20x0x1xx86x64": "arn:aws:lambda:eu-north-1:901920570463:layer:aws-otel-python-amd64-ver-1-20-0:3",
-    "JAVAxSDKx1x31x0xx86x64": "arn:aws:lambda:eu-north-1:901920570463:layer:aws-otel-java-wrapper-amd64-ver-1-31-0:1",
-    "JAVAxAUTOxINSTRUMENTATIONx1x31x0xx86x64": "arn:aws:lambda:eu-north-1:901920570463:layer:aws-otel-java-agent-amd64-ver-1-31-0:1",
-    "GENERICx0x88x0xx86x64": "arn:aws:lambda:eu-north-1:901920570463:layer:aws-otel-collector-amd64-ver-0-88-0:1"
-   },
-   "eu-south-1": {
-    "JAVASCRIPTxSDKx1x17x1xx86x64": "arn:aws:lambda:eu-south-1:901920570463:layer:aws-otel-nodejs-amd64-ver-1-17-1:1",
-    "PYTHONxSDKx1x20x0x1xx86x64": "arn:aws:lambda:eu-south-1:901920570463:layer:aws-otel-python-amd64-ver-1-20-0:3",
-    "JAVAxSDKx1x31x0xx86x64": "arn:aws:lambda:eu-south-1:901920570463:layer:aws-otel-java-wrapper-amd64-ver-1-31-0:1",
-    "JAVAxAUTOxINSTRUMENTATIONx1x31x0xx86x64": "arn:aws:lambda:eu-south-1:901920570463:layer:aws-otel-java-agent-amd64-ver-1-31-0:1",
-    "GENERICx0x88x0xx86x64": "arn:aws:lambda:eu-south-1:901920570463:layer:aws-otel-collector-amd64-ver-0-88-0:1"
-   },
-   "eu-west-1": {
-    "JAVASCRIPTxSDKx1x17x1xx86x64": "arn:aws:lambda:eu-west-1:901920570463:layer:aws-otel-nodejs-amd64-ver-1-17-1:1",
-    "PYTHONxSDKx1x20x0x1xx86x64": "arn:aws:lambda:eu-west-1:901920570463:layer:aws-otel-python-amd64-ver-1-20-0:3",
-    "JAVAxSDKx1x31x0xx86x64": "arn:aws:lambda:eu-west-1:901920570463:layer:aws-otel-java-wrapper-amd64-ver-1-31-0:1",
-    "JAVAxAUTOxINSTRUMENTATIONx1x31x0xx86x64": "arn:aws:lambda:eu-west-1:901920570463:layer:aws-otel-java-agent-amd64-ver-1-31-0:1",
-    "GENERICx0x88x0xx86x64": "arn:aws:lambda:eu-west-1:901920570463:layer:aws-otel-collector-amd64-ver-0-88-0:1"
-   },
-   "eu-west-2": {
-    "JAVASCRIPTxSDKx1x17x1xx86x64": "arn:aws:lambda:eu-west-2:901920570463:layer:aws-otel-nodejs-amd64-ver-1-17-1:1",
-    "PYTHONxSDKx1x20x0x1xx86x64": "arn:aws:lambda:eu-west-2:901920570463:layer:aws-otel-python-amd64-ver-1-20-0:3",
-    "JAVAxSDKx1x31x0xx86x64": "arn:aws:lambda:eu-west-2:901920570463:layer:aws-otel-java-wrapper-amd64-ver-1-31-0:1",
-    "JAVAxAUTOxINSTRUMENTATIONx1x31x0xx86x64": "arn:aws:lambda:eu-west-2:901920570463:layer:aws-otel-java-agent-amd64-ver-1-31-0:1",
-    "GENERICx0x88x0xx86x64": "arn:aws:lambda:eu-west-2:901920570463:layer:aws-otel-collector-amd64-ver-0-88-0:1"
-   },
-   "eu-west-3": {
-    "JAVASCRIPTxSDKx1x17x1xx86x64": "arn:aws:lambda:eu-west-3:901920570463:layer:aws-otel-nodejs-amd64-ver-1-17-1:1",
-    "PYTHONxSDKx1x20x0x1xx86x64": "arn:aws:lambda:eu-west-3:901920570463:layer:aws-otel-python-amd64-ver-1-20-0:3",
-    "JAVAxSDKx1x31x0xx86x64": "arn:aws:lambda:eu-west-3:901920570463:layer:aws-otel-java-wrapper-amd64-ver-1-31-0:1",
-    "JAVAxAUTOxINSTRUMENTATIONx1x31x0xx86x64": "arn:aws:lambda:eu-west-3:901920570463:layer:aws-otel-java-agent-amd64-ver-1-31-0:1",
-    "GENERICx0x88x0xx86x64": "arn:aws:lambda:eu-west-3:901920570463:layer:aws-otel-collector-amd64-ver-0-88-0:1"
-   },
-   "me-south-1": {
-    "JAVASCRIPTxSDKx1x17x1xx86x64": "arn:aws:lambda:me-south-1:901920570463:layer:aws-otel-nodejs-amd64-ver-1-17-1:1",
-    "PYTHONxSDKx1x20x0x1xx86x64": "arn:aws:lambda:me-south-1:901920570463:layer:aws-otel-python-amd64-ver-1-20-0:3",
-    "JAVAxSDKx1x31x0xx86x64": "arn:aws:lambda:me-south-1:901920570463:layer:aws-otel-java-wrapper-amd64-ver-1-31-0:1",
-    "JAVAxAUTOxINSTRUMENTATIONx1x31x0xx86x64": "arn:aws:lambda:me-south-1:901920570463:layer:aws-otel-java-agent-amd64-ver-1-31-0:1",
-    "GENERICx0x88x0xx86x64": "arn:aws:lambda:me-south-1:901920570463:layer:aws-otel-collector-amd64-ver-0-88-0:1"
-   },
-   "sa-east-1": {
-    "JAVASCRIPTxSDKx1x17x1xx86x64": "arn:aws:lambda:sa-east-1:901920570463:layer:aws-otel-nodejs-amd64-ver-1-17-1:1",
-    "PYTHONxSDKx1x20x0x1xx86x64": "arn:aws:lambda:sa-east-1:901920570463:layer:aws-otel-python-amd64-ver-1-20-0:3",
-    "JAVAxSDKx1x31x0xx86x64": "arn:aws:lambda:sa-east-1:901920570463:layer:aws-otel-java-wrapper-amd64-ver-1-31-0:1",
-    "JAVAxAUTOxINSTRUMENTATIONx1x31x0xx86x64": "arn:aws:lambda:sa-east-1:901920570463:layer:aws-otel-java-agent-amd64-ver-1-31-0:1",
-    "GENERICx0x88x0xx86x64": "arn:aws:lambda:sa-east-1:901920570463:layer:aws-otel-collector-amd64-ver-0-88-0:1"
-   },
-   "us-east-1": {
-    "JAVASCRIPTxSDKx1x17x1xx86x64": "arn:aws:lambda:us-east-1:901920570463:layer:aws-otel-nodejs-amd64-ver-1-17-1:1",
-    "PYTHONxSDKx1x20x0x1xx86x64": "arn:aws:lambda:us-east-1:901920570463:layer:aws-otel-python-amd64-ver-1-20-0:3",
-    "JAVAxSDKx1x31x0xx86x64": "arn:aws:lambda:us-east-1:901920570463:layer:aws-otel-java-wrapper-amd64-ver-1-31-0:1",
-    "JAVAxAUTOxINSTRUMENTATIONx1x31x0xx86x64": "arn:aws:lambda:us-east-1:901920570463:layer:aws-otel-java-agent-amd64-ver-1-31-0:1",
-    "GENERICx0x88x0xx86x64": "arn:aws:lambda:us-east-1:901920570463:layer:aws-otel-collector-amd64-ver-0-88-0:1"
-   },
-   "us-east-2": {
-    "JAVASCRIPTxSDKx1x17x1xx86x64": "arn:aws:lambda:us-east-2:901920570463:layer:aws-otel-nodejs-amd64-ver-1-17-1:1",
-    "PYTHONxSDKx1x20x0x1xx86x64": "arn:aws:lambda:us-east-2:901920570463:layer:aws-otel-python-amd64-ver-1-20-0:3",
-    "JAVAxSDKx1x31x0xx86x64": "arn:aws:lambda:us-east-2:901920570463:layer:aws-otel-java-wrapper-amd64-ver-1-31-0:1",
-    "JAVAxAUTOxINSTRUMENTATIONx1x31x0xx86x64": "arn:aws:lambda:us-east-2:901920570463:layer:aws-otel-java-agent-amd64-ver-1-31-0:1",
-    "GENERICx0x88x0xx86x64": "arn:aws:lambda:us-east-2:901920570463:layer:aws-otel-collector-amd64-ver-0-88-0:1"
-   },
-   "us-west-1": {
-    "JAVASCRIPTxSDKx1x17x1xx86x64": "arn:aws:lambda:us-west-1:901920570463:layer:aws-otel-nodejs-amd64-ver-1-17-1:1",
-    "PYTHONxSDKx1x20x0x1xx86x64": "arn:aws:lambda:us-west-1:901920570463:layer:aws-otel-python-amd64-ver-1-20-0:3",
-    "JAVAxSDKx1x31x0xx86x64": "arn:aws:lambda:us-west-1:901920570463:layer:aws-otel-java-wrapper-amd64-ver-1-31-0:1",
-    "JAVAxAUTOxINSTRUMENTATIONx1x31x0xx86x64": "arn:aws:lambda:us-west-1:901920570463:layer:aws-otel-java-agent-amd64-ver-1-31-0:1",
-    "GENERICx0x88x0xx86x64": "arn:aws:lambda:us-west-1:901920570463:layer:aws-otel-collector-amd64-ver-0-88-0:1"
-   },
-   "us-west-2": {
-    "JAVASCRIPTxSDKx1x17x1xx86x64": "arn:aws:lambda:us-west-2:901920570463:layer:aws-otel-nodejs-amd64-ver-1-17-1:1",
-    "PYTHONxSDKx1x20x0x1xx86x64": "arn:aws:lambda:us-west-2:901920570463:layer:aws-otel-python-amd64-ver-1-20-0:3",
-    "JAVAxSDKx1x31x0xx86x64": "arn:aws:lambda:us-west-2:901920570463:layer:aws-otel-java-wrapper-amd64-ver-1-31-0:1",
-    "JAVAxAUTOxINSTRUMENTATIONx1x31x0xx86x64": "arn:aws:lambda:us-west-2:901920570463:layer:aws-otel-java-agent-amd64-ver-1-31-0:1",
-    "GENERICx0x88x0xx86x64": "arn:aws:lambda:us-west-2:901920570463:layer:aws-otel-collector-amd64-ver-0-88-0:1"
-   }
-  }
- },
  "Parameters": {
   "BootstrapVersion": {
    "Type": "AWS::SSM::Parameter::Value<String>",
diff --git a/packages/@aws-cdk-testing/framework-integ/test/aws-lambda/test/integ.lambda-adot.js.snapshot/manifest.json b/packages/@aws-cdk-testing/framework-integ/test/aws-lambda/test/integ.lambda-adot.js.snapshot/manifest.json
index e5d2818cc0de2..b586de7a08483 100644
--- a/packages/@aws-cdk-testing/framework-integ/test/aws-lambda/test/integ.lambda-adot.js.snapshot/manifest.json
+++ b/packages/@aws-cdk-testing/framework-integ/test/aws-lambda/test/integ.lambda-adot.js.snapshot/manifest.json
@@ -18,7 +18,7 @@
         "validateOnSynth": false,
         "assumeRoleArn": "arn:${AWS::Partition}:iam::${AWS::AccountId}:role/cdk-hnb659fds-deploy-role-${AWS::AccountId}-${AWS::Region}",
         "cloudFormationExecutionRoleArn": "arn:${AWS::Partition}:iam::${AWS::AccountId}:role/cdk-hnb659fds-cfn-exec-role-${AWS::AccountId}-${AWS::Region}",
-        "stackTemplateAssetObjectUrl": "s3://cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}/ae04dd3f0004ce77c36dcaada8149a164df570df8fcdcdbcbde1e696dc1c10b1.json",
+        "stackTemplateAssetObjectUrl": "s3://cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}/75e2bf084797f71f99ed5cb6f35bb6f1ee8a42cbbdb4ccd99008c5792941bbed.json",
         "requiresBootstrapStackVersion": 6,
         "bootstrapStackVersionSsmParameter": "/cdk-bootstrap/hnb659fds/version",
         "additionalDependencies": [
@@ -52,12 +52,6 @@
             "data": "MyFunc11BE70A62"
           }
         ],
-        "/Stack1/Adot-lambda-layerMap": [
-          {
-            "type": "aws:cdk:logicalId",
-            "data": "AdotlambdalayerMap"
-          }
-        ],
         "/Stack1/MyFunc2/ServiceRole/Resource": [
           {
             "type": "aws:cdk:logicalId",
@@ -162,7 +156,7 @@
         "validateOnSynth": false,
         "assumeRoleArn": "arn:${AWS::Partition}:iam::${AWS::AccountId}:role/cdk-hnb659fds-deploy-role-${AWS::AccountId}-${AWS::Region}",
         "cloudFormationExecutionRoleArn": "arn:${AWS::Partition}:iam::${AWS::AccountId}:role/cdk-hnb659fds-cfn-exec-role-${AWS::AccountId}-${AWS::Region}",
-        "stackTemplateAssetObjectUrl": "s3://cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}/35c3cbd685ecc049b0fe621b126e29c0518b393ecf0f71216f8c03148b4cd0e1.json",
+        "stackTemplateAssetObjectUrl": "s3://cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}/0a53257b39135563c9bc8a0266ed700fb15d8858f13e44c476dbfd549668a4c6.json",
         "requiresBootstrapStackVersion": 6,
         "bootstrapStackVersionSsmParameter": "/cdk-bootstrap/hnb659fds/version",
         "additionalDependencies": [
@@ -196,12 +190,6 @@
             "data": "MyFunc11BE70A62"
           }
         ],
-        "/Stack2/Adot-lambda-layerMap": [
-          {
-            "type": "aws:cdk:logicalId",
-            "data": "AdotlambdalayerMap"
-          }
-        ],
         "/Stack2/MyFunc2/ServiceRole/Resource": [
           {
             "type": "aws:cdk:logicalId",
diff --git a/packages/@aws-cdk-testing/framework-integ/test/aws-lambda/test/integ.lambda-adot.js.snapshot/tree.json b/packages/@aws-cdk-testing/framework-integ/test/aws-lambda/test/integ.lambda-adot.js.snapshot/tree.json
index 5f75d92d93df0..62bd8473a9778 100644
--- a/packages/@aws-cdk-testing/framework-integ/test/aws-lambda/test/integ.lambda-adot.js.snapshot/tree.json
+++ b/packages/@aws-cdk-testing/framework-integ/test/aws-lambda/test/integ.lambda-adot.js.snapshot/tree.json
@@ -131,12 +131,15 @@
                     "handler": "index.handler",
                     "layers": [
                       {
-                        "Fn::FindInMap": [
-                          "AdotlambdalayerMap",
-                          {
-                            "Ref": "AWS::Region"
-                          },
-                          "JAVASCRIPTxSDKx1x17x1xarm64"
+                        "Fn::Join": [
+                          "",
+                          [
+                            "arn:aws:lambda:",
+                            {
+                              "Ref": "AWS::Region"
+                            },
+                            ":901920570463:layer:aws-otel-nodejs-arm64-ver-1-17-1:1"
+                          ]
                         ]
                       }
                     ],
@@ -171,14 +174,6 @@
               "version": "0.0.0"
             }
           },
-          "Adot-lambda-layerMap": {
-            "id": "Adot-lambda-layerMap",
-            "path": "Stack1/Adot-lambda-layerMap",
-            "constructInfo": {
-              "fqn": "aws-cdk-lib.CfnMapping",
-              "version": "0.0.0"
-            }
-          },
           "MyFunc2": {
             "id": "MyFunc2",
             "path": "Stack1/MyFunc2",
@@ -299,12 +294,15 @@
                     "handler": "index.handler",
                     "layers": [
                       {
-                        "Fn::FindInMap": [
-                          "AdotlambdalayerMap",
-                          {
-                            "Ref": "AWS::Region"
-                          },
-                          "PYTHONxSDKx1x20x0x1xx86x64"
+                        "Fn::Join": [
+                          "",
+                          [
+                            "arn:aws:lambda:",
+                            {
+                              "Ref": "AWS::Region"
+                            },
+                            ":901920570463:layer:aws-otel-python-amd64-ver-1-20-0:3"
+                          ]
                         ]
                       }
                     ],
@@ -459,12 +457,15 @@
                     "handler": "index.handler",
                     "layers": [
                       {
-                        "Fn::FindInMap": [
-                          "AdotlambdalayerMap",
-                          {
-                            "Ref": "AWS::Region"
-                          },
-                          "JAVAxSDKx1x31x0xx86x64"
+                        "Fn::Join": [
+                          "",
+                          [
+                            "arn:aws:lambda:",
+                            {
+                              "Ref": "AWS::Region"
+                            },
+                            ":901920570463:layer:aws-otel-java-wrapper-amd64-ver-1-31-0:1"
+                          ]
                         ]
                       }
                     ],
@@ -619,12 +620,15 @@
                     "handler": "index.handler",
                     "layers": [
                       {
-                        "Fn::FindInMap": [
-                          "AdotlambdalayerMap",
-                          {
-                            "Ref": "AWS::Region"
-                          },
-                          "JAVAxAUTOxINSTRUMENTATIONx1x31x0xx86x64"
+                        "Fn::Join": [
+                          "",
+                          [
+                            "arn:aws:lambda:",
+                            {
+                              "Ref": "AWS::Region"
+                            },
+                            ":901920570463:layer:aws-otel-java-agent-amd64-ver-1-31-0:1"
+                          ]
                         ]
                       }
                     ],
@@ -779,12 +783,15 @@
                     "handler": "index.handler",
                     "layers": [
                       {
-                        "Fn::FindInMap": [
-                          "AdotlambdalayerMap",
-                          {
-                            "Ref": "AWS::Region"
-                          },
-                          "GENERICx0x88x0xx86x64"
+                        "Fn::Join": [
+                          "",
+                          [
+                            "arn:aws:lambda:",
+                            {
+                              "Ref": "AWS::Region"
+                            },
+                            ":901920570463:layer:aws-otel-collector-amd64-ver-0-88-0:1"
+                          ]
                         ]
                       }
                     ],
@@ -968,12 +975,15 @@
                     "handler": "index.handler",
                     "layers": [
                       {
-                        "Fn::FindInMap": [
-                          "AdotlambdalayerMap",
-                          {
-                            "Ref": "AWS::Region"
-                          },
-                          "JAVASCRIPTxSDKx1x17x1xx86x64"
+                        "Fn::Join": [
+                          "",
+                          [
+                            "arn:aws:lambda:",
+                            {
+                              "Ref": "AWS::Region"
+                            },
+                            ":901920570463:layer:aws-otel-nodejs-amd64-ver-1-17-1:1"
+                          ]
                         ]
                       }
                     ],
@@ -1008,14 +1018,6 @@
               "version": "0.0.0"
             }
           },
-          "Adot-lambda-layerMap": {
-            "id": "Adot-lambda-layerMap",
-            "path": "Stack2/Adot-lambda-layerMap",
-            "constructInfo": {
-              "fqn": "aws-cdk-lib.CfnMapping",
-              "version": "0.0.0"
-            }
-          },
           "MyFunc2": {
             "id": "MyFunc2",
             "path": "Stack2/MyFunc2",
@@ -1136,12 +1138,15 @@
                     "handler": "index.handler",
                     "layers": [
                       {
-                        "Fn::FindInMap": [
-                          "AdotlambdalayerMap",
-                          {
-                            "Ref": "AWS::Region"
-                          },
-                          "PYTHONxSDKx1x20x0x1xx86x64"
+                        "Fn::Join": [
+                          "",
+                          [
+                            "arn:aws:lambda:",
+                            {
+                              "Ref": "AWS::Region"
+                            },
+                            ":901920570463:layer:aws-otel-python-amd64-ver-1-20-0:3"
+                          ]
                         ]
                       }
                     ],
@@ -1296,12 +1301,15 @@
                     "handler": "index.handler",
                     "layers": [
                       {
-                        "Fn::FindInMap": [
-                          "AdotlambdalayerMap",
-                          {
-                            "Ref": "AWS::Region"
-                          },
-                          "JAVAxSDKx1x31x0xx86x64"
+                        "Fn::Join": [
+                          "",
+                          [
+                            "arn:aws:lambda:",
+                            {
+                              "Ref": "AWS::Region"
+                            },
+                            ":901920570463:layer:aws-otel-java-wrapper-amd64-ver-1-31-0:1"
+                          ]
                         ]
                       }
                     ],
@@ -1456,12 +1464,15 @@
                     "handler": "index.handler",
                     "layers": [
                       {
-                        "Fn::FindInMap": [
-                          "AdotlambdalayerMap",
-                          {
-                            "Ref": "AWS::Region"
-                          },
-                          "JAVAxAUTOxINSTRUMENTATIONx1x31x0xx86x64"
+                        "Fn::Join": [
+                          "",
+                          [
+                            "arn:aws:lambda:",
+                            {
+                              "Ref": "AWS::Region"
+                            },
+                            ":901920570463:layer:aws-otel-java-agent-amd64-ver-1-31-0:1"
+                          ]
                         ]
                       }
                     ],
@@ -1616,12 +1627,15 @@
                     "handler": "index.handler",
                     "layers": [
                       {
-                        "Fn::FindInMap": [
-                          "AdotlambdalayerMap",
-                          {
-                            "Ref": "AWS::Region"
-                          },
-                          "GENERICx0x88x0xx86x64"
+                        "Fn::Join": [
+                          "",
+                          [
+                            "arn:aws:lambda:",
+                            {
+                              "Ref": "AWS::Region"
+                            },
+                            ":901920570463:layer:aws-otel-collector-amd64-ver-0-88-0:1"
+                          ]
                         ]
                       }
                     ],