diff --git a/.github/workflows/build-and-release.yml b/.github/workflows/build-and-release.yml
index 0de0246..5b8cbcc 100644
--- a/.github/workflows/build-and-release.yml
+++ b/.github/workflows/build-and-release.yml
@@ -53,8 +53,7 @@ jobs:
 
   upload-artifacts-to-s3:
     needs: build-artifacts
-    # Upload only on PR merge
-    if: github.event_name == 'push' && github.ref == 'refs/heads/main'
+    environment: release
     runs-on: ubuntu-24.04
     permissions:
       id-token: write
@@ -70,8 +69,8 @@ jobs:
       - name: Upload to S3
         uses: DeterminateSystems/push-artifact-ids@main
         with:
-          s3_upload_role: ${{ secrets.AWS_S3_UPLOAD_ROLE }}
-          bucket: ${{ secrets.AWS_S3_UPLOAD_BUCKET }}
+          s3_upload_role: ${{ secrets.AWS_S3_UPLOAD_ROLE_ARN }}
+          bucket: ${{ secrets.AWS_S3_UPLOAD_BUCKET_NAME }}
           directory: ./artifacts
           ids_project_name: flake-iter
           ids_binary_prefix: flake-iter