diff --git a/.github/workflows/deploy-custom-prod.yml b/.github/workflows/deploy-custom-prod.yml
index ed9909ef7..680cc2092 100644
--- a/.github/workflows/deploy-custom-prod.yml
+++ b/.github/workflows/deploy-custom-prod.yml
@@ -338,10 +338,8 @@ jobs:
 
       - uses: aws-actions/configure-aws-credentials@v6
         with:
-          aws-access-key-id: ${{ secrets.V2_AWS_ACCESS_KEY_ID }}
-          aws-secret-access-key: ${{ secrets.V2_AWS_SECRET_ACCESS_KEY }}
-          aws-session-token: ${{ secrets.V2_AWS_SESSION_TOKEN }}
           aws-region: ${{ secrets.AWS_REGION }}
+          aws-role-arn: ${{ secrets.AWS_ROLE_ARN }}
 
       - uses: actions/setup-python@v6
         with:
diff --git a/.github/workflows/deploy-custom-test.yml b/.github/workflows/deploy-custom-test.yml
index ada0d8fa6..46e3272d9 100644
--- a/.github/workflows/deploy-custom-test.yml
+++ b/.github/workflows/deploy-custom-test.yml
@@ -188,10 +188,8 @@ jobs:
 
       - uses: aws-actions/configure-aws-credentials@v6
         with:
-          aws-access-key-id: ${{ secrets.V2_AWS_ACCESS_KEY_ID }}
-          aws-secret-access-key: ${{ secrets.V2_AWS_SECRET_ACCESS_KEY }}
-          aws-session-token: ${{ secrets.V2_AWS_SESSION_TOKEN }}
           aws-region: ${{ secrets.AWS_REGION }}
+          aws-role-arn: ${{ secrets.AWS_ROLE_ARN }}
 
       - uses: actions/setup-python@v6
         with:
diff --git a/.github/workflows/deploy-daac-prod.yml b/.github/workflows/deploy-daac-prod.yml
index b27f019ff..8196351a4 100644
--- a/.github/workflows/deploy-daac-prod.yml
+++ b/.github/workflows/deploy-daac-prod.yml
@@ -49,10 +49,8 @@ jobs:
 
       - uses: aws-actions/configure-aws-credentials@v6
         with:
-          aws-access-key-id: ${{ secrets.V2_AWS_ACCESS_KEY_ID }}
-          aws-secret-access-key: ${{ secrets.V2_AWS_SECRET_ACCESS_KEY }}
-          aws-session-token: ${{ secrets.V2_AWS_SESSION_TOKEN }}
           aws-region: ${{ secrets.AWS_REGION }}
+          aws-role-arn: ${{ secrets.AWS_ROLE_ARN }}
 
       - uses: actions/setup-python@v6
         with:
diff --git a/.github/workflows/deploy-daac-test.yml b/.github/workflows/deploy-daac-test.yml
index 45e7a07c8..0e7d87fc3 100644
--- a/.github/workflows/deploy-daac-test.yml
+++ b/.github/workflows/deploy-daac-test.yml
@@ -49,10 +49,8 @@ jobs:
 
       - uses: aws-actions/configure-aws-credentials@v6
         with:
-          aws-access-key-id: ${{ secrets.V2_AWS_ACCESS_KEY_ID }}
-          aws-secret-access-key: ${{ secrets.V2_AWS_SECRET_ACCESS_KEY }}
-          aws-session-token: ${{ secrets.V2_AWS_SESSION_TOKEN }}
           aws-region: ${{ secrets.AWS_REGION }}
+          aws-role-arn: ${{ secrets.V2_AWS_ROLE_ARN }}
 
       - uses: actions/setup-python@v6
         with:
diff --git a/.github/workflows/deploy-edc-sandbox.yml b/.github/workflows/deploy-edc-sandbox.yml
index f7955155d..f7ffb7307 100644
--- a/.github/workflows/deploy-edc-sandbox.yml
+++ b/.github/workflows/deploy-edc-sandbox.yml
@@ -50,10 +50,8 @@ jobs:
 
       - uses: aws-actions/configure-aws-credentials@v6
         with:
