diff --git a/custom-runtime/pom.xml b/custom-runtime/pom.xml
index c0ce06a..2dd74bd 100644
--- a/custom-runtime/pom.xml
+++ b/custom-runtime/pom.xml
@@ -43,8 +43,8 @@
             <artifactId>aws-lambda-java-events</artifactId>
         </dependency>
         <dependency>
-            <groupId>com.amazonaws</groupId>
-            <artifactId>aws-java-sdk-iam</artifactId>
+            <groupId>software.amazon.awssdk</groupId>
+            <artifactId>iam</artifactId>
         </dependency>
         <dependency>
             <groupId>ch.qos.logback</groupId>
diff --git a/jwt-authorizer/Authorizer/pom.xml b/jwt-authorizer/Authorizer/pom.xml
index 9e0f2af..1f94873 100644
--- a/jwt-authorizer/Authorizer/pom.xml
+++ b/jwt-authorizer/Authorizer/pom.xml
@@ -18,7 +18,7 @@
         <version.encoder>1.2.3</version.encoder>
         <version.lambda-core>1.2.3</version.lambda-core>
         <version.lambda-events>3.15.0</version.lambda-events>
-        <version.lambda-iam>1.12.745</version.lambda-iam>
+        <version.lambda-awssdk>2.31.2</version.lambda-awssdk>
         <version.jose4j>0.9.6</version.jose4j>
         <version.logback>1.5.16</version.logback>
         <version.junit>5.11.3</version.junit>
@@ -64,9 +64,9 @@
             <version>${version.lambda-events}</version>
         </dependency>
         <dependency>
-            <groupId>com.amazonaws</groupId>
-            <artifactId>aws-java-sdk-iam</artifactId>
-            <version>${version.lambda-iam}</version>
+            <groupId>software.amazon.awssdk</groupId>
+            <artifactId>iam</artifactId>
+            <version>${version.lambda-awssdk}</version>
         </dependency>
         <dependency>
             <groupId>com.fasterxml.jackson.core</groupId>
diff --git a/jwt-authorizer/Authorizer/src/main/java/com/networknt/aws/lambda/Authorizer.java b/jwt-authorizer/Authorizer/src/main/java/com/networknt/aws/lambda/Authorizer.java
index 78d85b5..2dee6c6 100644
--- a/jwt-authorizer/Authorizer/src/main/java/com/networknt/aws/lambda/Authorizer.java
+++ b/jwt-authorizer/Authorizer/src/main/java/com/networknt/aws/lambda/Authorizer.java
@@ -3,7 +3,6 @@
 import com.amazonaws.services.lambda.runtime.Context;
 import com.amazonaws.services.lambda.runtime.RequestHandler;
 import com.amazonaws.services.lambda.runtime.events.APIGatewayProxyRequestEvent;
-import com.fasterxml.jackson.core.JsonProcessingException;
 import com.fasterxml.jackson.databind.ObjectMapper;
 import com.networknt.config.JsonMapper;
 import com.networknt.utility.Constants;
@@ -55,11 +54,11 @@ public AuthPolicy handleRequest(APIGatewayProxyRequestEvent request, Context con
             // handle the primary token.
             String clientId = claims.getStringClaimValue(Constants.CLIENT_ID_STRING);
             // try to get the cid as some OAuth tokens name it as cid like Okta.
-            if(clientId == null) clientId = claims.getStringClaimValue(Constants.CID_STRING);
+            if(clientId == null) clientId = claims.getStringClaimValue(Constants.CID);
             ctx.put(Constants.CLIENT_ID_STRING, clientId);
             String userId = claims.getStringClaimValue(Constants.USER_ID_STRING);
             // try to get the uid as some OAuth tokens name it as uid like Okta.
-            if(userId == null) userId = claims.getStringClaimValue(Constants.UID_STRING);
+            if(userId == null) userId = claims.getStringClaimValue(Constants.UID);
             if(userId != null) {
                 ctx.put(Constants.USER_ID_STRING, userId);
                 principalId = userId;
diff --git a/pom.xml b/pom.xml
index 8e74092..3d63597 100644
--- a/pom.xml
+++ b/pom.xml
@@ -298,9 +298,9 @@
                 <version>${version.lambda-events}</version>
             </dependency>
             <dependency>
-                <groupId>com.amazonaws</groupId>
-                <artifactId>aws-java-sdk-iam</artifactId>
-                <version>${version.lambda-iam}</version>
+                <groupId>software.amazon.awssdk</groupId>
+                <artifactId>iam</artifactId>
+                <version>${version.lambda-awssdk}</version>
             </dependency>
             <dependency>
                 <groupId>software.amazon.awssdk</groupId>