diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 20fdbdf..895ac14 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -14,10 +14,6 @@ jobs:
       packages: write
 
     steps:
-    - name: Set version
-      id: version
-      run: echo "::set-output name=version::$(echo ${GITHUB_REF#refs/tags/})"
-
     - name: Set up Go
       uses: actions/setup-go@v4
       with:
@@ -29,8 +25,8 @@ jobs:
     - name: Generate build variables
       id: prep
       run: |
+        echo "version=$(echo ${GITHUB_REF#refs/tags/})" >> $GITHUB_OUTPUT
         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
@@ -48,10 +44,9 @@ jobs:
         race: false
         ldflags: >
           -s -w
-          -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 }}'
+          -X 'github.com/debridmediamanager/zurg/internal/version.BuiltAt=${{ steps.prep.outputs.built_at }}'
+          -X 'github.com/debridmediamanager/zurg/internal/version.GitCommit=${{ steps.prep.outputs.git_commit }}'
+          -X 'github.com/debridmediamanager/zurg/internal/version.Version=${{ steps.prep.outputs.version }}'
         buildmode: default
         trimpath: true
 
@@ -69,10 +64,9 @@ jobs:
         race: false
         ldflags: >
           -s -w
-          -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 }}'
+          -X 'github.com/debridmediamanager/zurg/internal/version.BuiltAt=${{ steps.prep.outputs.built_at }}'
+          -X 'github.com/debridmediamanager/zurg/internal/version.GitCommit=${{ steps.prep.outputs.git_commit }}'
+          -X 'github.com/debridmediamanager/zurg/internal/version.Version=${{ steps.version.outputs.version }}'
         buildmode: default
         trimpath: true
 
diff --git a/.github/workflows/build_docker.yml b/.github/workflows/build_docker.yml
index 8140d8c..fc5df6c 100644
--- a/.github/workflows/build_docker.yml
+++ b/.github/workflows/build_docker.yml
@@ -19,7 +19,6 @@ jobs:
       run: |
         echo "version=$(echo ${GITHUB_REF#refs/tags/})" >> $GITHUB_OUTPUT
         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: Set up QEMU
@@ -64,7 +63,6 @@ jobs:
         cache-to: type=local,dest=/tmp/.buildx-cache
         build-args: |
           BuiltAt=${{ steps.buildvars.outputs.built_at }}
-          GoVersion=${{ steps.buildvars.outputs.go_version }}
           GitCommit=${{ steps.buildvars.outputs.git_commit }}
           Version=${{ steps.buildvars.outputs.version }}
 
@@ -89,6 +87,5 @@ jobs:
         cache-to: type=local,dest=/tmp/.buildx-cache
         build-args: |
           BuiltAt=${{ steps.buildvars.outputs.built_at }}
-          GoVersion=${{ steps.buildvars.outputs.go_version }}
           GitCommit=${{ steps.buildvars.outputs.git_commit }}
           Version=${{ steps.buildvars.outputs.version }}
diff --git a/Dockerfile b/Dockerfile
index 40ac47b..405635c 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -2,13 +2,12 @@ FROM golang:1-alpine AS builder
 ARG GOOS=linux
 ARG GOARCH=amd64
 ARG BuiltAt
-ARG GoVersion
 ARG GitCommit
 ARG Version
 WORKDIR /app
 COPY . .
 RUN apk add --no-cache bash git go gcc musl-dev curl fuse
-RUN go build -ldflags "-s -w -X 'github.com/debridmediamanager/zurg/internal.BuiltAt=$BuiltAt' -X 'github.com/debridmediamanager/zurg/internal.GoVersion=$GoVersion' -X 'github.com/debridmediamanager/zurg/internal.GitCommit=$GitCommit' -X 'github.com/debridmediamanager/zurg/internal.Version=$Version'" -o zurg ./cmd/zurg
+RUN go build -ldflags "-s -w -X 'github.com/debridmediamanager/zurg/internal/version.BuiltAt=$BuiltAt' -X 'github.com/debridmediamanager/zurg/internal/version.GitCommit=$GitCommit' -X 'github.com/debridmediamanager/zurg/internal/version.Version=$Version'" -o zurg ./cmd/zurg
 
 # Obfuscation stage
 FROM alpine:3 AS obfuscator