diff --git a/backend/src/config/index.ts b/backend/src/config/index.ts
index 1b2178ca0..fd8f9c55b 100644
--- a/backend/src/config/index.ts
+++ b/backend/src/config/index.ts
@@ -1,5 +1,5 @@
 const PORT = process.env.PORT || 4000;
-const EMAIL_TOKEN_LIFETIME = process.env.EMAIL_TOKEN_LIFETIME! || '86400'; // investigate
+const EMAIL_TOKEN_LIFETIME = process.env.EMAIL_TOKEN_LIFETIME! || '86400';
 const ENCRYPTION_KEY = process.env.ENCRYPTION_KEY!;
 const JWT_AUTH_LIFETIME = process.env.JWT_AUTH_LIFETIME! || '10d';
 const JWT_AUTH_SECRET = process.env.JWT_AUTH_SECRET!;
diff --git a/backend/src/controllers/organizationController.ts b/backend/src/controllers/organizationController.ts
index bce757d0a..056990acc 100644
--- a/backend/src/controllers/organizationController.ts
+++ b/backend/src/controllers/organizationController.ts
@@ -8,6 +8,7 @@ import {
 	STRIPE_PRODUCT_CARD_AUTH
 } from '../config';
 import Stripe from 'stripe';
+
 const stripe = new Stripe(STRIPE_SECRET_KEY, {
 	apiVersion: '2022-08-01'
 });
diff --git a/docker-compose.dev.yml b/docker-compose.dev.yml
index dc3c68058..6eabfe4d9 100644
--- a/docker-compose.dev.yml
+++ b/docker-compose.dev.yml
@@ -55,6 +55,8 @@ services:
       - NEXT_PUBLIC_WEBSITE_URL=${SITE_URL}
       - NEXT_PUBLIC_POSTHOG_HOST=${POSTHOG_HOST}
       - NEXT_PUBLIC_POSTHOG_API_KEY=${POSTHOG_PROJECT_API_KEY}
+      - NEXT_PUBLIC_STRIPE_PRODUCT_PRO=${STRIPE_PRODUCT_PRO}
+      - NEXT_PUBLIC_STRIPE_PRODUCT_STARTER=${STRIPE_PRODUCT_STARTER}
       - NEXT_PUBLIC_TELEMETRY_ENABLED=${TELEMETRY_ENABLED}
     networks:
       - infisical-dev
diff --git a/docker-compose.yml b/docker-compose.yml
index 648da0e3d..3204f9257 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -49,6 +49,9 @@ services:
       - NEXT_PUBLIC_WEBSITE_URL=${SITE_URL}
       - NEXT_PUBLIC_POSTHOG_HOST=${POSTHOG_HOST}
       - NEXT_PUBLIC_POSTHOG_API_KEY=${POSTHOG_PROJECT_API_KEY}
+      - NEXT_PUBLIC_STRIPE_PRODUCT_PRO=${STRIPE_PRODUCT_PRO}
+      - NEXT_PUBLIC_STRIPE_PRODUCT_STARTER=${STRIPE_PRODUCT_STARTER}
+      - NEXT_PUBLIC_TELEMETRY_ENABLED=${TELEMETRY_ENABLED}
     networks:
       - infisical
 
diff --git a/frontend/pages/settings/billing/[id].js b/frontend/pages/settings/billing/[id].js
index 18a87353b..cd5bc540e 100644
--- a/frontend/pages/settings/billing/[id].js
+++ b/frontend/pages/settings/billing/[id].js
@@ -50,6 +50,7 @@ export default function SettingsBilling() {
 		const subscriptions = await getOrganizationSubscriptions({
 			orgId: localStorage.getItem("orgData.id"),
 		});
+		
 		setCurrentPlan(subscriptions.data[0].plan.product);
 		const orgUsers = await getOrganizationUsers({
 			orgId: localStorage.getItem("orgData.id"),