diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 0d602ff7b..84bd32b0e 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -28,7 +28,7 @@ jobs:
           ~/.sbt
           ~/.coursier/cache/v1
           ~/.cache/coursier/v1
-        key: ubuntu-latest-sbt-2.13.10-${{ hashFiles('**/*.sbt') }}-${{ hashFiles('**/build.properties')
+        key: ubuntu-latest-sbt-2.13.12-${{ hashFiles('**/*.sbt') }}-${{ hashFiles('**/build.properties')
           }}
     - name: Setup GIT user
       uses: fregante/setup-git-user@v1
@@ -48,9 +48,9 @@ jobs:
         os:
         - ubuntu-latest
         scala:
-        - 2.12.17
-        - 2.13.10
-        - 3.2.1
+        - 2.12.18
+        - 2.13.12
+        - 3.3.1
         java:
         - adopt@1.8
     needs:
@@ -109,9 +109,9 @@ jobs:
         os:
         - ubuntu-latest
         scala:
-        - 2.12.17
-        - 2.13.10
-        - 3.2.1
+        - 2.12.18
+        - 2.13.12
+        - 3.3.1
         java:
         - adopt@1.8
     needs:
@@ -163,11 +163,11 @@ jobs:
       if: ${{ matrix.scala == '2.12.18' }}
       run: sbt -J-XX:+UseG1GC -J-Xmx5g -J-Xms5g -J-Xss16m ++${{ matrix.scala }} integtests/test
     - name: Build and run tests
-      if: ${{ (matrix.scala != '3.2.1') && (matrix.scala != '2.12.18') }}
+      if: ${{ (matrix.scala != '3.3.1') && (matrix.scala != '2.12.18') }}
       run: sbt -J-XX:+UseG1GC -J-Xmx5g -J-Xms5g -J-Xss16m ++${{ matrix.scala }} examples/compile
         integtests/test
     - name: Build and run tests
-      if: ${{ matrix.scala == '3.2.1' }}
+      if: ${{ matrix.scala == '3.3.1' }}
       run: sbt -J-XX:+UseG1GC -J-Xmx5g -J-Xms5g -J-Xss16m ++${{ matrix.scala }} examples/compile
     - name: Collect Docker logs
       uses: jwalton/gh-docker-logs@v1
@@ -180,9 +180,9 @@ jobs:
         os:
         - ubuntu-latest
         scala:
-        - 2.12.17
-        - 2.13.10
-        - 3.2.1
+        - 2.12.18
+        - 2.13.12
+        - 3.3.1
         java:
         - adopt@1.8
     needs:
@@ -231,24 +231,26 @@ jobs:
         zio-aws-amp/compile zio-aws-amplify/compile zio-aws-amplifybackend/compile
         zio-aws-amplifyuibuilder/compile zio-aws-apigateway/compile zio-aws-apigatewaymanagementapi/compile
         zio-aws-apigatewayv2/compile zio-aws-appconfig/compile zio-aws-appconfigdata/compile
-        zio-aws-appflow/compile zio-aws-appintegrations/compile zio-aws-applicationautoscaling/compile
-        zio-aws-applicationcostprofiler/compile zio-aws-applicationdiscovery/compile
-        zio-aws-applicationinsights/compile zio-aws-appmesh/compile zio-aws-apprunner/compile
-        zio-aws-appstream/compile zio-aws-appsync/compile zio-aws-arczonalshift/compile
-        zio-aws-athena/compile zio-aws-auditmanager/compile zio-aws-autoscaling/compile
-        zio-aws-autoscalingplans/compile zio-aws-backup/compile zio-aws-backupgateway/compile
-        zio-aws-backupstorage/compile zio-aws-batch/compile zio-aws-billingconductor/compile
+        zio-aws-appfabric/compile zio-aws-appflow/compile zio-aws-appintegrations/compile
+        zio-aws-applicationautoscaling/compile zio-aws-applicationcostprofiler/compile
+        zio-aws-applicationdiscovery/compile zio-aws-applicationinsights/compile zio-aws-appmesh/compile
+        zio-aws-apprunner/compile zio-aws-appstream/compile zio-aws-appsync/compile
+        zio-aws-arczonalshift/compile zio-aws-athena/compile zio-aws-auditmanager/compile
+        zio-aws-autoscaling/compile zio-aws-autoscalingplans/compile zio-aws-backup/compile
+        zio-aws-backupgateway/compile zio-aws-backupstorage/compile zio-aws-batch/compile
+        zio-aws-bedrock/compile zio-aws-bedrockruntime/compile zio-aws-billingconductor/compile
         zio-aws-braket/compile zio-aws-budgets/compile zio-aws-chime/compile zio-aws-chimesdkidentity/compile
         zio-aws-chimesdkmediapipelines/compile zio-aws-chimesdkmeetings/compile zio-aws-chimesdkmessaging/compile
-        zio-aws-chimesdkvoice/compile zio-aws-cloud9/compile zio-aws-cloudcontrol/compile
-        zio-aws-clouddirectory/compile zio-aws-cloudformation/compile zio-aws-cloudfront/compile
-        zio-aws-cloudhsm/compile zio-aws-cloudhsmv2/compile zio-aws-cloudsearch/compile
-        zio-aws-cloudsearchdomain/compile zio-aws-cloudtrail/compile zio-aws-cloudwatch/compile
-        zio-aws-cloudwatchevents/compile zio-aws-cloudwatchlogs/compile zio-aws-codeartifact/compile
-        zio-aws-codebuild/compile zio-aws-codecatalyst/compile zio-aws-codecommit/compile
-        zio-aws-codedeploy/compile zio-aws-codeguruprofiler/compile zio-aws-codegurureviewer/compile
+        zio-aws-chimesdkvoice/compile zio-aws-cleanrooms/compile zio-aws-cloud9/compile
+        zio-aws-cloudcontrol/compile zio-aws-clouddirectory/compile zio-aws-cloudformation/compile
+        zio-aws-cloudfront/compile zio-aws-cloudhsm/compile zio-aws-cloudhsmv2/compile
+        zio-aws-cloudsearch/compile zio-aws-cloudsearchdomain/compile zio-aws-cloudtrail/compile
+        zio-aws-cloudtraildata/compile zio-aws-cloudwatch/compile zio-aws-cloudwatchevents/compile
+        zio-aws-cloudwatchlogs/compile zio-aws-codeartifact/compile zio-aws-codebuild/compile
+        zio-aws-codecatalyst/compile zio-aws-codecommit/compile zio-aws-codedeploy/compile
+        zio-aws-codeguruprofiler/compile zio-aws-codegurureviewer/compile zio-aws-codegurusecurity/compile
         zio-aws-codepipeline/compile zio-aws-codestar/compile zio-aws-codestarconnections/compile
-        zio-aws-codestarnotifications/compile zio-aws-cognitoidentity/compile
+        zio-aws-codestarnotifications/compile
     - name: Build and publish libraries
       if: ${{ github.ref == 'refs/heads/master' }}
       run: sbt -J-XX:+UseG1GC -J-Xmx6g -J-Xms6g -J-Xss16m ++${{ matrix.scala }} zio-aws-accessanalyzer/publishSigned
@@ -257,26 +259,28 @@ jobs:
         zio-aws-amplifybackend/publishSigned zio-aws-amplifyuibuilder/publishSigned
         zio-aws-apigateway/publishSigned zio-aws-apigatewaymanagementapi/publishSigned
         zio-aws-apigatewayv2/publishSigned zio-aws-appconfig/publishSigned zio-aws-appconfigdata/publishSigned
-        zio-aws-appflow/publishSigned zio-aws-appintegrations/publishSigned zio-aws-applicationautoscaling/publishSigned
-        zio-aws-applicationcostprofiler/publishSigned zio-aws-applicationdiscovery/publishSigned
-        zio-aws-applicationinsights/publishSigned zio-aws-appmesh/publishSigned zio-aws-apprunner/publishSigned
-        zio-aws-appstream/publishSigned zio-aws-appsync/publishSigned zio-aws-arczonalshift/publishSigned
-        zio-aws-athena/publishSigned zio-aws-auditmanager/publishSigned zio-aws-autoscaling/publishSigned
-        zio-aws-autoscalingplans/publishSigned zio-aws-backup/publishSigned zio-aws-backupgateway/publishSigned
-        zio-aws-backupstorage/publishSigned zio-aws-batch/publishSigned zio-aws-billingconductor/publishSigned
-        zio-aws-braket/publishSigned zio-aws-budgets/publishSigned zio-aws-chime/publishSigned
-        zio-aws-chimesdkidentity/publishSigned zio-aws-chimesdkmediapipelines/publishSigned
+        zio-aws-appfabric/publishSigned zio-aws-appflow/publishSigned zio-aws-appintegrations/publishSigned
+        zio-aws-applicationautoscaling/publishSigned zio-aws-applicationcostprofiler/publishSigned
+        zio-aws-applicationdiscovery/publishSigned zio-aws-applicationinsights/publishSigned
+        zio-aws-appmesh/publishSigned zio-aws-apprunner/publishSigned zio-aws-appstream/publishSigned
+        zio-aws-appsync/publishSigned zio-aws-arczonalshift/publishSigned zio-aws-athena/publishSigned
+        zio-aws-auditmanager/publishSigned zio-aws-autoscaling/publishSigned zio-aws-autoscalingplans/publishSigned
+        zio-aws-backup/publishSigned zio-aws-backupgateway/publishSigned zio-aws-backupstorage/publishSigned
+        zio-aws-batch/publishSigned zio-aws-bedrock/publishSigned zio-aws-bedrockruntime/publishSigned
+        zio-aws-billingconductor/publishSigned zio-aws-braket/publishSigned zio-aws-budgets/publishSigned
+        zio-aws-chime/publishSigned zio-aws-chimesdkidentity/publishSigned zio-aws-chimesdkmediapipelines/publishSigned
         zio-aws-chimesdkmeetings/publishSigned zio-aws-chimesdkmessaging/publishSigned
-        zio-aws-chimesdkvoice/publishSigned zio-aws-cloud9/publishSigned zio-aws-cloudcontrol/publishSigned
-        zio-aws-clouddirectory/publishSigned zio-aws-cloudformation/publishSigned
+        zio-aws-chimesdkvoice/publishSigned zio-aws-cleanrooms/publishSigned zio-aws-cloud9/publishSigned
+        zio-aws-cloudcontrol/publishSigned zio-aws-clouddirectory/publishSigned zio-aws-cloudformation/publishSigned
         zio-aws-cloudfront/publishSigned zio-aws-cloudhsm/publishSigned zio-aws-cloudhsmv2/publishSigned
         zio-aws-cloudsearch/publishSigned zio-aws-cloudsearchdomain/publishSigned
-        zio-aws-cloudtrail/publishSigned zio-aws-cloudwatch/publishSigned zio-aws-cloudwatchevents/publishSigned
-        zio-aws-cloudwatchlogs/publishSigned zio-aws-codeartifact/publishSigned zio-aws-codebuild/publishSigned
-        zio-aws-codecatalyst/publishSigned zio-aws-codecommit/publishSigned zio-aws-codedeploy/publishSigned
-        zio-aws-codeguruprofiler/publishSigned zio-aws-codegurureviewer/publishSigned
+        zio-aws-cloudtrail/publishSigned zio-aws-cloudtraildata/publishSigned zio-aws-cloudwatch/publishSigned
+        zio-aws-cloudwatchevents/publishSigned zio-aws-cloudwatchlogs/publishSigned
+        zio-aws-codeartifact/publishSigned zio-aws-codebuild/publishSigned zio-aws-codecatalyst/publishSigned
+        zio-aws-codecommit/publishSigned zio-aws-codedeploy/publishSigned zio-aws-codeguruprofiler/publishSigned
+        zio-aws-codegurureviewer/publishSigned zio-aws-codegurusecurity/publishSigned
         zio-aws-codepipeline/publishSigned zio-aws-codestar/publishSigned zio-aws-codestarconnections/publishSigned
-        zio-aws-codestarnotifications/publishSigned zio-aws-cognitoidentity/publishSigned
+        zio-aws-codestarnotifications/publishSigned
       env:
         PGP_PASSPHRASE: ${{ secrets.PGP_PASSPHRASE }}
         PGP_SECRET: ${{ secrets.PGP_SECRET }}
@@ -298,9 +302,9 @@ jobs:
         os:
         - ubuntu-latest
         scala:
-        - 2.12.17
-        - 2.13.10
-        - 3.2.1
+        - 2.12.18
+        - 2.13.12
+        - 3.3.1
         java:
         - adopt@1.8
     needs:
@@ -344,39 +348,42 @@ jobs:
         rm targets.tar
     - name: Build libraries
       if: ${{ github.ref != 'refs/heads/master' }}
-      run: sbt -J-XX:+UseG1GC -J-Xmx6g -J-Xms6g -J-Xss16m ++${{ matrix.scala }} zio-aws-cognitoidentityprovider/compile
-        zio-aws-cognitosync/compile zio-aws-comprehend/compile zio-aws-comprehendmedical/compile
-        zio-aws-computeoptimizer/compile zio-aws-config/compile zio-aws-connect/compile
-        zio-aws-connectcampaigns/compile zio-aws-connectcases/compile zio-aws-connectcontactlens/compile
-        zio-aws-connectparticipant/compile zio-aws-controltower/compile zio-aws-costandusagereport/compile
-        zio-aws-costexplorer/compile zio-aws-customerprofiles/compile zio-aws-databasemigration/compile
-        zio-aws-databrew/compile zio-aws-dataexchange/compile zio-aws-datapipeline/compile
-        zio-aws-datasync/compile zio-aws-dax/compile zio-aws-detective/compile zio-aws-devicefarm/compile
-        zio-aws-devopsguru/compile zio-aws-directconnect/compile zio-aws-directory/compile
-        zio-aws-dlm/compile zio-aws-docdb/compile zio-aws-docdbelastic/compile zio-aws-drs/compile
-        zio-aws-dynamodb/compile zio-aws-dynamodbstreams/compile zio-aws-ebs/compile
-        zio-aws-ec2instanceconnect/compile zio-aws-ecr/compile zio-aws-ecrpublic/compile
-        zio-aws-ecs/compile zio-aws-efs/compile zio-aws-eks/compile zio-aws-elasticache/compile
-        zio-aws-elasticbeanstalk/compile zio-aws-elasticinference/compile zio-aws-elasticloadbalancing/compile
-        zio-aws-elasticloadbalancingv2/compile zio-aws-elasticsearch/compile zio-aws-elastictranscoder/compile
-        zio-aws-emr/compile zio-aws-emrcontainers/compile zio-aws-emrserverless/compile
+      run: sbt -J-XX:+UseG1GC -J-Xmx6g -J-Xms6g -J-Xss16m ++${{ matrix.scala }} zio-aws-cognitoidentity/compile
+        zio-aws-cognitoidentityprovider/compile zio-aws-cognitosync/compile zio-aws-comprehend/compile
+        zio-aws-comprehendmedical/compile zio-aws-computeoptimizer/compile zio-aws-config/compile
+        zio-aws-connect/compile zio-aws-connectcampaigns/compile zio-aws-connectcases/compile
+        zio-aws-connectcontactlens/compile zio-aws-connectparticipant/compile zio-aws-controltower/compile
+        zio-aws-costandusagereport/compile zio-aws-costexplorer/compile zio-aws-customerprofiles/compile
+        zio-aws-databasemigration/compile zio-aws-databrew/compile zio-aws-dataexchange/compile
+        zio-aws-datapipeline/compile zio-aws-datasync/compile zio-aws-datazone/compile
+        zio-aws-dax/compile zio-aws-detective/compile zio-aws-devicefarm/compile zio-aws-devopsguru/compile
+        zio-aws-directconnect/compile zio-aws-directory/compile zio-aws-dlm/compile
+        zio-aws-docdb/compile zio-aws-docdbelastic/compile zio-aws-drs/compile zio-aws-dynamodb/compile
+        zio-aws-dynamodbstreams/compile zio-aws-ebs/compile zio-aws-ec2instanceconnect/compile
+        zio-aws-ecr/compile zio-aws-ecrpublic/compile zio-aws-ecs/compile zio-aws-efs/compile
+        zio-aws-eks/compile zio-aws-elasticache/compile zio-aws-elasticbeanstalk/compile
+        zio-aws-elasticinference/compile zio-aws-elasticloadbalancing/compile zio-aws-elasticloadbalancingv2/compile
+        zio-aws-elasticsearch/compile zio-aws-elastictranscoder/compile zio-aws-emr/compile
+        zio-aws-emrcontainers/compile zio-aws-emrserverless/compile zio-aws-entityresolution/compile
         zio-aws-eventbridge/compile zio-aws-evidently/compile zio-aws-finspace/compile
         zio-aws-finspacedata/compile zio-aws-firehose/compile zio-aws-fis/compile
         zio-aws-fms/compile zio-aws-forecast/compile zio-aws-forecastquery/compile
         zio-aws-frauddetector/compile zio-aws-fsx/compile zio-aws-gamelift/compile
-        zio-aws-gamesparks/compile zio-aws-glacier/compile zio-aws-globalaccelerator/compile
-        zio-aws-glue/compile zio-aws-grafana/compile zio-aws-greengrass/compile
+        zio-aws-glacier/compile zio-aws-globalaccelerator/compile zio-aws-glue/compile
+        zio-aws-grafana/compile zio-aws-greengrass/compile zio-aws-greengrassv2/compile
+        zio-aws-groundstation/compile zio-aws-guardduty/compile
     - name: Build and publish libraries
       if: ${{ github.ref == 'refs/heads/master' }}
-      run: sbt -J-XX:+UseG1GC -J-Xmx6g -J-Xms6g -J-Xss16m ++${{ matrix.scala }} zio-aws-cognitoidentityprovider/publishSigned
-        zio-aws-cognitosync/publishSigned zio-aws-comprehend/publishSigned zio-aws-comprehendmedical/publishSigned
-        zio-aws-computeoptimizer/publishSigned zio-aws-config/publishSigned zio-aws-connect/publishSigned
-        zio-aws-connectcampaigns/publishSigned zio-aws-connectcases/publishSigned
-        zio-aws-connectcontactlens/publishSigned zio-aws-connectparticipant/publishSigned
-        zio-aws-controltower/publishSigned zio-aws-costandusagereport/publishSigned
-        zio-aws-costexplorer/publishSigned zio-aws-customerprofiles/publishSigned
-        zio-aws-databasemigration/publishSigned zio-aws-databrew/publishSigned zio-aws-dataexchange/publishSigned
-        zio-aws-datapipeline/publishSigned zio-aws-datasync/publishSigned zio-aws-dax/publishSigned
+      run: sbt -J-XX:+UseG1GC -J-Xmx6g -J-Xms6g -J-Xss16m ++${{ matrix.scala }} zio-aws-cognitoidentity/publishSigned
+        zio-aws-cognitoidentityprovider/publishSigned zio-aws-cognitosync/publishSigned
+        zio-aws-comprehend/publishSigned zio-aws-comprehendmedical/publishSigned zio-aws-computeoptimizer/publishSigned
+        zio-aws-config/publishSigned zio-aws-connect/publishSigned zio-aws-connectcampaigns/publishSigned
+        zio-aws-connectcases/publishSigned zio-aws-connectcontactlens/publishSigned
+        zio-aws-connectparticipant/publishSigned zio-aws-controltower/publishSigned
+        zio-aws-costandusagereport/publishSigned zio-aws-costexplorer/publishSigned
+        zio-aws-customerprofiles/publishSigned zio-aws-databasemigration/publishSigned
+        zio-aws-databrew/publishSigned zio-aws-dataexchange/publishSigned zio-aws-datapipeline/publishSigned
+        zio-aws-datasync/publishSigned zio-aws-datazone/publishSigned zio-aws-dax/publishSigned
         zio-aws-detective/publishSigned zio-aws-devicefarm/publishSigned zio-aws-devopsguru/publishSigned
         zio-aws-directconnect/publishSigned zio-aws-directory/publishSigned zio-aws-dlm/publishSigned
         zio-aws-docdb/publishSigned zio-aws-docdbelastic/publishSigned zio-aws-drs/publishSigned
@@ -387,12 +394,13 @@ jobs:
         zio-aws-elasticloadbalancing/publishSigned zio-aws-elasticloadbalancingv2/publishSigned
         zio-aws-elasticsearch/publishSigned zio-aws-elastictranscoder/publishSigned
         zio-aws-emr/publishSigned zio-aws-emrcontainers/publishSigned zio-aws-emrserverless/publishSigned
-        zio-aws-eventbridge/publishSigned zio-aws-evidently/publishSigned zio-aws-finspace/publishSigned
-        zio-aws-finspacedata/publishSigned zio-aws-firehose/publishSigned zio-aws-fis/publishSigned
-        zio-aws-fms/publishSigned zio-aws-forecast/publishSigned zio-aws-forecastquery/publishSigned
-        zio-aws-frauddetector/publishSigned zio-aws-fsx/publishSigned zio-aws-gamelift/publishSigned
-        zio-aws-gamesparks/publishSigned zio-aws-glacier/publishSigned zio-aws-globalaccelerator/publishSigned
+        zio-aws-entityresolution/publishSigned zio-aws-eventbridge/publishSigned zio-aws-evidently/publishSigned
+        zio-aws-finspace/publishSigned zio-aws-finspacedata/publishSigned zio-aws-firehose/publishSigned
+        zio-aws-fis/publishSigned zio-aws-fms/publishSigned zio-aws-forecast/publishSigned
+        zio-aws-forecastquery/publishSigned zio-aws-frauddetector/publishSigned zio-aws-fsx/publishSigned
+        zio-aws-gamelift/publishSigned zio-aws-glacier/publishSigned zio-aws-globalaccelerator/publishSigned
         zio-aws-glue/publishSigned zio-aws-grafana/publishSigned zio-aws-greengrass/publishSigned
+        zio-aws-greengrassv2/publishSigned zio-aws-groundstation/publishSigned zio-aws-guardduty/publishSigned
       env:
         PGP_PASSPHRASE: ${{ secrets.PGP_PASSPHRASE }}
         PGP_SECRET: ${{ secrets.PGP_SECRET }}
@@ -414,9 +422,9 @@ jobs:
         os:
         - ubuntu-latest
         scala:
-        - 2.12.17
-        - 2.13.10
-        - 3.2.1
+        - 2.12.18
+        - 2.13.12
+        - 3.3.1
         java:
         - adopt@1.8
     needs:
@@ -460,59 +468,61 @@ jobs:
         rm targets.tar
     - name: Build libraries
       if: ${{ github.ref != 'refs/heads/master' }}
-      run: sbt -J-XX:+UseG1GC -J-Xmx6g -J-Xms6g -J-Xss16m ++${{ matrix.scala }} zio-aws-greengrassv2/compile
-        zio-aws-groundstation/compile zio-aws-guardduty/compile zio-aws-health/compile
+      run: sbt -J-XX:+UseG1GC -J-Xmx6g -J-Xms6g -J-Xss16m ++${{ matrix.scala }} zio-aws-health/compile
         zio-aws-healthlake/compile zio-aws-honeycode/compile zio-aws-iam/compile zio-aws-identitystore/compile
         zio-aws-imagebuilder/compile zio-aws-inspector/compile zio-aws-inspector2/compile
-        zio-aws-iot/compile zio-aws-iot1clickdevices/compile zio-aws-iot1clickprojects/compile
-        zio-aws-iotanalytics/compile zio-aws-iotdataplane/compile zio-aws-iotdeviceadvisor/compile
-        zio-aws-iotevents/compile zio-aws-ioteventsdata/compile zio-aws-iotfleethub/compile
-        zio-aws-iotfleetwise/compile zio-aws-iotjobsdataplane/compile zio-aws-iotroborunner/compile
-        zio-aws-iotsecuretunneling/compile zio-aws-iotsitewise/compile zio-aws-iotthingsgraph/compile
-        zio-aws-iottwinmaker/compile zio-aws-iotwireless/compile zio-aws-ivs/compile
-        zio-aws-ivschat/compile zio-aws-kafka/compile zio-aws-kafkaconnect/compile
-        zio-aws-kendra/compile zio-aws-keyspaces/compile zio-aws-kinesis/compile zio-aws-kinesisanalytics/compile
+        zio-aws-internetmonitor/compile zio-aws-iot/compile zio-aws-iot1clickdevices/compile
+        zio-aws-iot1clickprojects/compile zio-aws-iotanalytics/compile zio-aws-iotdataplane/compile
+        zio-aws-iotdeviceadvisor/compile zio-aws-iotevents/compile zio-aws-ioteventsdata/compile
+        zio-aws-iotfleethub/compile zio-aws-iotfleetwise/compile zio-aws-iotjobsdataplane/compile
+        zio-aws-iotroborunner/compile zio-aws-iotsecuretunneling/compile zio-aws-iotsitewise/compile
+        zio-aws-iotthingsgraph/compile zio-aws-iottwinmaker/compile zio-aws-iotwireless/compile
+        zio-aws-ivs/compile zio-aws-ivschat/compile zio-aws-ivsrealtime/compile zio-aws-kafka/compile
+        zio-aws-kafkaconnect/compile zio-aws-kendra/compile zio-aws-kendraranking/compile
+        zio-aws-keyspaces/compile zio-aws-kinesis/compile zio-aws-kinesisanalytics/compile
         zio-aws-kinesisanalyticsv2/compile zio-aws-kinesisvideo/compile zio-aws-kinesisvideoarchivedmedia/compile
         zio-aws-kinesisvideomedia/compile zio-aws-kinesisvideosignaling/compile zio-aws-kinesisvideowebrtcstorage/compile
-        zio-aws-kms/compile zio-aws-lakeformation/compile zio-aws-lambda/compile zio-aws-lexmodelbuilding/compile
-        zio-aws-lexmodelsv2/compile zio-aws-lexruntime/compile zio-aws-lexruntimev2/compile
-        zio-aws-licensemanager/compile zio-aws-licensemanagerlinuxsubscriptions/compile
+        zio-aws-kms/compile zio-aws-lakeformation/compile zio-aws-lambda/compile zio-aws-launchwizard/compile
+        zio-aws-lexmodelbuilding/compile zio-aws-lexmodelsv2/compile zio-aws-lexruntime/compile
+        zio-aws-lexruntimev2/compile zio-aws-licensemanager/compile zio-aws-licensemanagerlinuxsubscriptions/compile
         zio-aws-licensemanagerusersubscriptions/compile zio-aws-lightsail/compile
         zio-aws-location/compile zio-aws-lookoutequipment/compile zio-aws-lookoutmetrics/compile
         zio-aws-lookoutvision/compile zio-aws-m2/compile zio-aws-machinelearning/compile
         zio-aws-macie/compile zio-aws-macie2/compile zio-aws-managedblockchain/compile
-        zio-aws-marketplacecatalog/compile zio-aws-marketplacecommerceanalytics/compile
-        zio-aws-marketplaceentitlement/compile zio-aws-marketplacemetering/compile
-        zio-aws-mediaconnect/compile
+        zio-aws-managedblockchainquery/compile zio-aws-marketplacecatalog/compile
+        zio-aws-marketplacecommerceanalytics/compile zio-aws-marketplaceentitlement/compile
+        zio-aws-marketplacemetering/compile zio-aws-mediaconnect/compile zio-aws-mediaconvert/compile
+        zio-aws-medialive/compile zio-aws-mediapackage/compile
     - name: Build and publish libraries
       if: ${{ github.ref == 'refs/heads/master' }}
-      run: sbt -J-XX:+UseG1GC -J-Xmx6g -J-Xms6g -J-Xss16m ++${{ matrix.scala }} zio-aws-greengrassv2/publishSigned
-        zio-aws-groundstation/publishSigned zio-aws-guardduty/publishSigned zio-aws-health/publishSigned
+      run: sbt -J-XX:+UseG1GC -J-Xmx6g -J-Xms6g -J-Xss16m ++${{ matrix.scala }} zio-aws-health/publishSigned
         zio-aws-healthlake/publishSigned zio-aws-honeycode/publishSigned zio-aws-iam/publishSigned
         zio-aws-identitystore/publishSigned zio-aws-imagebuilder/publishSigned zio-aws-inspector/publishSigned
-        zio-aws-inspector2/publishSigned zio-aws-iot/publishSigned zio-aws-iot1clickdevices/publishSigned
-        zio-aws-iot1clickprojects/publishSigned zio-aws-iotanalytics/publishSigned
-        zio-aws-iotdataplane/publishSigned zio-aws-iotdeviceadvisor/publishSigned
+        zio-aws-inspector2/publishSigned zio-aws-internetmonitor/publishSigned zio-aws-iot/publishSigned
+        zio-aws-iot1clickdevices/publishSigned zio-aws-iot1clickprojects/publishSigned
+        zio-aws-iotanalytics/publishSigned zio-aws-iotdataplane/publishSigned zio-aws-iotdeviceadvisor/publishSigned
         zio-aws-iotevents/publishSigned zio-aws-ioteventsdata/publishSigned zio-aws-iotfleethub/publishSigned
         zio-aws-iotfleetwise/publishSigned zio-aws-iotjobsdataplane/publishSigned
         zio-aws-iotroborunner/publishSigned zio-aws-iotsecuretunneling/publishSigned
         zio-aws-iotsitewise/publishSigned zio-aws-iotthingsgraph/publishSigned zio-aws-iottwinmaker/publishSigned
         zio-aws-iotwireless/publishSigned zio-aws-ivs/publishSigned zio-aws-ivschat/publishSigned
-        zio-aws-kafka/publishSigned zio-aws-kafkaconnect/publishSigned zio-aws-kendra/publishSigned
-        zio-aws-keyspaces/publishSigned zio-aws-kinesis/publishSigned zio-aws-kinesisanalytics/publishSigned
-        zio-aws-kinesisanalyticsv2/publishSigned zio-aws-kinesisvideo/publishSigned
-        zio-aws-kinesisvideoarchivedmedia/publishSigned zio-aws-kinesisvideomedia/publishSigned
-        zio-aws-kinesisvideosignaling/publishSigned zio-aws-kinesisvideowebrtcstorage/publishSigned
-        zio-aws-kms/publishSigned zio-aws-lakeformation/publishSigned zio-aws-lambda/publishSigned
+        zio-aws-ivsrealtime/publishSigned zio-aws-kafka/publishSigned zio-aws-kafkaconnect/publishSigned
+        zio-aws-kendra/publishSigned zio-aws-kendraranking/publishSigned zio-aws-keyspaces/publishSigned
+        zio-aws-kinesis/publishSigned zio-aws-kinesisanalytics/publishSigned zio-aws-kinesisanalyticsv2/publishSigned
+        zio-aws-kinesisvideo/publishSigned zio-aws-kinesisvideoarchivedmedia/publishSigned
+        zio-aws-kinesisvideomedia/publishSigned zio-aws-kinesisvideosignaling/publishSigned
+        zio-aws-kinesisvideowebrtcstorage/publishSigned zio-aws-kms/publishSigned
+        zio-aws-lakeformation/publishSigned zio-aws-lambda/publishSigned zio-aws-launchwizard/publishSigned
         zio-aws-lexmodelbuilding/publishSigned zio-aws-lexmodelsv2/publishSigned zio-aws-lexruntime/publishSigned
         zio-aws-lexruntimev2/publishSigned zio-aws-licensemanager/publishSigned zio-aws-licensemanagerlinuxsubscriptions/publishSigned
         zio-aws-licensemanagerusersubscriptions/publishSigned zio-aws-lightsail/publishSigned
         zio-aws-location/publishSigned zio-aws-lookoutequipment/publishSigned zio-aws-lookoutmetrics/publishSigned
         zio-aws-lookoutvision/publishSigned zio-aws-m2/publishSigned zio-aws-machinelearning/publishSigned
         zio-aws-macie/publishSigned zio-aws-macie2/publishSigned zio-aws-managedblockchain/publishSigned
-        zio-aws-marketplacecatalog/publishSigned zio-aws-marketplacecommerceanalytics/publishSigned
-        zio-aws-marketplaceentitlement/publishSigned zio-aws-marketplacemetering/publishSigned
-        zio-aws-mediaconnect/publishSigned
+        zio-aws-managedblockchainquery/publishSigned zio-aws-marketplacecatalog/publishSigned
+        zio-aws-marketplacecommerceanalytics/publishSigned zio-aws-marketplaceentitlement/publishSigned
+        zio-aws-marketplacemetering/publishSigned zio-aws-mediaconnect/publishSigned
+        zio-aws-mediaconvert/publishSigned zio-aws-medialive/publishSigned zio-aws-mediapackage/publishSigned
       env:
         PGP_PASSPHRASE: ${{ secrets.PGP_PASSPHRASE }}
         PGP_SECRET: ${{ secrets.PGP_SECRET }}
@@ -534,9 +544,9 @@ jobs:
         os:
         - ubuntu-latest
         scala:
-        - 2.12.17
-        - 2.13.10
-        - 3.2.1
+        - 2.12.18
+        - 2.13.12
+        - 3.3.1
         java:
         - adopt@1.8
     needs:
@@ -580,57 +590,60 @@ jobs:
         rm targets.tar
     - name: Build libraries
       if: ${{ github.ref != 'refs/heads/master' }}
-      run: sbt -J-XX:+UseG1GC -J-Xmx6g -J-Xms6g -J-Xss16m ++${{ matrix.scala }} zio-aws-mediaconvert/compile
-        zio-aws-medialive/compile zio-aws-mediapackage/compile zio-aws-mediapackagevod/compile
-        zio-aws-mediastore/compile zio-aws-mediastoredata/compile zio-aws-mediatailor/compile
-        zio-aws-memorydb/compile zio-aws-mgn/compile zio-aws-migrationhub/compile
-        zio-aws-migrationhubconfig/compile zio-aws-migrationhuborchestrator/compile
-        zio-aws-migrationhubrefactorspaces/compile zio-aws-migrationhubstrategy/compile
-        zio-aws-mobile/compile zio-aws-mq/compile zio-aws-mturk/compile zio-aws-mwaa/compile
-        zio-aws-neptune/compile zio-aws-networkfirewall/compile zio-aws-networkmanager/compile
-        zio-aws-nimble/compile zio-aws-oam/compile zio-aws-omics/compile zio-aws-opensearch/compile
-        zio-aws-opensearchserverless/compile zio-aws-opsworks/compile zio-aws-opsworkscm/compile
-        zio-aws-organizations/compile zio-aws-outposts/compile zio-aws-panorama/compile
-        zio-aws-personalize/compile zio-aws-personalizeevents/compile zio-aws-personalizeruntime/compile
-        zio-aws-pi/compile zio-aws-pinpoint/compile zio-aws-pinpointemail/compile
-        zio-aws-pinpointsmsvoice/compile zio-aws-pinpointsmsvoicev2/compile zio-aws-pipes/compile
-        zio-aws-polly/compile zio-aws-pricing/compile zio-aws-privatenetworks/compile
-        zio-aws-proton/compile zio-aws-qldb/compile zio-aws-qldbsession/compile zio-aws-quicksight/compile
+      run: sbt -J-XX:+UseG1GC -J-Xmx6g -J-Xms6g -J-Xss16m ++${{ matrix.scala }} zio-aws-mediapackagev2/compile
+        zio-aws-mediapackagevod/compile zio-aws-mediastore/compile zio-aws-mediastoredata/compile
+        zio-aws-mediatailor/compile zio-aws-medicalimaging/compile zio-aws-memorydb/compile
+        zio-aws-mgn/compile zio-aws-migrationhub/compile zio-aws-migrationhubconfig/compile
+        zio-aws-migrationhuborchestrator/compile zio-aws-migrationhubrefactorspaces/compile
+        zio-aws-migrationhubstrategy/compile zio-aws-mobile/compile zio-aws-mq/compile
+        zio-aws-mturk/compile zio-aws-mwaa/compile zio-aws-neptune/compile zio-aws-neptunedata/compile
+        zio-aws-networkfirewall/compile zio-aws-networkmanager/compile zio-aws-nimble/compile
+        zio-aws-oam/compile zio-aws-omics/compile zio-aws-opensearch/compile zio-aws-opensearchserverless/compile
+        zio-aws-opsworks/compile zio-aws-opsworkscm/compile zio-aws-organizations/compile
+        zio-aws-osis/compile zio-aws-outposts/compile zio-aws-panorama/compile zio-aws-paymentcryptography/compile
+        zio-aws-paymentcryptographydata/compile zio-aws-pcaconnectorad/compile zio-aws-personalize/compile
+        zio-aws-personalizeevents/compile zio-aws-personalizeruntime/compile zio-aws-pi/compile
+        zio-aws-pinpoint/compile zio-aws-pinpointemail/compile zio-aws-pinpointsmsvoice/compile
+        zio-aws-pinpointsmsvoicev2/compile zio-aws-pipes/compile zio-aws-polly/compile
+        zio-aws-pricing/compile zio-aws-privatenetworks/compile zio-aws-proton/compile
+        zio-aws-qldb/compile zio-aws-qldbsession/compile zio-aws-quicksight/compile
         zio-aws-ram/compile zio-aws-rbin/compile zio-aws-rds/compile zio-aws-rdsdata/compile
         zio-aws-redshift/compile zio-aws-redshiftdata/compile zio-aws-redshiftserverless/compile
         zio-aws-rekognition/compile zio-aws-resiliencehub/compile zio-aws-resourceexplorer2/compile
         zio-aws-resourcegroups/compile zio-aws-resourcegroupstaggingapi/compile zio-aws-robomaker/compile
         zio-aws-rolesanywhere/compile zio-aws-route53/compile zio-aws-route53domains/compile
         zio-aws-route53recoverycluster/compile zio-aws-route53recoverycontrolconfig/compile
-        zio-aws-route53recoveryreadiness/compile zio-aws-route53resolver/compile
+        zio-aws-route53recoveryreadiness/compile zio-aws-route53resolver/compile zio-aws-rum/compile
     - name: Build and publish libraries
       if: ${{ github.ref == 'refs/heads/master' }}
-      run: sbt -J-XX:+UseG1GC -J-Xmx6g -J-Xms6g -J-Xss16m ++${{ matrix.scala }} zio-aws-mediaconvert/publishSigned
-        zio-aws-medialive/publishSigned zio-aws-mediapackage/publishSigned zio-aws-mediapackagevod/publishSigned
-        zio-aws-mediastore/publishSigned zio-aws-mediastoredata/publishSigned zio-aws-mediatailor/publishSigned
-        zio-aws-memorydb/publishSigned zio-aws-mgn/publishSigned zio-aws-migrationhub/publishSigned
-        zio-aws-migrationhubconfig/publishSigned zio-aws-migrationhuborchestrator/publishSigned
-        zio-aws-migrationhubrefactorspaces/publishSigned zio-aws-migrationhubstrategy/publishSigned
-        zio-aws-mobile/publishSigned zio-aws-mq/publishSigned zio-aws-mturk/publishSigned
-        zio-aws-mwaa/publishSigned zio-aws-neptune/publishSigned zio-aws-networkfirewall/publishSigned
-        zio-aws-networkmanager/publishSigned zio-aws-nimble/publishSigned zio-aws-oam/publishSigned
-        zio-aws-omics/publishSigned zio-aws-opensearch/publishSigned zio-aws-opensearchserverless/publishSigned
+      run: sbt -J-XX:+UseG1GC -J-Xmx6g -J-Xms6g -J-Xss16m ++${{ matrix.scala }} zio-aws-mediapackagev2/publishSigned
+        zio-aws-mediapackagevod/publishSigned zio-aws-mediastore/publishSigned zio-aws-mediastoredata/publishSigned
+        zio-aws-mediatailor/publishSigned zio-aws-medicalimaging/publishSigned zio-aws-memorydb/publishSigned
+        zio-aws-mgn/publishSigned zio-aws-migrationhub/publishSigned zio-aws-migrationhubconfig/publishSigned
+        zio-aws-migrationhuborchestrator/publishSigned zio-aws-migrationhubrefactorspaces/publishSigned
+        zio-aws-migrationhubstrategy/publishSigned zio-aws-mobile/publishSigned zio-aws-mq/publishSigned
+        zio-aws-mturk/publishSigned zio-aws-mwaa/publishSigned zio-aws-neptune/publishSigned
+        zio-aws-neptunedata/publishSigned zio-aws-networkfirewall/publishSigned zio-aws-networkmanager/publishSigned
+        zio-aws-nimble/publishSigned zio-aws-oam/publishSigned zio-aws-omics/publishSigned
+        zio-aws-opensearch/publishSigned zio-aws-opensearchserverless/publishSigned
         zio-aws-opsworks/publishSigned zio-aws-opsworkscm/publishSigned zio-aws-organizations/publishSigned
-        zio-aws-outposts/publishSigned zio-aws-panorama/publishSigned zio-aws-personalize/publishSigned
-        zio-aws-personalizeevents/publishSigned zio-aws-personalizeruntime/publishSigned
-        zio-aws-pi/publishSigned zio-aws-pinpoint/publishSigned zio-aws-pinpointemail/publishSigned
-        zio-aws-pinpointsmsvoice/publishSigned zio-aws-pinpointsmsvoicev2/publishSigned
-        zio-aws-pipes/publishSigned zio-aws-polly/publishSigned zio-aws-pricing/publishSigned
-        zio-aws-privatenetworks/publishSigned zio-aws-proton/publishSigned zio-aws-qldb/publishSigned
-        zio-aws-qldbsession/publishSigned zio-aws-quicksight/publishSigned zio-aws-ram/publishSigned
-        zio-aws-rbin/publishSigned zio-aws-rds/publishSigned zio-aws-rdsdata/publishSigned
-        zio-aws-redshift/publishSigned zio-aws-redshiftdata/publishSigned zio-aws-redshiftserverless/publishSigned
-        zio-aws-rekognition/publishSigned zio-aws-resiliencehub/publishSigned zio-aws-resourceexplorer2/publishSigned
+        zio-aws-osis/publishSigned zio-aws-outposts/publishSigned zio-aws-panorama/publishSigned
+        zio-aws-paymentcryptography/publishSigned zio-aws-paymentcryptographydata/publishSigned
+        zio-aws-pcaconnectorad/publishSigned zio-aws-personalize/publishSigned zio-aws-personalizeevents/publishSigned
+        zio-aws-personalizeruntime/publishSigned zio-aws-pi/publishSigned zio-aws-pinpoint/publishSigned
+        zio-aws-pinpointemail/publishSigned zio-aws-pinpointsmsvoice/publishSigned
+        zio-aws-pinpointsmsvoicev2/publishSigned zio-aws-pipes/publishSigned zio-aws-polly/publishSigned
+        zio-aws-pricing/publishSigned zio-aws-privatenetworks/publishSigned zio-aws-proton/publishSigned
+        zio-aws-qldb/publishSigned zio-aws-qldbsession/publishSigned zio-aws-quicksight/publishSigned
+        zio-aws-ram/publishSigned zio-aws-rbin/publishSigned zio-aws-rds/publishSigned
+        zio-aws-rdsdata/publishSigned zio-aws-redshift/publishSigned zio-aws-redshiftdata/publishSigned
+        zio-aws-redshiftserverless/publishSigned zio-aws-rekognition/publishSigned
+        zio-aws-resiliencehub/publishSigned zio-aws-resourceexplorer2/publishSigned
         zio-aws-resourcegroups/publishSigned zio-aws-resourcegroupstaggingapi/publishSigned
         zio-aws-robomaker/publishSigned zio-aws-rolesanywhere/publishSigned zio-aws-route53/publishSigned
         zio-aws-route53domains/publishSigned zio-aws-route53recoverycluster/publishSigned
         zio-aws-route53recoverycontrolconfig/publishSigned zio-aws-route53recoveryreadiness/publishSigned
-        zio-aws-route53resolver/publishSigned
+        zio-aws-route53resolver/publishSigned zio-aws-rum/publishSigned
       env:
         PGP_PASSPHRASE: ${{ secrets.PGP_PASSPHRASE }}
         PGP_SECRET: ${{ secrets.PGP_SECRET }}
@@ -652,9 +665,9 @@ jobs:
         os:
         - ubuntu-latest
         scala:
-        - 2.12.17
-        - 2.13.10
-        - 3.2.1
+        - 2.12.18
+        - 2.13.12
+        - 3.3.1
         java:
         - adopt@1.8
     needs:
@@ -698,8 +711,8 @@ jobs:
         rm targets.tar
     - name: Build libraries
       if: ${{ github.ref != 'refs/heads/master' }}
-      run: sbt -J-XX:+UseG1GC -J-Xmx6g -J-Xms6g -J-Xss16m ++${{ matrix.scala }} zio-aws-rum/compile
-        zio-aws-s3/compile zio-aws-s3control/compile zio-aws-s3outposts/compile zio-aws-sagemaker/compile
+      run: sbt -J-XX:+UseG1GC -J-Xmx6g -J-Xms6g -J-Xss16m ++${{ matrix.scala }} zio-aws-s3/compile
+        zio-aws-s3control/compile zio-aws-s3outposts/compile zio-aws-sagemaker/compile
         zio-aws-sagemakera2iruntime/compile zio-aws-sagemakeredge/compile zio-aws-sagemakerfeaturestoreruntime/compile
         zio-aws-sagemakergeospatial/compile zio-aws-sagemakermetrics/compile zio-aws-sagemakerruntime/compile
         zio-aws-savingsplans/compile zio-aws-scheduler/compile zio-aws-schemas/compile
@@ -714,35 +727,36 @@ jobs:
         zio-aws-ssooidc/compile zio-aws-storagegateway/compile zio-aws-sts/compile
         zio-aws-support/compile zio-aws-supportapp/compile zio-aws-swf/compile zio-aws-synthetics/compile
         zio-aws-textract/compile zio-aws-timestreamquery/compile zio-aws-timestreamwrite/compile
-        zio-aws-transcribe/compile zio-aws-transcribestreaming/compile zio-aws-transfer/compile
-        zio-aws-translate/compile zio-aws-voiceid/compile zio-aws-waf/compile zio-aws-wafregional/compile
+        zio-aws-tnb/compile zio-aws-transcribe/compile zio-aws-transcribestreaming/compile
+        zio-aws-transfer/compile zio-aws-translate/compile zio-aws-verifiedpermissions/compile
+        zio-aws-voiceid/compile zio-aws-vpclattice/compile zio-aws-waf/compile zio-aws-wafregional/compile
         zio-aws-wafv2/compile zio-aws-wellarchitected/compile zio-aws-wisdom/compile
         zio-aws-workdocs/compile zio-aws-worklink/compile zio-aws-workmail/compile
         zio-aws-workmailmessageflow/compile zio-aws-workspaces/compile zio-aws-workspacesweb/compile
         zio-aws-xray/compile
     - name: Build and publish libraries
       if: ${{ github.ref == 'refs/heads/master' }}
-      run: sbt -J-XX:+UseG1GC -J-Xmx6g -J-Xms6g -J-Xss16m ++${{ matrix.scala }} zio-aws-rum/publishSigned
-        zio-aws-s3/publishSigned zio-aws-s3control/publishSigned zio-aws-s3outposts/publishSigned
-        zio-aws-sagemaker/publishSigned zio-aws-sagemakera2iruntime/publishSigned
-        zio-aws-sagemakeredge/publishSigned zio-aws-sagemakerfeaturestoreruntime/publishSigned
-        zio-aws-sagemakergeospatial/publishSigned zio-aws-sagemakermetrics/publishSigned
-        zio-aws-sagemakerruntime/publishSigned zio-aws-savingsplans/publishSigned
-        zio-aws-scheduler/publishSigned zio-aws-schemas/publishSigned zio-aws-secretsmanager/publishSigned
-        zio-aws-securityhub/publishSigned zio-aws-securitylake/publishSigned zio-aws-serverlessapplicationrepository/publishSigned
-        zio-aws-servicecatalog/publishSigned zio-aws-servicecatalogappregistry/publishSigned
-        zio-aws-servicediscovery/publishSigned zio-aws-servicequotas/publishSigned
-        zio-aws-ses/publishSigned zio-aws-sesv2/publishSigned zio-aws-sfn/publishSigned
-        zio-aws-shield/publishSigned zio-aws-signer/publishSigned zio-aws-simspaceweaver/publishSigned
-        zio-aws-sms/publishSigned zio-aws-snowball/publishSigned zio-aws-snowdevicemanagement/publishSigned
-        zio-aws-sns/publishSigned zio-aws-sqs/publishSigned zio-aws-ssm/publishSigned
-        zio-aws-ssmcontacts/publishSigned zio-aws-ssmincidents/publishSigned zio-aws-ssmsap/publishSigned
-        zio-aws-sso/publishSigned zio-aws-ssoadmin/publishSigned zio-aws-ssooidc/publishSigned
-        zio-aws-storagegateway/publishSigned zio-aws-sts/publishSigned zio-aws-support/publishSigned
-        zio-aws-supportapp/publishSigned zio-aws-swf/publishSigned zio-aws-synthetics/publishSigned
-        zio-aws-textract/publishSigned zio-aws-timestreamquery/publishSigned zio-aws-timestreamwrite/publishSigned
-        zio-aws-transcribe/publishSigned zio-aws-transcribestreaming/publishSigned
-        zio-aws-transfer/publishSigned zio-aws-translate/publishSigned zio-aws-voiceid/publishSigned
+      run: sbt -J-XX:+UseG1GC -J-Xmx6g -J-Xms6g -J-Xss16m ++${{ matrix.scala }} zio-aws-s3/publishSigned
+        zio-aws-s3control/publishSigned zio-aws-s3outposts/publishSigned zio-aws-sagemaker/publishSigned
+        zio-aws-sagemakera2iruntime/publishSigned zio-aws-sagemakeredge/publishSigned
+        zio-aws-sagemakerfeaturestoreruntime/publishSigned zio-aws-sagemakergeospatial/publishSigned
+        zio-aws-sagemakermetrics/publishSigned zio-aws-sagemakerruntime/publishSigned
+        zio-aws-savingsplans/publishSigned zio-aws-scheduler/publishSigned zio-aws-schemas/publishSigned
+        zio-aws-secretsmanager/publishSigned zio-aws-securityhub/publishSigned zio-aws-securitylake/publishSigned
+        zio-aws-serverlessapplicationrepository/publishSigned zio-aws-servicecatalog/publishSigned
+        zio-aws-servicecatalogappregistry/publishSigned zio-aws-servicediscovery/publishSigned
+        zio-aws-servicequotas/publishSigned zio-aws-ses/publishSigned zio-aws-sesv2/publishSigned
+        zio-aws-sfn/publishSigned zio-aws-shield/publishSigned zio-aws-signer/publishSigned
+        zio-aws-simspaceweaver/publishSigned zio-aws-sms/publishSigned zio-aws-snowball/publishSigned
+        zio-aws-snowdevicemanagement/publishSigned zio-aws-sns/publishSigned zio-aws-sqs/publishSigned
+        zio-aws-ssm/publishSigned zio-aws-ssmcontacts/publishSigned zio-aws-ssmincidents/publishSigned
+        zio-aws-ssmsap/publishSigned zio-aws-sso/publishSigned zio-aws-ssoadmin/publishSigned
+        zio-aws-ssooidc/publishSigned zio-aws-storagegateway/publishSigned zio-aws-sts/publishSigned
+        zio-aws-support/publishSigned zio-aws-supportapp/publishSigned zio-aws-swf/publishSigned
+        zio-aws-synthetics/publishSigned zio-aws-textract/publishSigned zio-aws-timestreamquery/publishSigned
+        zio-aws-timestreamwrite/publishSigned zio-aws-tnb/publishSigned zio-aws-transcribe/publishSigned
+        zio-aws-transcribestreaming/publishSigned zio-aws-transfer/publishSigned zio-aws-translate/publishSigned
+        zio-aws-verifiedpermissions/publishSigned zio-aws-voiceid/publishSigned zio-aws-vpclattice/publishSigned
         zio-aws-waf/publishSigned zio-aws-wafregional/publishSigned zio-aws-wafv2/publishSigned
         zio-aws-wellarchitected/publishSigned zio-aws-wisdom/publishSigned zio-aws-workdocs/publishSigned
         zio-aws-worklink/publishSigned zio-aws-workmail/publishSigned zio-aws-workmailmessageflow/publishSigned
@@ -768,9 +782,9 @@ jobs:
         os:
         - ubuntu-latest
         scala:
-        - 2.12.17
-        - 2.13.10
-        - 3.2.1
+        - 2.12.18
+        - 2.13.12
+        - 3.3.1
         java:
         - adopt@1.8
     needs:
@@ -868,12 +882,12 @@ jobs:
           ~/.sbt
           ~/.coursier/cache/v1
           ~/.cache/coursier/v1
-        key: ubuntu-latest-sbt-2.13.10-${{ hashFiles('**/*.sbt') }}-${{ hashFiles('**/build.properties')
+        key: ubuntu-latest-sbt-2.13.12-${{ hashFiles('**/*.sbt') }}-${{ hashFiles('**/build.properties')
           }}
     - name: Download stored core targets
       uses: actions/download-artifact@v2
       with:
-        name: target-core-ubuntu-latest-2.13.10-adopt@1.8
+        name: target-core-ubuntu-latest-2.13.12-adopt@1.8
     - name: Inflate core targets
       run: |-
         tar xvf targets.tar
@@ -881,7 +895,7 @@ jobs:
     - name: Download stored clients-0 targets
       uses: actions/download-artifact@v2
       with:
-        name: target-clients-0-ubuntu-latest-2.13.10-adopt@1.8
+        name: target-clients-0-ubuntu-latest-2.13.12-adopt@1.8
     - name: Inflate clients-0 targets
       run: |-
         tar xvf targets.tar
@@ -889,7 +903,7 @@ jobs:
     - name: Download stored clients-1 targets
       uses: actions/download-artifact@v2
       with:
-        name: target-clients-1-ubuntu-latest-2.13.10-adopt@1.8
+        name: target-clients-1-ubuntu-latest-2.13.12-adopt@1.8
     - name: Inflate clients-1 targets
       run: |-
         tar xvf targets.tar
@@ -897,7 +911,7 @@ jobs:
     - name: Download stored clients-2 targets
       uses: actions/download-artifact@v2
       with:
-        name: target-clients-2-ubuntu-latest-2.13.10-adopt@1.8
+        name: target-clients-2-ubuntu-latest-2.13.12-adopt@1.8
     - name: Inflate clients-2 targets
       run: |-
         tar xvf targets.tar
@@ -905,7 +919,7 @@ jobs:
     - name: Download stored clients-3 targets
       uses: actions/download-artifact@v2
       with:
-        name: target-clients-3-ubuntu-latest-2.13.10-adopt@1.8
+        name: target-clients-3-ubuntu-latest-2.13.12-adopt@1.8
     - name: Inflate clients-3 targets
       run: |-
         tar xvf targets.tar
@@ -913,7 +927,7 @@ jobs:
     - name: Download stored clients-4 targets
       uses: actions/download-artifact@v2
       with:
-        name: target-clients-4-ubuntu-latest-2.13.10-adopt@1.8
+        name: target-clients-4-ubuntu-latest-2.13.12-adopt@1.8
     - name: Inflate clients-4 targets
       run: |-
         tar xvf targets.tar
@@ -921,7 +935,7 @@ jobs:
     - name: Download stored clients-5 targets
       uses: actions/download-artifact@v2
       with:
-        name: target-clients-5-ubuntu-latest-2.13.10-adopt@1.8
+        name: target-clients-5-ubuntu-latest-2.13.12-adopt@1.8
     - name: Inflate clients-5 targets
       run: |-
         tar xvf targets.tar
@@ -929,7 +943,7 @@ jobs:
     - name: Download stored core targets
       uses: actions/download-artifact@v2
       with:
-        name: target-core-ubuntu-latest-2.12.17-adopt@1.8
+        name: target-core-ubuntu-latest-2.12.18-adopt@1.8
     - name: Inflate core targets
       run: |-
         tar xvf targets.tar
@@ -937,7 +951,7 @@ jobs:
     - name: Download stored clients-0 targets
       uses: actions/download-artifact@v2
       with:
-        name: target-clients-0-ubuntu-latest-2.12.17-adopt@1.8
+        name: target-clients-0-ubuntu-latest-2.12.18-adopt@1.8
     - name: Inflate clients-0 targets
       run: |-
         tar xvf targets.tar
@@ -945,7 +959,7 @@ jobs:
     - name: Download stored clients-1 targets
       uses: actions/download-artifact@v2
       with:
-        name: target-clients-1-ubuntu-latest-2.12.17-adopt@1.8
+        name: target-clients-1-ubuntu-latest-2.12.18-adopt@1.8
     - name: Inflate clients-1 targets
       run: |-
         tar xvf targets.tar
@@ -953,7 +967,7 @@ jobs:
     - name: Download stored clients-2 targets
       uses: actions/download-artifact@v2
       with:
-        name: target-clients-2-ubuntu-latest-2.12.17-adopt@1.8
+        name: target-clients-2-ubuntu-latest-2.12.18-adopt@1.8
     - name: Inflate clients-2 targets
       run: |-
         tar xvf targets.tar
@@ -961,7 +975,7 @@ jobs:
     - name: Download stored clients-3 targets
       uses: actions/download-artifact@v2
       with:
-        name: target-clients-3-ubuntu-latest-2.12.17-adopt@1.8
+        name: target-clients-3-ubuntu-latest-2.12.18-adopt@1.8
     - name: Inflate clients-3 targets
       run: |-
         tar xvf targets.tar
@@ -969,7 +983,7 @@ jobs:
     - name: Download stored clients-4 targets
       uses: actions/download-artifact@v2
       with:
-        name: target-clients-4-ubuntu-latest-2.12.17-adopt@1.8
+        name: target-clients-4-ubuntu-latest-2.12.18-adopt@1.8
     - name: Inflate clients-4 targets
       run: |-
         tar xvf targets.tar
@@ -977,7 +991,7 @@ jobs:
     - name: Download stored clients-5 targets
       uses: actions/download-artifact@v2
       with:
-        name: target-clients-5-ubuntu-latest-2.12.17-adopt@1.8
+        name: target-clients-5-ubuntu-latest-2.12.18-adopt@1.8
     - name: Inflate clients-5 targets
       run: |-
         tar xvf targets.tar
@@ -985,7 +999,7 @@ jobs:
     - name: Download stored core targets
       uses: actions/download-artifact@v2
       with:
-        name: target-core-ubuntu-latest-3.2.1-adopt@1.8
+        name: target-core-ubuntu-latest-3.3.1-adopt@1.8
     - name: Inflate core targets
       run: |-
         tar xvf targets.tar
@@ -993,7 +1007,7 @@ jobs:
     - name: Download stored clients-0 targets
       uses: actions/download-artifact@v2
       with:
-        name: target-clients-0-ubuntu-latest-3.2.1-adopt@1.8
+        name: target-clients-0-ubuntu-latest-3.3.1-adopt@1.8
     - name: Inflate clients-0 targets
       run: |-
         tar xvf targets.tar
@@ -1001,7 +1015,7 @@ jobs:
     - name: Download stored clients-1 targets
       uses: actions/download-artifact@v2
       with:
-        name: target-clients-1-ubuntu-latest-3.2.1-adopt@1.8
+        name: target-clients-1-ubuntu-latest-3.3.1-adopt@1.8
     - name: Inflate clients-1 targets
       run: |-
         tar xvf targets.tar
@@ -1009,7 +1023,7 @@ jobs:
     - name: Download stored clients-2 targets
       uses: actions/download-artifact@v2
       with:
-        name: target-clients-2-ubuntu-latest-3.2.1-adopt@1.8
+        name: target-clients-2-ubuntu-latest-3.3.1-adopt@1.8
     - name: Inflate clients-2 targets
       run: |-
         tar xvf targets.tar
@@ -1017,7 +1031,7 @@ jobs:
     - name: Download stored clients-3 targets
       uses: actions/download-artifact@v2
       with:
-        name: target-clients-3-ubuntu-latest-3.2.1-adopt@1.8
+        name: target-clients-3-ubuntu-latest-3.3.1-adopt@1.8
     - name: Inflate clients-3 targets
       run: |-
         tar xvf targets.tar
@@ -1025,7 +1039,7 @@ jobs:
     - name: Download stored clients-4 targets
       uses: actions/download-artifact@v2
       with:
-        name: target-clients-4-ubuntu-latest-3.2.1-adopt@1.8
+        name: target-clients-4-ubuntu-latest-3.3.1-adopt@1.8
     - name: Inflate clients-4 targets
       run: |-
         tar xvf targets.tar
@@ -1033,7 +1047,7 @@ jobs:
     - name: Download stored clients-5 targets
       uses: actions/download-artifact@v2
       with:
-        name: target-clients-5-ubuntu-latest-3.2.1-adopt@1.8
+        name: target-clients-5-ubuntu-latest-3.3.1-adopt@1.8
     - name: Inflate clients-5 targets
       run: |-
         tar xvf targets.tar
diff --git a/docs/aspects.md b/docs/aspects.md
index caba43db2..05af5eeb8 100644
--- a/docs/aspects.md
+++ b/docs/aspects.md
@@ -44,6 +44,6 @@ import zio.aws.core.AwsError
     }
 ```
 
-This aspect can attached to a _client layer_ with the `@@` operator. Multiple aspects can be composed with `>>>`.
+This aspect can attached to a _client layer_ with the `@@@` operator. Multiple aspects can be composed with `>>>`.
 
 To see a full example, check [example #2](https://github.com/vigoo/zio-aws/blob/master/examples/example2/src/main/scala/Main.scala).
diff --git a/docs/changelog.md b/docs/changelog.md
index 90d6ce714..79169320c 100644
--- a/docs/changelog.md
+++ b/docs/changelog.md
@@ -8,6 +8,9 @@ title: Changelog
 Note: this is a manually maintained list of important changes. Because of having auto-release from CI, this
 list may not reflect _all_ changes immediately. Dependencies are continuously updated and are not documented here.
 
+#### 7.x.x.x
+- ZIO 2.0.18 introduced a `ZLayerAspect` which uses the same operator (`@@`) that ZIO AWS was using on layers, but it is not powerful enough to express this library's aspects. The new operator conflicts with the existing extension method, so starting from this version it has been renamed from `@@` to `@@@` to avoid the conflict. 
+
 #### 6.x.x.x
 - Using the new ZIO config providers, compatible with ZIO Config 4.x.x
 
diff --git a/examples/example2/src/main/scala/Main.scala b/examples/example2/src/main/scala/Main.scala
index a22e95da4..6b56ee26f 100644
--- a/examples/example2/src/main/scala/Main.scala
+++ b/examples/example2/src/main/scala/Main.scala
@@ -55,9 +55,9 @@ object Main extends ZIOAppDefault {
         // Default DynamoDB layer
         // val dynamoDb: ZLayer[AwsConfig, Throwable, DynamoDb] = dynamodb.live
         // DynamoDB with logging
-        // val dynamoDb: ZLayer[AwsConfig, Throwable, DynamoDb] = dynamodb.live @@ logging
+        // val dynamoDb: ZLayer[AwsConfig, Throwable, DynamoDb] = dynamodb.live @@@ logging
         // DynamoDB with circuit breaker
-        // val dynamoDb: ZLayer[AwsConfig, Throwable, DynamoDb] = dynamodb.live @@ circuitBreaking(cb)
+        // val dynamoDb: ZLayer[AwsConfig, Throwable, DynamoDb] = dynamodb.live @@@ circuitBreaking(cb)
 
         val dynamoDb = DynamoDb.live @@ (logging >>> circuitBreaking(cb))
         val finalLayer = awsConfig >>> dynamoDb
diff --git a/integtests/src/test/scala/zio/aws/integtests/DynamoDbTests.scala b/integtests/src/test/scala/zio/aws/integtests/DynamoDbTests.scala
index 40dc4c5f6..df996938d 100644
--- a/integtests/src/test/scala/zio/aws/integtests/DynamoDbTests.scala
+++ b/integtests/src/test/scala/zio/aws/integtests/DynamoDbTests.scala
@@ -39,7 +39,7 @@ object DynamoDbTests extends ZIOSpecDefault with Logging with Retries {
         .create(AwsBasicCredentials.create("dummy", "key"))
     ).region(Region.US_WEST_2)
       .endpointOverride(new URI("http://localhost:4566"))
-  ) @@ callLogging @@ callRetries
+  ) @@@ callLogging @@@ callRetries
 
   private def testTable(prefix: String): ZIO[DynamoDb, Nothing, ZIO[
     DynamoDb with Scope,
diff --git a/integtests/src/test/scala/zio/aws/integtests/S3Tests.scala b/integtests/src/test/scala/zio/aws/integtests/S3Tests.scala
index 215f9e290..d43de156a 100644
--- a/integtests/src/test/scala/zio/aws/integtests/S3Tests.scala
+++ b/integtests/src/test/scala/zio/aws/integtests/S3Tests.scala
@@ -42,7 +42,7 @@ object S3Tests extends ZIOSpecDefault with Logging with Retries {
     ).region(Region.US_WEST_2)
       .endpointOverride(new URI("http://localhost:4566"))
       .serviceConfiguration(_.pathStyleAccessEnabled(true))
-  ) @@ callLogging @@ callRetries
+  ) @@@ callLogging @@@ callRetries
 
   private def testBucket(
       prefix: String
diff --git a/project/Common.scala b/project/Common.scala
index fc703d012..0ae7668c2 100644
--- a/project/Common.scala
+++ b/project/Common.scala
@@ -11,26 +11,26 @@ import scala.collection.JavaConverters._
 object Common extends AutoPlugin {
 
   object autoImport {
-    val zioVersion = "2.0.14"
-    val zioMockVersion = "1.0.0-RC8"
-    val zioCatsInteropVersion = "23.0.0.6"
+    val zioVersion = "2.0.18"
+    val zioMockVersion = "1.0.0-RC11"
+    val zioCatsInteropVersion = "23.1.0.0"
     val zioReactiveStreamsInteropVersion = "2.0.2"
     val zioConfigVersion = "4.0.0-RC16"
-    val zioPreludeVersion = "1.0.0-RC19"
+    val zioPreludeVersion = "1.0.0-RC21"
     val catsEffectVersion = "3.5.2"
 
-    val awsVersion = "2.20.162"
+    val awsVersion = "2.21.15"
     val awsSubVersion = awsVersion.drop(awsVersion.indexOf('.') + 1)
     val http4sVersion = "0.23.19"
     val blazeVersion = "0.23.15"
     val fs2Version = "3.7.0"
 
-    val majorVersion = "6"
+    val majorVersion = "7"
     val zioAwsVersionPrefix = s"$majorVersion.$awsSubVersion."
 
     val scala212Version = "2.12.18"
     val scala213Version = "2.13.12"
-    val scala3Version = "3.2.2"
+    val scala3Version = "3.3.1"
 
     val scalacOptions212 = Seq("-Ypartial-unification", "-deprecation")
     val scalacOptions213 = Seq("-deprecation")
diff --git a/zio-aws-codegen/build.sbt b/zio-aws-codegen/build.sbt
index a827a4b37..1d955c94e 100644
--- a/zio-aws-codegen/build.sbt
+++ b/zio-aws-codegen/build.sbt
@@ -1,5 +1,5 @@
-val zioVersion = "2.0.6"
-val awsVersion = "2.20.162"
+val zioVersion = "2.0.18"
+val awsVersion = "2.21.15"
 
 sbtPlugin := true
 scalaVersion := "2.12.18"
diff --git a/zio-aws-codegen/src/main/scala/zio/aws/codegen/generator/GithubActionsGenerator.scala b/zio-aws-codegen/src/main/scala/zio/aws/codegen/generator/GithubActionsGenerator.scala
index a89ac052b..fb6aca07f 100644
--- a/zio-aws-codegen/src/main/scala/zio/aws/codegen/generator/GithubActionsGenerator.scala
+++ b/zio-aws-codegen/src/main/scala/zio/aws/codegen/generator/GithubActionsGenerator.scala
@@ -37,7 +37,7 @@ trait GithubActionsGenerator {
 
     val scala212 = ScalaVersion("2.12.18")
     val scala213 = ScalaVersion("2.13.12")
-    val scala3 = ScalaVersion("3.2.2")
+    val scala3 = ScalaVersion("3.3.1")
     val scalaVersions = Seq(
       scala212,
       scala213,
diff --git a/zio-aws-core/src/main/scala/zio/aws/core/aspects/package.scala b/zio-aws-core/src/main/scala/zio/aws/core/aspects/package.scala
index b91563cd9..84670a9d1 100644
--- a/zio-aws-core/src/main/scala/zio/aws/core/aspects/package.scala
+++ b/zio-aws-core/src/main/scala/zio/aws/core/aspects/package.scala
@@ -81,7 +81,7 @@ package object aspects {
   implicit class ZLayerSyntax[RIn, E, ROut <: AspectSupport[ROut]: Tag](
       layer: ZLayer[RIn, E, ROut]
   ) {
-    def @@[RIn1 <: RIn: Tag](
+    def @@@[RIn1 <: RIn: Tag](
         aspect: AwsCallAspect[RIn1]
     ): ZLayer[RIn1, E, ROut] =
       ZLayer.scoped[RIn1] {
diff --git a/zio-aws-http4s/src/main/scala/zio/aws/http4s/Http4sClient.scala b/zio-aws-http4s/src/main/scala/zio/aws/http4s/Http4sClient.scala
index eedf75e57..1ec9c47af 100644
--- a/zio-aws-http4s/src/main/scala/zio/aws/http4s/Http4sClient.scala
+++ b/zio-aws-http4s/src/main/scala/zio/aws/http4s/Http4sClient.scala
@@ -96,7 +96,7 @@ class Http4sClient(client: Client[Task], closeFn: () => Unit)(implicit
   ): EntityBody[Task] =
     if (method.canHaveBody) {
       publisher
-        .toStreamBuffered(1)(asyncRuntimeInstance)
+        .toStreamBuffered[Task](1)
         .map(fs2.Chunk.byteBuffer(_))
         .flatMap(Stream.chunk(_))
     } else {