diff --git a/.github/workflows/nodejs.yml b/.github/workflows/nodejs.yml
index 4c5bfd6..c627bcd 100644
--- a/.github/workflows/nodejs.yml
+++ b/.github/workflows/nodejs.yml
@@ -6,9 +6,8 @@ name: SpiritWave CI
 on: [push, pull_request]
 
 env:  
-  # SUPABASE_ACCESS_TOKEN: ${{ secrets.SUPABASE_ACCESS_TOKEN }}
-  # SUPABASE_DB_PASSWORD: ${{ secrets.SUPABASE_DB_PASSWORD }}
-  # Retrieve <project-id> from dashboard url: https://app.supabase.com/project/<project-id>
+  SUPABASE_ACCESS_TOKEN: ${{ secrets.SUPABASE_ACCESS_TOKEN }}
+  SUPABASE_DB_PASSWORD: ${{ secrets.SUPABASE_DB_PASSWORD }}
   PROJECT_ID: ${{ vars.SUPABASE_PROJECT_ID}}
 
 jobs:
@@ -35,9 +34,12 @@ jobs:
         # env:
         #   CI: true
 
-      - name: Deploy to supabase
+      - name: Setup Supabase
+        if: github.base_ref == 'main'
         uses: supabase/setup-cli@v1
         with:
           version: latest
           
-      - run: supabase functions deploy --project-ref $PROJECT_ID --debug
\ No newline at end of file
+      - name: Deploy Functions
+        if: github.base_ref == 'main'
+        run: supabase functions deploy --project-ref $PROJECT_ID --debug
\ No newline at end of file