diff --git a/.github/workflows/android-ci.yml b/.github/workflows/android-ci.yml
index f4ff37820..b4f42f2f5 100644
--- a/.github/workflows/android-ci.yml
+++ b/.github/workflows/android-ci.yml
@@ -152,7 +152,7 @@ jobs:
           aws-secret-access-key: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
           aws-region: us-west-2
           role-to-assume: ${{ vars.AWS_ROLE_TO_ASSUME }}
-          role-duration-seconds: 36000
+          role-duration-seconds: 21600
           role-session-name: MySessionName
 
       - name: Create upload
diff --git a/render-test/android/app/src/androidTest/java/android/app/NativeActivityTest.java b/render-test/android/app/src/androidTest/java/android/app/NativeActivityTest.java
index 2cbcb22e0..672e358e5 100644
--- a/render-test/android/app/src/androidTest/java/android/app/NativeActivityTest.java
+++ b/render-test/android/app/src/androidTest/java/android/app/NativeActivityTest.java
@@ -18,7 +18,7 @@ public class NativeActivityTest {
     @Rule
     public ActivityTestRule<NativeActivity> mActivityTestRule = new ActivityTestRule<>(NativeActivity.class, false, false);
 
-    @Test(timeout = 1200000L)
+    @Test(timeout = 600000L)
     public void runRenderTests() throws Exception {
         Log.v("Test", "Start the test");
         mActivityTestRule.launchActivity(null);