diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 9d8877c..248e8cb 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -222,7 +222,7 @@ publish-analytics:
   before_script:
     - echo "$CI_REGISTRY_PASSWORD" | docker login $CI_REGISTRY -u $CI_REGISTRY_USER --password-stdin
   script:
-    - docker build -t $REGISTRY/analytics-service:${CI_COMMIT_SHORT_SHA} -t $REGISTRY/analytics-service:latest -f analytics-service/docker/Dockerfile analytics-service/
+    - docker build --build-arg VITE_GUEST_EMAIL=$VITE_GUEST_EMAIL --build-arg VITE_GUEST_PASSWORD=$VITE_GUEST_PASSWORD -t $REGISTRY/analytics-view:${CI_COMMIT_SHORT_SHA} -t $REGISTRY/analytics-view:latest -f analytics-view/docker/Dockerfile analytics-view/
     - docker push $REGISTRY/analytics-service:${CI_COMMIT_SHORT_SHA}
     - docker push $REGISTRY/analytics-service:latest
   needs: [build-analytics]
diff --git a/analytics-view/docker/Dockerfile b/analytics-view/docker/Dockerfile
index ec09c21..d967415 100644
--- a/analytics-view/docker/Dockerfile
+++ b/analytics-view/docker/Dockerfile
@@ -3,6 +3,10 @@ WORKDIR /app
 COPY package.json package-lock.json ./
 RUN npm ci
 COPY . .
+ARG VITE_GUEST_EMAIL
+ARG VITE_GUEST_PASSWORD
+ENV VITE_GUEST_EMAIL=$VITE_GUEST_EMAIL
+ENV VITE_GUEST_PASSWORD=$VITE_GUEST_PASSWORD
 RUN npm run build
 
 FROM nginx:alpine
diff --git a/portfolio-view/docker/Dockerfile b/portfolio-view/docker/Dockerfile
index 9b01c35..72d75c9 100644
--- a/portfolio-view/docker/Dockerfile
+++ b/portfolio-view/docker/Dockerfile
@@ -3,10 +3,6 @@ WORKDIR /app
 COPY package.json package-lock.json ./
 RUN npm ci
 COPY . .
-ARG VITE_GUEST_EMAIL
-ARG VITE_GUEST_PASSWORD
-ENV VITE_GUEST_EMAIL=$VITE_GUEST_EMAIL
-ENV VITE_GUEST_PASSWORD=$VITE_GUEST_PASSWORD
 RUN npm run build
 
 FROM nginx:alpine