diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index ee26ac3fb..655dac154 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -102,6 +102,7 @@ jobs:
           build-args: |
             REPO_OWNER=${{ steps.meta.outputs.repo_owner }}
             REPO_NAME=${{ steps.meta.outputs.repo_name }}
+            BASE_TAG=base
             BRANCH=${{ github.ref_name }}
             REPO_URL=https://github.com/${{ github.repository }}
             TIMESTAMP=${{ steps.timestamp.outputs.timestamp }}
diff --git a/docker/Dockerfile b/docker/Dockerfile
index ab7ea6854..a6491432c 100644
--- a/docker/Dockerfile
+++ b/docker/Dockerfile
@@ -6,10 +6,10 @@ RUN corepack enable && corepack prepare yarn@stable --activate && \
     yarn install && yarn build && \
     rm -rf node_modules .cache
 
-# --- Define base image build arguments ---
-ARG REPO_OWNER=dispatcharr
-ARG REPO_NAME=dispatcharr
-ARG BASE_TAG=base
+# --- Redeclare build arguments for the next stage ---
+ARG REPO_OWNER
+ARG REPO_NAME
+ARG BASE_TAG
 
 # --- Final image based on the dynamic base ---
 FROM ghcr.io/${REPO_OWNER}/${REPO_NAME}:${BASE_TAG} AS final