diff --git a/.github/workflows/android-device-test.yml b/.github/workflows/android-device-test.yml
index 9d1c2efbe52..263c4c76ae3 100644
--- a/.github/workflows/android-device-test.yml
+++ b/.github/workflows/android-device-test.yml
@@ -144,9 +144,6 @@ jobs:
           export testPackageType=INSTRUMENTATION_TEST_PACKAGE
           export testType=INSTRUMENTATION
           export testFilter="${{ matrix.test.testFilter }}"
-          export AWS_ACCESS_KEY_ID="${{ secrets.AWS_ACCESS_KEY_ID }}"
-          export AWS_SECRET_ACCESS_KEY="${{ secrets.AWS_SECRET_ACCESS_KEY }}"
-          export AWS_ROLE_TO_ASSUME="${{ vars.OIDC_AWS_ROLE_TO_ASSUME }}"
           export AWS_DEVICE_FARM_PROJECT_ARN="${{ vars.AWS_DEVICE_FARM_PROJECT_ARN }}"
           export AWS_DEVICE_FARM_DEVICE_POOL_ARN="${{ matrix.test.devicePool }}"
           export testSpecArn="${{ matrix.test.testSpecArn }}"
diff --git a/.github/workflows/ios-device-test.yml b/.github/workflows/ios-device-test.yml
index 5ea5666f28e..fc8bde6698c 100644
--- a/.github/workflows/ios-device-test.yml
+++ b/.github/workflows/ios-device-test.yml
@@ -58,9 +58,6 @@ jobs:
           export testFile="${{ matrix.test.xcTestFile }}"
           export testPackageType=XCTEST_TEST_PACKAGE
           export testType=XCTEST
-          export AWS_ACCESS_KEY_ID="${{ secrets.AWS_ACCESS_KEY_ID }}"
-          export AWS_SECRET_ACCESS_KEY="${{ secrets.AWS_SECRET_ACCESS_KEY }}"
-          export AWS_ROLE_TO_ASSUME="${{ vars.OIDC_AWS_ROLE_TO_ASSUME }}"
           export AWS_DEVICE_FARM_PROJECT_ARN="${{ vars.AWS_DEVICE_FARM_PROJECT_ARN }}"
           export AWS_DEVICE_FARM_DEVICE_POOL_ARN="${{ vars.AWS_DEVICE_FARM_IPHONE_DEVICE_POOL_ARN }}"
           export wait_for_completion=true
diff --git a/scripts/aws-device-farm/aws-device-farm-run.sh b/scripts/aws-device-farm/aws-device-farm-run.sh
index 31b58db2fd1..9b76bb0f844 100755
--- a/scripts/aws-device-farm/aws-device-farm-run.sh
+++ b/scripts/aws-device-farm/aws-device-farm-run.sh
@@ -1,5 +1,7 @@
 #!/bin/bash
 
+set -e
+
 # List of required environment variables
 required_vars=(
   "AWS_DEVICE_FARM_PROJECT_ARN"