diff --git a/.github/workflows/build-and-deploy-staging.yaml b/.github/workflows/build-and-deploy-staging.yaml
index 18a53d88..420db50c 100644
--- a/.github/workflows/build-and-deploy-staging.yaml
+++ b/.github/workflows/build-and-deploy-staging.yaml
@@ -2,7 +2,7 @@ name: Deploy Switchboard Staging
 
 on:
   push:
-    branches: [feat/documentDrive, main]
+    branches: [main, feat/documentDrive]
 jobs:
   build:
     runs-on: ubuntu-latest
@@ -16,7 +16,34 @@ jobs:
         with:
           email: ${{ secrets.HEROKU_EMAIL }}
           heroku_api_key: ${{ secrets.HEROKU_API_KEY }}
-          heroku_app_name: ${{ secrets.HEROKU_APP_NAME }}
+          heroku_app_name: ${{ secrets.HEROKU_API_NAME }}
           dockerfile_directory: ./api
           dockerfile_name: Dockerfile
           process_type: web
+      - name: Build, Push and Release Frontend to Heroku. # Your custom step name
+        uses: gonuit/heroku-docker-deploy@v1.3.3
+        with:
+          email: ${{ secrets.HEROKU_EMAIL }}
+          heroku_api_key: ${{ secrets.HEROKU_API_KEY }}
+          heroku_app_name: ${{ secrets.HEROKU_FRONTEND_NAME }}
+          dockerfile_directory: ./
+          dockerfile_name: frontend/Dockerfile
+          process_type: web
+      - name: Build, Push and Release Wundergraph to Heroku. # Your custom step name
+        uses: gonuit/heroku-docker-deploy@v1.3.3
+        with:
+          email: ${{ secrets.HEROKU_EMAIL }}
+          heroku_api_key: ${{ secrets.HEROKU_API_KEY }}
+          heroku_app_name: ${{ secrets.HEROKU_WGRAPH_NAME }}
+          dockerfile_directory: ./
+          dockerfile_name: frontend/Dockerfile
+          process_type: web
+      # - name: Build, Push and Release NGINX to Heroku. # Your custom step name
+      #   uses: gonuit/heroku-docker-deploy@v1.3.3
+      #   with:
+      #     email: ${{ secrets.HEROKU_EMAIL }}
+      #     heroku_api_key: ${{ secrets.HEROKU_API_KEY }}
+      #     heroku_app_name: ${{ secrets.HEROKU_FRONTEND_NAME }}
+      #     dockerfile_directory: ./nginx
+      #     dockerfile_name: Dockerfile
+      #     process_type: web
diff --git a/api/package.json b/api/package.json
index 9c1ac681..30725ccd 100644
--- a/api/package.json
+++ b/api/package.json
@@ -39,7 +39,7 @@
     "pino-pretty": "^10.0.0",
     "siwe": "^2.1.4",
     "vite-node": "^0.29.2",
-    "vitest": "^0.29.2",
+    "vitest": "^0.31.1",
     "wildcard-match": "^5.1.2",
     "zod": "^3.21.4"
   },