diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 1a392d0a..e7dd43a1 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -6,15 +6,15 @@ on:
   push:
     branches: [ "main", "pr/adisidev/201" ]
 
-env:
-  BUILD_TYPE: Release
-
 jobs:
   build-and-release:
 
     runs-on: ubuntu-latest
     container:
       image: gocartio/cartogram-web:latest
+      env:
+        BUILD_TYPE: Release
+        GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
 
     steps:
 
@@ -57,13 +57,13 @@ jobs:
     -  name: Generate and Push Tag
        id: generate_tag
        run: |
+         pwd
+         ls -la
+
          # Configure git committer
          git config user.email "action@github.com"
          git config user.name "GitHub Action"
 
-         pwd
-         ls -la
-
          # Get the current date
          current_date=$(date +'%Y-%m-%d')
 
@@ -77,14 +77,10 @@ jobs:
          git push origin "${short_sha}"
 
          echo "new_tag=${short_sha}" >> $GITHUB_OUTPUT
-       env:
-         GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
 
     - name: Release
       uses: softprops/action-gh-release@v2
       with:
         tag_name: ${{ steps.generate_tag.outputs.new_tag }}
         files: build/bin/cartogram
-        body: "Rolling release ${{ steps.generate_tag.outputs.release_number }}"
-      env:
-        GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
\ No newline at end of file
+        body: "Rolling release ${{ steps.generate_tag.outputs.release_number }}"
\ No newline at end of file