diff --git a/.circleci/config.yml b/.circleci/config.yml
index 64c0915..5477ddb 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -103,7 +103,7 @@ workflows:
             - feature/top-262-projectid-non-mandatory
             - TOP-2364
             - PM-2097
-            - pm-2456
+            - pm-2539
 
     - "build-qa":
         context: org-global
diff --git a/config/default.js b/config/default.js
index b270dd8..ef8a2ef 100644
--- a/config/default.js
+++ b/config/default.js
@@ -129,4 +129,5 @@ module.exports = {
   // Database schemas for direct counts (shared DB)
   RESOURCES_DB_SCHEMA: process.env.RESOURCES_DB_SCHEMA || "resources",
   REVIEW_DB_SCHEMA: process.env.REVIEW_DB_SCHEMA || "reviews",
+  CHALLENGE_SERVICE_PRISMA_TIMEOUT: process.env.CHALLENGE_SERVICE_PRISMA_TIMEOUT ? parseInt(process.env.CHALLENGE_SERVICE_PRISMA_TIMEOUT, 10) : 10000,
 };
diff --git a/src/common/prisma.js b/src/common/prisma.js
index 69bdb54..7d302ea 100644
--- a/src/common/prisma.js
+++ b/src/common/prisma.js
@@ -8,6 +8,7 @@ const {
   ReviewOpportunityTypeEnum,
 } = require("@prisma/client");
 const logger = require("./logger");
+const config = require("config");
 
 const prismaClient = new PrismaClient({
   log: [
@@ -21,7 +22,7 @@ const prismaClient = new PrismaClient({
   // Allow overriding via environment variables if needed.
   transactionOptions: {
     maxWait: Number(process.env.PRISMA_TRANSACTION_MAX_WAIT_MS || 10000), // wait up to 10s to start
-    timeout: Number(process.env.PRISMA_TRANSACTION_TIMEOUT_MS || 10000), // allow up to 30s per transaction
+    timeout: config.CHALLENGE_SERVICE_PRISMA_TIMEOUT, // allow up to 30s per transaction
   },
 });
 
diff --git a/src/common/review-prisma.js b/src/common/review-prisma.js
index efa9df1..12d0a36 100644
--- a/src/common/review-prisma.js
+++ b/src/common/review-prisma.js
@@ -19,7 +19,7 @@ const createClient = () =>
     ],
     transactionOptions: {
       maxWait: Number(process.env.PRISMA_TRANSACTION_MAX_WAIT_MS || 10000),
-      timeout: Number(process.env.PRISMA_TRANSACTION_TIMEOUT_MS || 10000),
+      timeout: config.CHALLENGE_SERVICE_PRISMA_TIMEOUT,
     },
   });