diff --git a/.github/workflows/build-nightly.yml b/.github/workflows/build-nightly.yml
index 225500a8cb36..ea2496416c98 100644
--- a/.github/workflows/build-nightly.yml
+++ b/.github/workflows/build-nightly.yml
@@ -6,6 +6,7 @@ on:
       - 'main'
   schedule:
     - cron: '0 0 * * *'
+  workflow_dispatch:
 jobs:
   build-nightly:
     runs-on: ubuntu-22.04
@@ -15,7 +16,7 @@ jobs:
     steps:
       - uses: aws-actions/configure-aws-credentials@v2
         with:
-          role-to-assume: arn:aws:iam::498127099666:role/WebIdentity-nm-github-actions-only
+          role-to-assume: ${{ secrets.AWS_WEBIDENTITY_FOR_GITHUB_ACTIONS }}
           aws-region: us-east-1
       - uses: actions/checkout@v3
       - run: | 
@@ -29,5 +30,13 @@ jobs:
              make -B build
              deactivate
              ls dist/
-             aws s3 ls s3://nm-github-actions/
-             aws s3 cp dist/*nightly*.whl s3://nm-github-actions/transformers/
+             aws s3 cp dist/*nightly*.whl s3://nm-github-actions/${{ github.event.repository.name }}/
+             todaytime=`date +%Y%m%d`
+             date '+%Y%m%d-%k:%M:%S' | tee log_${GITHUB_REF_NAME}_nightly_${todaytime}_${GITHUB_SHA:0:7}
+             aws s3 cp log_${GITHUB_REF_NAME}_nightly_${todaytime}_${GITHUB_SHA:0:7} s3://nm-github-actions/${{ github.event.repository.name }}/
+             oldDate=`date --date='-2 month' +%Y%m%d`
+             oldWhl=`(aws s3 ls s3://nm-github-actions/${{ github.event.repository.name }}/ | grep nightly | grep "${oldDate}") || echo "notfound"`
+             if [[ "${oldWhl}" != 'notfound' ]]; then
+                 echo "Remove old build ${oldWhl}"
+                 aws s3 rm s3://nm-github-actions/${{ github.event.repository.name }}/${oldWhl}
+             fi
diff --git a/.github/workflows/build-release.yml b/.github/workflows/build-release.yml
index f4cfbebc7535..b0bcb054e527 100644
--- a/.github/workflows/build-release.yml
+++ b/.github/workflows/build-release.yml
@@ -4,7 +4,7 @@ on:
   push:
     branches:
       - 'release/[0-9]+.[0-9]+'
-      
+  workflow_dispatch:
 jobs:
   build-release:
     runs-on: ubuntu-22.04
@@ -14,7 +14,7 @@ jobs:
     steps:
       - uses: aws-actions/configure-aws-credentials@v2
         with:
-          role-to-assume: arn:aws:iam::498127099666:role/WebIdentity-nm-github-actions-only
+          role-to-assume: ${{ secrets.AWS_WEBIDENTITY_FOR_GITHUB_ACTIONS }}
           aws-region: us-east-1
       - uses: actions/checkout@v3
       - run: | 
@@ -25,9 +25,11 @@ jobs:
              virtualenv venv
              source venv/bin/activate
              pip install -e .
-             sed -i 's/is_release = False/is_release = True/g' src/transformers/version.py
+             sed -i 's/is_release = False/is_release = True/g' src/${{ github.event.repository.name }}/version.py
              make -B build
              deactivate
              ls dist/
-             aws s3 ls s3://nm-github-actions/
-             aws s3 cp dist/*.whl s3://nm-github-actions/transformers/
+             aws s3 cp dist/*.whl s3://nm-github-actions/${{ github.event.repository.name }}/
+             todaytime=`date +%Y%m%d`
+             date '+%Y%m%d-%k:%M:%S' | tee log_${GITHUB_REF_NAME}_release_${todaytime}_${GITHUB_SHA:0:7}
+             aws s3 cp log_${GITHUB_REF_NAME}_release_${todaytime}_${GITHUB_SHA:0:7} s3://nm-github-actions/${{ github.event.repository.name }}/