diff --git a/.github/workflows/deploy-ec2.yml b/.github/workflows/deploy-ec2.yml
index 1be812e..3a9a74d 100644
--- a/.github/workflows/deploy-ec2.yml
+++ b/.github/workflows/deploy-ec2.yml
@@ -37,6 +37,8 @@ jobs:
           tags: ${{ env.IMAGE_NAME }}:latest
           cache-from: type=gha
           cache-to: type=gha,mode=max
+          build-args: |
+            NEXT_PUBLIC_VAPID_PUBLIC_KEY=${{ secrets.NEXT_PUBLIC_VAPID_PUBLIC_KEY }}
 
       - name: Save application image
         run: |
diff --git a/Dockerfile b/Dockerfile
index f73b2cd..9057925 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -12,6 +12,10 @@ RUN npm ci && npx prisma generate
 # Copy application code
 COPY . .
 
+# Build-time env vars (NEXT_PUBLIC_* are embedded into the JS bundle)
+ARG NEXT_PUBLIC_VAPID_PUBLIC_KEY
+ENV NEXT_PUBLIC_VAPID_PUBLIC_KEY=$NEXT_PUBLIC_VAPID_PUBLIC_KEY
+
 # Build the Next.js application
 RUN npm run build