diff --git a/Dockerfile b/Dockerfile
index 2c18177..e308397 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,17 +1,14 @@
-# Accept GOOS and GOARCH as build arguments
+FROM golang:1-alpine AS builder
 ARG GOOS=linux
 ARG GOARCH=amd64
 ARG BuiltAt
 ARG GoVersion
 ARG GitCommit
 ARG Version
-
-# Build stage
-FROM golang:1-alpine AS builder
 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/version.BuiltAt=${BuiltAt}' -X 'github.com/debridmediamanager/zurg/internal/version.GoVersion=${GoVersion}' -X 'github.com/debridmediamanager/zurg/internal/version.GitCommit=${GitCommit}' -X 'github.com/debridmediamanager/zurg/internal/version.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.GoVersion=$GoVersion -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