diff --git a/.github/workflows/generate-upload-fossa-report.yml b/.github/workflows/generate-upload-fossa-report.yml
index 1a9855b2..a8f66ae6 100644
--- a/.github/workflows/generate-upload-fossa-report.yml
+++ b/.github/workflows/generate-upload-fossa-report.yml
@@ -10,6 +10,8 @@ on:
 jobs:
   fossa-scan:
     runs-on: ubuntu-latest
+    env:
+      FOSSA_API_KEY: ${{ secrets.FOSSA_API_KEY }}
     permissions:
       contents: read
       packages: write
@@ -102,12 +104,8 @@ jobs:
 
       - name: Analyze project
         run: fossa analyze
-        env:
-          FOSSA_API_KEY: ${{ secrets.FOSSA_API_KEY }}
 
       - name: Generate report
-        env:
-          FOSSA_API_KEY: ${{ secrets.FOSSA_API_KEY }}
         run: |
           # Run JSON report
           fossa report attribution --format json > fossa.json
@@ -131,7 +129,7 @@ jobs:
       -   name: Upload report to S3
           if: always()
           run: |
-            aws s3 cp $csv_filename s3://liquibaseorg-origin/enterprise_fossa_report/raw_reports/$csv_filename
+            aws s3 cp $csv_filename s3://liquibaseorg-origin/enterprise_fossa_report/raw_reports/
 #            filename="${{ steps.get_repo_name.outputs.repo_name }}.csv"
 #            aws s3 cp /home/runner/work/${{ steps.get_repo_name.outputs.repo_name }}/fossa_reports/$filename s3://liquibaseorg-origin/enterprise_fossa_report/raw_reports/$filename
           env: