diff --git a/.github/workflows/build-and-push-docker.yml b/.github/workflows/build-and-push-docker.yml
index bb586082..21116836 100644
--- a/.github/workflows/build-and-push-docker.yml
+++ b/.github/workflows/build-and-push-docker.yml
@@ -143,7 +143,7 @@ jobs:
           build-args: |
             base_image_tag=${{ matrix.builds.base_tag }}
             is_edge_build=${{github.ref == format('refs/heads/{0}', 'dev') && github.event_name == 'schedule'}}
-            tunarr_build="${TUNARR_VERSION}"
+            tunarr_build="${{ env.TUNARR_VERSION }}"
           target: full-stack
           tags: ${{ steps.meta.outputs.tags }}
           labels: ${{ steps.meta.outputs.labels }}
diff --git a/Dockerfile b/Dockerfile
index 5d8e1186..3a2d1b17 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -62,6 +62,15 @@ RUN --mount=type=cache,id=pnpm,target=/pnpm/store pnpm install --prod --frozen-l
 FROM sources AS build-server
 # Install deps
 RUN --mount=type=cache,id=pnpm,target=/pnpm/store pnpm install --frozen-lockfile
+ARG is_edge_build
+ARG tunarr_build
+# Build common modules
+RUN <<EOF
+touch server/.env
+echo TUNARR_BUILD=${tunarr_build} >> server/.env
+echo TUNARR_EDGE_BUILD=${is_edge_build} >> server/.env
+cat server/.env
+EOF
 # Build and bundle
 RUN pnpm turbo --filter=@tunarr/server bundle
 ### End server build ###
@@ -76,15 +85,6 @@ RUN pnpm turbo --filter=@tunarr/web bundle
 FROM sources as build-full-stack
 # Install deps
 RUN --mount=type=cache,id=pnpm,target=/pnpm/store pnpm install --frozen-lockfile
-ARG is_edge_build
-ARG tunarr_build
-# Build common modules
-RUN <<EOF
-touch server/.env
-echo TUNARR_BUILD=${tunarr_build} >> server/.env
-echo TUNARR_EDGE_BUILD=${is_edge_build} >> server/.env
-cat server/.env
-EOF
 RUN NODE_OPTIONS=--max-old-space-size=32768 pnpm turbo bundle --filter=@tunarr/server
 RUN NODE_OPTIONS=--max-old-space-size=32768 pnpm turbo bundle --filter=@tunarr/web