diff --git a/.github/actions/yarn-build/action.yml b/.github/actions/yarn-build/action.yml
index 8528e64d9677b1..a9a2d2b1148def 100644
--- a/.github/actions/yarn-build/action.yml
+++ b/.github/actions/yarn-build/action.yml
@@ -60,35 +60,34 @@ inputs:
   TURBO_TEAM:
     required: true
 
-env:
-  DATABASE_URL: ${{ inputs.DATABASE_URL }}
-  NEXT_PUBLIC_WEBAPP_URL: ${{ inputs.NEXT_PUBLIC_WEBAPP_URL }}
-  NEXT_PUBLIC_WEBSITE_URL: ${{ inputs.NEXT_PUBLIC_WEBSITE_URL }}
-  NEXTAUTH_SECRET: ${{ inputs.NEXTAUTH_SECRET }}
-  GOOGLE_API_CREDENTIALS: ${{ inputs.GOOGLE_API_CREDENTIALS }}
-  GOOGLE_LOGIN_ENABLED: ${{ inputs.GOOGLE_LOGIN_ENABLED }}
-  CALENDSO_ENCRYPTION_KEY: ${{ inputs.CALENDSO_ENCRYPTION_KEY }}
-  DAILY_API_KEY: ${{ inputs.DAILY_API_KEY }}
-  NEXT_PUBLIC_STRIPE_PUBLIC_KEY: ${{ inputs.NEXT_PUBLIC_STRIPE_PUBLIC_KEY }}
-  NEXT_PUBLIC_STRIPE_FREE_PLAN_PRICE: ${{ inputs.NEXT_PUBLIC_STRIPE_FREE_PLAN_PRICE }}
-  NEXT_PUBLIC_STRIPE_PRO_PLAN_PRICE: ${{ inputs.NEXT_PUBLIC_STRIPE_PRO_PLAN_PRICE }}
-  NEXT_PUBLIC_STRIPE_PREMIUM_PLAN_PRICE: ${{ inputs.NEXT_PUBLIC_STRIPE_PREMIUM_PLAN_PRICE }}
-  NEXT_PUBLIC_STRIPE_PREMIUM_NEW_PLAN_PRICE: ${{ inputs.NEXT_PUBLIC_STRIPE_PREMIUM_NEW_PLAN_PRICE }}
-  NEXT_PUBLIC_IS_PREMIUM_NEW_PLAN: ${{ inputs.NEXT_PUBLIC_IS_PREMIUM_NEW_PLAN }}
-  STRIPE_PRIVATE_KEY: ${{ inputs.STRIPE_PRIVATE_KEY }}
-  STRIPE_CLIENT_ID: ${{ inputs.STRIPE_CLIENT_ID }}
-  STRIPE_WEBHOOK_SECRET: ${{ inputs.STRIPE_WEBHOOK_SECRET }}
-  STRIPE_PRO_PLAN_PRODUCT_ID: ${{ inputs.STRIPE_PRO_PLAN_PRODUCT_ID }}
-  STRIPE_PREMIUM_PLAN_PRODUCT_ID: ${{ inputs.STRIPE_PREMIUM_PLAN_PRODUCT_ID }}
-  STRIPE_FREE_PLAN_PRODUCT_ID: ${{ inputs.STRIPE_FREE_PLAN_PRODUCT_ID }}
-  PAYMENT_FEE_PERCENTAGE: ${{ inputs.PAYMENT_FEE_PERCENTAGE }}
-  PAYMENT_FEE_FIXED: ${{ inputs.PAYMENT_FEE_FIXED }}
-  SAML_DATABASE_URL: ${{ inputs.SAML_DATABASE_URL }}
-  SAML_ADMINS: ${{ inputs.SAML_ADMINS }}
-  NEXTAUTH_URL: ${{ inputs.NEXTAUTH_URL }}
-
 runs:
   using: "composite"
+  env:
+    DATABASE_URL: ${{ inputs.DATABASE_URL }}
+    NEXT_PUBLIC_WEBAPP_URL: ${{ inputs.NEXT_PUBLIC_WEBAPP_URL }}
+    NEXT_PUBLIC_WEBSITE_URL: ${{ inputs.NEXT_PUBLIC_WEBSITE_URL }}
+    NEXTAUTH_SECRET: ${{ inputs.NEXTAUTH_SECRET }}
+    GOOGLE_API_CREDENTIALS: ${{ inputs.GOOGLE_API_CREDENTIALS }}
+    GOOGLE_LOGIN_ENABLED: ${{ inputs.GOOGLE_LOGIN_ENABLED }}
+    CALENDSO_ENCRYPTION_KEY: ${{ inputs.CALENDSO_ENCRYPTION_KEY }}
+    DAILY_API_KEY: ${{ inputs.DAILY_API_KEY }}
+    NEXT_PUBLIC_STRIPE_PUBLIC_KEY: ${{ inputs.NEXT_PUBLIC_STRIPE_PUBLIC_KEY }}
+    NEXT_PUBLIC_STRIPE_FREE_PLAN_PRICE: ${{ inputs.NEXT_PUBLIC_STRIPE_FREE_PLAN_PRICE }}
+    NEXT_PUBLIC_STRIPE_PRO_PLAN_PRICE: ${{ inputs.NEXT_PUBLIC_STRIPE_PRO_PLAN_PRICE }}
+    NEXT_PUBLIC_STRIPE_PREMIUM_PLAN_PRICE: ${{ inputs.NEXT_PUBLIC_STRIPE_PREMIUM_PLAN_PRICE }}
+    NEXT_PUBLIC_STRIPE_PREMIUM_NEW_PLAN_PRICE: ${{ inputs.NEXT_PUBLIC_STRIPE_PREMIUM_NEW_PLAN_PRICE }}
+    NEXT_PUBLIC_IS_PREMIUM_NEW_PLAN: ${{ inputs.NEXT_PUBLIC_IS_PREMIUM_NEW_PLAN }}
+    STRIPE_PRIVATE_KEY: ${{ inputs.STRIPE_PRIVATE_KEY }}
+    STRIPE_CLIENT_ID: ${{ inputs.STRIPE_CLIENT_ID }}
+    STRIPE_WEBHOOK_SECRET: ${{ inputs.STRIPE_WEBHOOK_SECRET }}
+    STRIPE_PRO_PLAN_PRODUCT_ID: ${{ inputs.STRIPE_PRO_PLAN_PRODUCT_ID }}
+    STRIPE_PREMIUM_PLAN_PRODUCT_ID: ${{ inputs.STRIPE_PREMIUM_PLAN_PRODUCT_ID }}
+    STRIPE_FREE_PLAN_PRODUCT_ID: ${{ inputs.STRIPE_FREE_PLAN_PRODUCT_ID }}
+    PAYMENT_FEE_PERCENTAGE: ${{ inputs.PAYMENT_FEE_PERCENTAGE }}
+    PAYMENT_FEE_FIXED: ${{ inputs.PAYMENT_FEE_FIXED }}
+    SAML_DATABASE_URL: ${{ inputs.SAML_DATABASE_URL }}
+    SAML_ADMINS: ${{ inputs.SAML_ADMINS }}
+    NEXTAUTH_URL: ${{ inputs.NEXTAUTH_URL }}
   steps:
     - uses: ./.github/actions/cache-db
       id: cache-db