diff --git a/.github/actions/release/action.yml b/.github/actions/release/action.yml
index d0ab2fcac..36bb03813 100644
--- a/.github/actions/release/action.yml
+++ b/.github/actions/release/action.yml
@@ -2,11 +2,8 @@ name: 'Release Action'
 description: 'Build and Push the application docker image'
 
 inputs:
-    aws-access-key-id:
-      description: 'AWS Access Key ID'
-      required: true
-    aws-secret-access-key:
-      description: 'AWS Secret Access Key'
+    aws-role-to-assume:
+      description: 'AWS Role to Assume'
       required: true
     public-registry-id:
       description: 'Public ECR Registry ID'
@@ -22,12 +19,17 @@ runs:
     - name: Set up Docker Buildx
       uses: docker/setup-buildx-action@v2
 
+    - name: configure aws credentials
+      uses: aws-actions/configure-aws-credentials@v1.7.0
+      with:
+        role-to-assume: ${{ inputs.aws-role-to-assume }}
+        role-session-name: ${{ inputs.aws-role-session-name }}
+        aws-region: us-east-1
+
     - name: Login to Amazon ECR
-      uses: docker/login-action@v1
+      uses: docker/login-action@v3
       with:
         registry: public.ecr.aws
-        username: ${{ inputs.aws-access-key-id }}
-        password: ${{ inputs.aws-secret-access-key }}
 
     - name: Build images
       run: make -f .github/actions/release/Makefile build
diff --git a/.github/workflows/cicd.yaml b/.github/workflows/cicd.yaml
index cf26e7a08..283526b7a 100644
--- a/.github/workflows/cicd.yaml
+++ b/.github/workflows/cicd.yaml
@@ -8,6 +8,11 @@ on:
       - ocean-spark
 
 
+permissions:
+  contents: read
+  pull-requests: read
+  id-token: write
+
 jobs:
   ci:
     runs-on: ubuntu-latest
@@ -41,8 +46,8 @@ jobs:
       - name: release to dev
         uses: ./.github/actions/release
         with:
-          aws-access-key-id: ${{ secrets.AWS_ACCESS_KEY_ID }}
-          aws-secret-access-key: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
+          aws-role-to-assume: ${{ secrets.AWS_ROLE_TO_ASSUME }}
+          aws-role-session-name: ${{ secrets.AWS_ROLE_SESSION_NAME }}
           public-registry-id: n8e8v3t5
 
   cd-prod:
@@ -56,6 +61,6 @@ jobs:
       - name: release to prod
         uses: ./.github/actions/release
         with:
-          aws-access-key-id: ${{ secrets.AWS_ACCESS_KEY_ID }}
-          aws-secret-access-key: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
+          aws-role-to-assume: ${{ secrets.AWS_ROLE_TO_ASSUME }}
+          aws-role-session-name: ${{ secrets.AWS_ROLE_SESSION_NAME }}
           public-registry-id: f4k1p1n4