diff --git a/.github/workflows/develop.yml b/.github/workflows/develop.yml
index 40e4d2be8b..6093c0846b 100644
--- a/.github/workflows/develop.yml
+++ b/.github/workflows/develop.yml
@@ -44,6 +44,13 @@ jobs:
           docker login -u ${{ secrets.DOCKER_USERNAME }} -p ${{ secrets.DOCKER_PASSWORD }}
           docker build -f Dockerfile -t ${{ secrets.DOCKER_REPO }}:latest .
           docker push ${{ secrets.DOCKER_REPO }}:latest
+    
+    - name: Frontend Docker build & push to docker repo
+      run: |
+          cd frontend
+          docker login -u ${{ secrets.DOCKER_USERNAME }} -p ${{ secrets.DOCKER_PASSWORD }}
+          docker build -f Dockerfile -t ${{ secrets.DOCKER_FRONTEND_REPO }}:latest .
+          docker push ${{ secrets.DOCKER_FRONTEND_REPO }}:latest
 
   pull-and-deploy:
     needs: build-and-push
@@ -131,6 +138,7 @@ jobs:
           fi
 
           sudo docker pull ${{ secrets.DOCKER_REPO }}:latest
+          sudo docker pull ${{ secrets.DOCKER_FRONTEND_REPO }}:latest
           
           sudo docker image prune -f
 
diff --git a/server/docker-compose.yml b/server/docker-compose.yml
index 444a9db176..2985ced561 100644
--- a/server/docker-compose.yml
+++ b/server/docker-compose.yml
@@ -32,3 +32,12 @@ services:
     ports:
       - "8080:8080"
     build: .
+
+  frontend:
+    container_name: frontend
+    depends_on:
+      - spring-server
+    image: suhwani/capstone_frontend:latest
+    ports:
+      - "80:80"
+    build: .