-          aws-access-key-id: ${{ secrets.V2_AWS_ACCESS_KEY_ID }}
-          aws-secret-access-key: ${{ secrets.V2_AWS_SECRET_ACCESS_KEY }}
-          aws-session-token: ${{ secrets.V2_AWS_SESSION_TOKEN }}
           aws-region: ${{ secrets.AWS_REGION }}
+          aws-role-arn: ${{ secrets.AWS_ROLE_ARN }}
 
       - uses: actions/setup-python@v6
         with:
diff --git a/.github/workflows/deploy-plus-prod.yml b/.github/workflows/deploy-plus-prod.yml
index 9acde7574..cead14592 100644
--- a/.github/workflows/deploy-plus-prod.yml
+++ b/.github/workflows/deploy-plus-prod.yml
@@ -47,10 +47,8 @@ jobs:
 
       - uses: aws-actions/configure-aws-credentials@v6
         with:
-          aws-access-key-id: ${{ secrets.V2_AWS_ACCESS_KEY_ID }}
-          aws-secret-access-key: ${{ secrets.V2_AWS_SECRET_ACCESS_KEY }}
-          aws-session-token: ${{ secrets.V2_AWS_SESSION_TOKEN }}
           aws-region: ${{ secrets.AWS_REGION }}
+          aws-role-arn: ${{ secrets.AWS_ROLE_ARN }}
 
       - uses: actions/setup-python@v6
         with:
diff --git a/.github/workflows/deploy-plus-test.yml b/.github/workflows/deploy-plus-test.yml
index 8b339ca36..b4d35ac80 100644
--- a/.github/workflows/deploy-plus-test.yml
+++ b/.github/workflows/deploy-plus-test.yml
@@ -48,10 +48,8 @@ jobs:
 
       - uses: aws-actions/configure-aws-credentials@v6
         with:
-          aws-access-key-id: ${{ secrets.V2_AWS_ACCESS_KEY_ID }}
-          aws-secret-access-key: ${{ secrets.V2_AWS_SECRET_ACCESS_KEY }}
-          aws-session-token: ${{ secrets.V2_AWS_SESSION_TOKEN }}
           aws-region: ${{ secrets.AWS_REGION }}
+          aws-role-arn: ${{ secrets.AWS_ROLE_ARN }}
 
       - uses: actions/setup-python@v6
         with:
diff --git a/README.md b/README.md
index bfe0d315d..f28b55e49 100644
--- a/README.md
+++ b/README.md
@@ -160,6 +160,7 @@ aws --profile <profile> cloudformation deploy \
 Once the `github-actions` IAM user has been created, you can create an AWS access key for that user,
 which we will use to deploy HyP3 via CI/CD tooling:
 
+## TODO UPDATE WITH OIDC STEPS
 1. Go to AWS console -> IAM -> Users -> github-actions -> security credentials tab -> "create access key".
 2. Select "Other" for key usage
 3. (Optional) Add tag value to describe the key, such as "For GitHub Actions CI/CD pipelines"
diff --git a/tests/cfg.env b/tests/cfg.env
index 0e2ab9fdd..eeb8d209d 100644
--- a/tests/cfg.env
+++ b/tests/cfg.env
@@ -8,8 +8,5 @@ DEFAULT_CREDITS_PER_USER=25
 DEFAULT_APPLICATION_STATUS=NOT_STARTED
 SYSTEM_AVAILABLE=true
 AWS_DEFAULT_REGION=us-west-2
-AWS_ACCESS_KEY_ID=testing
-AWS_SECRET_ACCESS_KEY=testing
-AWS_SECURITY_TOKEN=testing
-AWS_SESSION_TOKEN=testing
+AWS_ROLE_ARN=testing
 CONTENT_BUCKET=test-bucket