diff --git a/.github/workflows/build-deploy.yml b/.github/workflows/build-deploy.yml
index 94a9e70..6c5b8be 100644
--- a/.github/workflows/build-deploy.yml
+++ b/.github/workflows/build-deploy.yml
@@ -12,6 +12,30 @@ concurrency:
   cancel-in-progress: true
 
 jobs:
+  build-frontend:
+    name: Build Frontend
+    runs-on: ubuntu-latest
+    environment: prod
+    steps:
+      - name: Checkout branch
+        uses: actions/checkout@v3
+
+      - name: Build FE
+        run: |
+          cd web
+          npm install
+
+      - name: Build FE
+        run: |
+          cd web
+          npm run build
+          # FE build will be in build
+
+      - uses: actions/upload-artifact@v4
+        with:
+          name: frontend-${{ github.sha }}
+          path: web/build
+
   build-deploy:
     name: Build and Deploy
     runs-on: ubuntu-latest
@@ -34,9 +58,8 @@ jobs:
       - name: Download Frontend Build
         uses: actions/download-artifact@v4
         with:
-          name: frontend-build
+          name: frontend-${{ github.sha }}
           path: api/build
-          github-token: ${{ secrets.GITHUB_TOKEN }}
 
       - name: Build, tag, and push image to Amazon ECR
         id: build-image