diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 2e13a59..9fa903c 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -26,6 +26,13 @@ jobs:
     - name: Check out code
       uses: actions/checkout@v4
 
+    - name: Generate build variables
+      id: prep
+      run: |
+        echo "built_at=$(date +%Y-%m-%dT%H:%M:%S)" >> $GITHUB_OUTPUT
+        echo "go_version=$(go version | cut -d ' ' -f 3)" >> $GITHUB_OUTPUT
+        echo "git_commit=$(git rev-parse HEAD)" >> $GITHUB_OUTPUT
+
     - name: Cross-compile with xgo
       uses: crazy-max/ghaction-xgo@v3
       with:
@@ -40,9 +47,9 @@ jobs:
         race: false
         ldflags: >
           -s -w
-          -X 'github.com/debridmediamanager/zurg/internal.BuiltAt=$(date +%Y-%m-%dT%H:%M:%S)'
-          -X 'github.com/debridmediamanager/zurg/internal.GoVersion=$(go version | cut -d " " -f 3)'
-          -X 'github.com/debridmediamanager/zurg/internal.GitCommit=$(git rev-parse HEAD)'
+          -X 'github.com/debridmediamanager/zurg/internal.BuiltAt=${{ steps.prep.outputs.built_at }}'
+          -X 'github.com/debridmediamanager/zurg/internal.GoVersion=${{ steps.prep.outputs.go_version }}'
+          -X 'github.com/debridmediamanager/zurg/internal.GitCommit=${{ steps.prep.outputs.git_commit }}'
           -X 'github.com/debridmediamanager/zurg/internal.Version=${{ steps.version.outputs.version }}'
         buildmode: default
         trimpath: true
diff --git a/.github/workflows/build_docker.yml b/.github/workflows/build_docker.yml
index 301f01d..6d856ba 100644
--- a/.github/workflows/build_docker.yml
+++ b/.github/workflows/build_docker.yml
@@ -45,6 +45,13 @@ jobs:
       with:
         images: ghcr.io/${{ github.repository }}
 
+    - name: Generate build variables
+      id: prep
+      run: |
+        echo "built_at=$(date +%Y-%m-%dT%H:%M:%S)" >> $GITHUB_OUTPUT
+        echo "go_version=$(go version | cut -d ' ' -f 3)" >> $GITHUB_OUTPUT
+        echo "git_commit=$(git rev-parse HEAD)" >> $GITHUB_OUTPUT
+
     - name: Build and push Docker image
       uses: docker/build-push-action@v5
       with:
@@ -56,9 +63,9 @@ jobs:
         cache-from: type=local,src=/tmp/.buildx-cache
         cache-to: type=local,dest=/tmp/.buildx-cache
         build-args: |
-          BuiltAt=$(date +%Y-%m-%dT%H:%M:%S)
-          GoVersion=$(go version)
-          GitCommit=$(git rev-parse HEAD)
+          BuiltAt=${{ steps.prep.outputs.built_at }}'
+          GoVersion=${{ steps.prep.outputs.go_version }}'
+          GitCommit=${{ steps.prep.outputs.git_commit }}'
           Version=${{ steps.version.outputs.version }}
 
     - name: Extract metadata (tags, labels) for Docker