diff --git a/README.md b/README.md
index f2453a51..8e55d566 100644
--- a/README.md
+++ b/README.md
@@ -62,6 +62,7 @@ The following parameters can be set in config files or in env variables:
 - ES.ES_INDEX: Elasticsearch index name
 - ES.ES_REFRESH: Elasticsearch refresh method. Default to string `true`(i.e. refresh immediately)
 - FILE_UPLOAD_SIZE_LIMIT: the file upload size limit in bytes
+- OPENSEARCH: Flag to use Opensearch NPM instead of Elasticsearch
 - RESOURCES_API_URL: TC resources API base URL
 - GROUPS_API_URL: TC groups API base URL
 - PROJECTS_API_URL: TC projects API base URL
diff --git a/src/common/helper.js b/src/common/helper.js
index b6355f29..eaaa0579 100644
--- a/src/common/helper.js
+++ b/src/common/helper.js
@@ -17,7 +17,7 @@ const HttpStatus = require("http-status-codes");
 const xss = require("xss");
 const logger = require("./logger");
 
-const { Client: ESClient } = require("@opensearch-project/opensearch");
+const { Client: OSClient } = require("@opensearch-project/opensearch");
 const elasticsearch = require("elasticsearch");
 
 const projectHelper = require("./project-helper");
@@ -734,7 +734,7 @@ function getESClient() {
       });
     }
   } else {
-    esClient = new ESClient({
+    esClient = new OSClient({
       node: esHost,
       ssl: {
         rejectUnauthorized: false,
diff --git a/src/services/ChallengeService.js b/src/services/ChallengeService.js
index d11390a3..ca0d2d9a 100644
--- a/src/services/ChallengeService.js
+++ b/src/services/ChallengeService.js
@@ -884,7 +884,7 @@ async function createChallenge(currentUser, challenge, userToken) {
   }
 
   /** Ensure project exists, and set direct project id, billing account id & markup */
-  if (challengeHelper.isProjectIdRequired(challenge.timelineTemplateId)) {
+  if (challengeHelper.isProjectIdRequired(challenge.timelineTemplateId) || challenge.projectId) {
     const { projectId } = challenge;
 
     const { directProjectId } = await projectHelper.getProject(projectId, currentUser);