diff --git a/src/bedrock_agentcore/gateway/client.py b/src/bedrock_agentcore/gateway/client.py
index dc837d5..9acb730 100644
--- a/src/bedrock_agentcore/gateway/client.py
+++ b/src/bedrock_agentcore/gateway/client.py
@@ -156,11 +156,11 @@ def create_gateway_target_and_wait(self, wait_config: Optional[WaitConfig] = Non
             TimeoutError: If the target doesn't become READY within max_wait.
         """
         response = self.cp_client.create_gateway_target(**convert_kwargs(kwargs))
-        gw_arn = response["gatewayArn"]
+        gw_id = response["gatewayArn"].rsplit("/", 1)[-1]
         target_id = response["targetId"]
         return wait_until(
             lambda: self.cp_client.get_gateway_target(
-                gatewayIdentifier=gw_arn,
+                gatewayIdentifier=gw_id,
                 targetId=target_id,
             ),
             "READY",
@@ -184,11 +184,11 @@ def update_gateway_target_and_wait(self, wait_config: Optional[WaitConfig] = Non
             TimeoutError: If the target doesn't become READY within max_wait.
         """
         response = self.cp_client.update_gateway_target(**convert_kwargs(kwargs))
-        gw_arn = response["gatewayArn"]
+        gw_id = response["gatewayArn"].rsplit("/", 1)[-1]
         target_id = response["targetId"]
         return wait_until(
             lambda: self.cp_client.get_gateway_target(
-                gatewayIdentifier=gw_arn,
+                gatewayIdentifier=gw_id,
                 targetId=target_id,
             ),
             "READY",
@@ -232,11 +232,11 @@ def delete_gateway_target_and_wait(
             TimeoutError: If the target isn't deleted within max_wait.
         """
         response = self.cp_client.delete_gateway_target(**convert_kwargs(kwargs))
-        gw_arn = response["gatewayArn"]
+        gw_id = response["gatewayArn"].rsplit("/", 1)[-1]
         target_id = response["targetId"]
         wait_until_deleted(
             lambda: self.cp_client.get_gateway_target(
-                gatewayIdentifier=gw_arn,
+                gatewayIdentifier=gw_id,
                 targetId=target_id,
             ),
             wait_config=wait_config,
diff --git a/tests_integ/gateway/test_gateway_client.py b/tests_integ/gateway/test_gateway_client.py
index 08e27b9..b91b407 100644
--- a/tests_integ/gateway/test_gateway_client.py
+++ b/tests_integ/gateway/test_gateway_client.py
@@ -241,6 +241,9 @@ def test_update_gateway_target_and_wait(self):
                     }
                 },
             },
+            credentialProviderConfigurations=[
+                {"credentialProviderType": "GATEWAY_IAM_ROLE"},
+            ],
             description="updated by integ test",
         )
         assert updated["status"] == "READY"