diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index 043f0a3d520..1eaf60521ba 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -178,8 +178,8 @@ jobs:
       nightly_release: ${{ inputs.nightly_release }}
 
     secrets:
-      AWS_ACCESS_KEY_ID: ${{ secrets.PRODUCTION_AWS_ACCESS_KEY_ID }}
-      AWS_SECRET_ACCESS_KEY: ${{ secrets.PRODUCTION_AWS_SECRET_ACCESS_KEY }}
+      AWS_ACCESS_KEY_ID: ${{ secrets.AWS_ACCESS_KEY_ID }}
+      AWS_SECRET_ACCESS_KEY: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
 
   github-release:
     name: GitHub Release
@@ -212,7 +212,7 @@ jobs:
 
   slack-notification:
     name: Slack Notification
-    if: ${{ failure() }}
+    if: ${{ failure() && (!inputs.test_run || inputs.nightly_release) }}
 
     needs:
       [