diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index defee757a..e240c1d60 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -18,6 +18,13 @@ env:
 permissions:
   id-token: write # This is required for requesting the JWT
 
+x-step-template: &configure-aws-credentials
+  - name: Configure AWS credentials (containers)
+      uses: aws-actions/configure-aws-credentials@v4
+      with:
+        role-to-assume: ${{ env.CRT_CI_ROLE }}
+        aws-region: ${{ env.AWS_DEFAULT_REGION }}
+
 jobs:
   linux-compat:
     runs-on: ubuntu-22.04 # latest
@@ -35,8 +42,7 @@ jobs:
           - rhel8-x64
           - al2-x64
     steps:
-    - uses: actions/checkout@v4
-    - uses: ./.github/actions/assume-aws-role
+    - uses: *configure-aws-credentials
     - name: Build ${{ env.PACKAGE_NAME }}
       run: |
         aws s3 cp s3://aws-crt-test-stuff/ci/${{ env.BUILDER_VERSION }}/linux-container-ci.sh ./linux-container-ci.sh && chmod a+x ./linux-container-ci.sh