diff --git a/apps/api/src/config.ts b/apps/api/src/config.ts
index d8e4735..31be0c4 100644
--- a/apps/api/src/config.ts
+++ b/apps/api/src/config.ts
@@ -56,15 +56,12 @@ export function createConfig(secrets?: Secrets): AppConfig {
   const isTestMode = NODE_ENV === "test";
 
   const isStagingMode = NODE_ENV === "staging";
-  const streamChatApiSecret = isStagingMode
-    ? secrets!.streamChatApiSecretStaging
-    : secrets!.streamChatApiSecret;
-  const stripeSecretKey = isStagingMode
-    ? secrets!.stripeSecretKeyStaging
-    : secrets!.stripeSecretKey;
-  const stripeWebhookSecret = isStagingMode
-    ? secrets!.stripeWebhookSecretStaging
-    : secrets!.stripeWebhookSecret;
+  const getStreamChatApiSecret = (isStagingMode: boolean) =>
+    isStagingMode ? secrets!.streamChatApiSecretStaging : secrets!.streamChatApiSecret;
+  const getStripeSecretKey = (isStagingMode: boolean) =>
+    isStagingMode ? secrets!.stripeSecretKeyStaging : secrets!.stripeSecretKey;
+  const getStripeWebhookSecret = (isStagingMode: boolean) =>
+    isStagingMode ? secrets!.stripeWebhookSecretStaging : secrets!.stripeWebhookSecret;
 
   // Base configuration
   const baseConfig: AppConfig = {
@@ -84,13 +81,13 @@ export function createConfig(secrets?: Secrets): AppConfig {
     // Env dependent
     STREAM_CHAT_API_SECRET: isTestMode
       ? validateEnvVar("STREAM_CHAT_API_SECRET", process.env.STREAM_CHAT_API_SECRET)
-      : streamChatApiSecret,
+      : getStreamChatApiSecret(isStagingMode),
     STRIPE_SECRET_KEY: isTestMode
       ? validateEnvVar("STRIPE_SECRET_KEY", process.env.STRIPE_SECRET_KEY)
-      : stripeSecretKey,
+      : getStripeSecretKey(isStagingMode),
     STRIPE_WEBHOOK_SECRET: isTestMode
       ? validateEnvVar("STRIPE_WEBHOOK_SECRET", process.env.STRIPE_WEBHOOK_SECRET)
-      : stripeWebhookSecret,
+      : getStripeWebhookSecret(isStagingMode),
     EMAIL_USER: validateEnvVar("EMAIL_USER", process.env.EMAIL_USER),
     EMAIL_CLIENT_ID: validateEnvVar("EMAIL_CLIENT_ID", process.env.EMAIL_CLIENT_ID),
     EMAIL_CLIENT_SECRET: isTestMode