diff --git a/draining/src/main/scala/com/dwolla/autoscaling/ecs/draining/TerminationEventHandler.scala b/draining/src/main/scala/com/dwolla/autoscaling/ecs/draining/TerminationEventHandler.scala
index f639231..6a1c254 100644
--- a/draining/src/main/scala/com/dwolla/autoscaling/ecs/draining/TerminationEventHandler.scala
+++ b/draining/src/main/scala/com/dwolla/autoscaling/ecs/draining/TerminationEventHandler.scala
@@ -11,7 +11,7 @@ import feral.lambda.{INothing, IOLambda, LambdaEnv}
 import org.http4s.ember.client.EmberClientBuilder
 import org.typelevel.log4cats.LoggerFactory
 import org.typelevel.log4cats.slf4j.Slf4jFactory
-import smithy4s.aws.http4s.*
+import smithy4s.aws.*
 import smithy4s.aws.kernel.AwsRegion
 import software.amazon.awssdk.services.autoscaling.AutoScalingAsyncClient
 import software.amazon.awssdk.services.sns.SnsAsyncClient
@@ -21,7 +21,8 @@ class TerminationEventHandler extends IOLambda[SnsEvent, INothing] {
     for {
       client <- EmberClientBuilder.default[IO].build
       given LoggerFactory[IO] = Slf4jFactory.create[IO]
-      ecs <- ECS.simpleAwsClient(client, AwsRegion.US_WEST_2).map(EcsAlg(_))
+      awsEnv <- AwsEnvironment.default(client, AwsRegion.US_WEST_2)
+      ecs <- AwsClient(ECS, awsEnv).map(EcsAlg(_))
       autoscalingClient <- Resource.fromAutoCloseable(IO(AutoScalingAsyncClient.builder().build()))
       sns <- Resource.fromAutoCloseable(IO(SnsAsyncClient.builder().build())).map(SnsAlg[IO](_))
       autoscaling = AutoScalingAlg[IO](autoscalingClient, sns)
diff --git a/draining/src/test/scala/com/dwolla/autoscaling/ecs/draining/TestApp.scala b/draining/src/test/scala/com/dwolla/autoscaling/ecs/draining/TestApp.scala
index 47c6bcb..20553c3 100644
--- a/draining/src/test/scala/com/dwolla/autoscaling/ecs/draining/TestApp.scala
+++ b/draining/src/test/scala/com/dwolla/autoscaling/ecs/draining/TestApp.scala
@@ -9,7 +9,7 @@ import com.dwolla.aws.ecs.EcsAlg
 import fs2.Stream
 import org.http4s.ember.client.EmberClientBuilder
 import org.typelevel.log4cats.*
-import smithy4s.aws.http4s.*
+import smithy4s.aws.*
 import smithy4s.aws.kernel.AwsRegion
 
 object TestApp extends IOApp.Simple {
@@ -18,7 +18,8 @@ object TestApp extends IOApp.Simple {
       for {
         client <- EmberClientBuilder.default[IO].build
         given LoggerFactory[IO] = new ConsoleLogger[IO]
-        ecs <- ECS.simpleAwsClient(client, AwsRegion.US_WEST_2).map(EcsAlg(_))
+        awsEnv <- AwsEnvironment.default(client, AwsRegion.US_WEST_2)
+        ecs <- AwsClient(ECS, awsEnv).map(EcsAlg(_))
       } yield ecs
     }
       .flatMap { ecs =>
diff --git a/registrator-health-check/src/main/scala/com/dwolla/autoscaling/ecs/registrator/ScaleOutPendingEventHandler.scala b/registrator-health-check/src/main/scala/com/dwolla/autoscaling/ecs/registrator/ScaleOutPendingEventHandler.scala
index fd4d139..f60865a 100644
--- a/registrator-health-check/src/main/scala/com/dwolla/autoscaling/ecs/registrator/ScaleOutPendingEventHandler.scala
+++ b/registrator-health-check/src/main/scala/com/dwolla/autoscaling/ecs/registrator/ScaleOutPendingEventHandler.scala
@@ -13,7 +13,7 @@ import feral.lambda.{INothing, IOLambda, LambdaEnv}
 import org.http4s.ember.client.EmberClientBuilder
 import org.typelevel.log4cats.LoggerFactory
 import org.typelevel.log4cats.slf4j.Slf4jFactory
-import smithy4s.aws.http4s.*
+import smithy4s.aws.*
 import smithy4s.aws.kernel.AwsRegion
 import software.amazon.awssdk.services.autoscaling.AutoScalingAsyncClient
 import software.amazon.awssdk.services.cloudformation.CloudFormationAsyncClient
@@ -25,7 +25,8 @@ class ScaleOutPendingEventHandler extends IOLambda[SnsEvent, INothing] {
     for {
       client <- EmberClientBuilder.default[IO].build
       given LoggerFactory[IO] = Slf4jFactory.create[IO]
-      ecs <- ECS.simpleAwsClient(client, AwsRegion.US_WEST_2).map(EcsAlg(_))
+      awsEnv <- AwsEnvironment.default(client, AwsRegion.US_WEST_2)
+      ecs <- AwsClient(ECS, awsEnv).map(EcsAlg(_))
       autoscalingClient <- Resource.fromAutoCloseable(IO(AutoScalingAsyncClient.builder().build()))
       sns <- Resource.fromAutoCloseable(IO(SnsAsyncClient.builder().build())).map(SnsAlg[IO](_))
       ec2Client <- Resource.fromAutoCloseable(IO(Ec2AsyncClient.builder().build())).map(Ec2Alg[IO](_))