diff --git a/src/common/helper.js b/src/common/helper.js
index 1a7cc32a..00e1d45a 100644
--- a/src/common/helper.js
+++ b/src/common/helper.js
@@ -299,14 +299,15 @@ axiosRetry(axios, {
  * @param {String} token The token
  * @returns
  */
-async function createSelfServiceProject(name, description, type) {
+async function createSelfServiceProject(name, description, type, token) {
   const projectObj = {
     name,
     description,
     type,
   };
-
-  const token = await m2mHelper.getM2MToken();
+  if (!token) {
+    token = await m2mHelper.getM2MToken();
+  }
   const url = `${config.PROJECTS_API_URL}`;
   const res = await axios.post(url, projectObj, {
     headers: { Authorization: `Bearer ${token}` },
diff --git a/src/services/ChallengeService.js b/src/services/ChallengeService.js
index 309cb3cf..8680054e 100644
--- a/src/services/ChallengeService.js
+++ b/src/services/ChallengeService.js
@@ -926,7 +926,8 @@ async function createChallenge(currentUser, challenge, userToken) {
       challenge.projectId = await helper.createSelfServiceProject(
         selfServiceProjectName,
         "N/A",
-        config.NEW_SELF_SERVICE_PROJECT_TYPE
+        config.NEW_SELF_SERVICE_PROJECT_TYPE,
+        userToken
       );
     }
 
@@ -1613,8 +1614,8 @@ async function updateChallenge(currentUser, challengeId, data) {
   // TODO: Fix this Tech Debt once legacy is turned off
   const finalStatus = data.status || challenge.status;
   const finalTimelineTemplateId = data.timelineTemplateId || challenge.timelineTemplateId;
-  const timelineTemplateChanged = false;
-  if (!_.get(data, "legacy.pureV5") && !_.get(challenge, "legacy.pureV5")) {
+  let timelineTemplateChanged = false;
+  if (!currentUser.isMachine && !hasAdminRole(currentUser) && !_.get(data, "legacy.pureV5") && !_.get(challenge, "legacy.pureV5")) {
     if (
       finalStatus !== constants.challengeStatuses.New &&
       finalTimelineTemplateId !== challenge.timelineTemplateId
@@ -1747,7 +1748,7 @@ async function updateChallenge(currentUser, challengeId, data) {
   const { track, type } = await challengeHelper.validateAndGetChallengeTypeAndTrack({
     typeId: challenge.typeId,
     trackId: challenge.trackId,
-    timelineTemplateId: challenge.timelineTemplateId,
+    timelineTemplateId: timelineTemplateChanged ? finalTimelineTemplateId : challenge.timelineTemplateId,
   });
 
   if (_.get(type, "isTask")) {