diff --git a/.buildkite/pipeline.release.yml b/.buildkite/pipeline.release.yml
index c563458..3f55b9a 100644
--- a/.buildkite/pipeline.release.yml
+++ b/.buildkite/pipeline.release.yml
@@ -11,7 +11,7 @@ steps:
       - "linux"
       - "windows"
     env:
-      - GOOS={{matrix}}
+      GOOS: "{{matrix}}"
     artifact_paths:
       - dist/**/*
     plugins:
diff --git a/.buildkite/pipeline.yml b/.buildkite/pipeline.yml
index 32d084d..a6976b9 100644
--- a/.buildkite/pipeline.yml
+++ b/.buildkite/pipeline.yml
@@ -3,22 +3,12 @@ image: "buildkite/hosted-agent-base-images:ubuntu-jammy"
 agents:
   queue: hosted
 
-cache:
-  name: "golang-cache"
-  paths:
-    - "~/gocache"
-    - "~/gomodcache"
-  size: "100g"
-
 steps:
   - group: ":mag: Quality Checks"
     key: quality-checks
     steps:
     - name: ":golangci-lint: lint"
       command: golangci-lint run --verbose --timeout 3m
-      env:
-        - GOCACHE=~/gocache
-        - GOMODCACHE=~/gomodcache      
       plugins:
         - mise#v1.1.1: ~
 
@@ -29,9 +19,6 @@ steps:
         - go test -coverprofile cover.out ./...
         - go run github.com/nikolaydubina/go-cover-treemap@latest -coverprofile cover.out > cover-tree.svg
         - echo '<details><summary>Coverage tree map</summary><img src="artifact://cover-tree.svg" alt="Test coverage tree map" width="70%"></details>' | buildkite-agent annotate --style "info"
-      env:
-        - GOCACHE=~/gocache
-        - GOMODCACHE=~/gomodcache      
       plugins:
         - mise#v1.1.1: ~
 
@@ -39,9 +26,7 @@ steps:
     command: ".buildkite/release.sh release --clean --snapshot --split"
     depends_on: quality-checks
     env:
-      - GOCACHE=~/gocache
-      - GOMODCACHE=~/gomodcache      
-      - GOOS={{matrix}}
+      GOOS: "{{matrix}}"
     matrix:
       - "darwin"
       - "linux"