diff --git a/.circleci/config.yml b/.circleci/config.yml
index 7d107a6dc6..dedb319811 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -290,14 +290,14 @@ workflows:
           filters:
             branches:
               only:
-                - free
+                - bug-bash
       # This is beta env for production soft releases
       - "build-prod-beta":
           context : org-global
           filters:
             branches:
               only:
-                - develop
+                - bug-bash
       # This is stage env for production QA releases
       - "build-prod-staging":
           context : org-global         
diff --git a/config/default.js b/config/default.js
index ec2de811b4..161136e9e2 100644
--- a/config/default.js
+++ b/config/default.js
@@ -140,6 +140,7 @@ module.exports = {
       HOWTOCOMPETEINMARATHON: 'https://www.topcoder.com/thrive/articles/How%20To%20Compete%20in%20a%20Marathon%20Match',
       USABLECODEDEV: 'https://www.topcoder.com/thrive/articles/Usable%20Code%20in%20Dev%20Challenges',
       EXTENSIONVSCODE: 'https://marketplace.visualstudio.com/items?itemName=Topcoder.topcoder-workflow&ssr=false#overview',
+      TEMPLATES_REPO: 'https://github.com/topcoder-platform-templates',
     },
 
     IOS: 'https://ios.topcoder-dev.com',
diff --git a/src/shared/components/Settings/Preferences/index.jsx b/src/shared/components/Settings/Preferences/index.jsx
index 5db18e1be9..ed7c3456d7 100644
--- a/src/shared/components/Settings/Preferences/index.jsx
+++ b/src/shared/components/Settings/Preferences/index.jsx
@@ -88,7 +88,7 @@ export default class Preferences extends React.Component {
       case 'e-mail':
         return <NewsletterPreferencesContainer email={email} />;
       case 'forum':
-        return (window.location.href = `${config.URL.FORUMS}/?module=Settings`) && <LoadingIndicator />;
+        return (window.location.href = `${config.URL.FORUMS_VANILLA}/profile/preferences`) && <LoadingIndicator />;
       case 'payment':
         return (window.location.href = `${config.URL.COMMUNITY}/tc?module=EditPaymentPreferences`) && <LoadingIndicator />;
       default:
diff --git a/src/shared/components/challenge-detail/Specification/SideBar/index.jsx b/src/shared/components/challenge-detail/Specification/SideBar/index.jsx
index 793278de7d..7c5465c066 100644
--- a/src/shared/components/challenge-detail/Specification/SideBar/index.jsx
+++ b/src/shared/components/challenge-detail/Specification/SideBar/index.jsx
@@ -432,6 +432,16 @@ export default function SideBar({
               </div>
             </Tooltip>
           </span>
+          <span styleName="link-like-paragraph tooltip-container">
+            <a
+              href={config.URL.INFO.TEMPLATES_REPO}
+              title="Topcoder Templates repository"
+              target="_blank"
+              rel="noreferrer"
+            >
+              Topcoder Templates <br /> repository
+            </a>
+          </span>
         </div>
         { shareable && (
           <div>
diff --git a/src/shared/components/challenge-detail/Winners/Winner/index.jsx b/src/shared/components/challenge-detail/Winners/Winner/index.jsx
index 1a28490688..bd545f7808 100644
--- a/src/shared/components/challenge-detail/Winners/Winner/index.jsx
+++ b/src/shared/components/challenge-detail/Winners/Winner/index.jsx
@@ -1,6 +1,6 @@
 import { Avatar } from 'topcoder-react-ui-kit';
 import PT from 'prop-types';
-import React from 'react';
+import React, { useEffect, useState } from 'react';
 import _ from 'lodash';
 import { config } from 'topcoder-react-utils';
 
@@ -20,6 +20,11 @@ export default function Winner({
   viewable,
   winner,
 }) {
+  const [windowOrigin, setWindowOrigin] = useState();
+  useEffect(() => {
+    setWindowOrigin(window.origin);
+  }, []);
+
   const submissionId = viewable && getId(submissions, winner.placement);
 
   let placeStyle = winner.placement < 4 ? `place-${winner.placement}` : '';
@@ -69,9 +74,9 @@ export default function Winner({
           />
           <div>
             <a
-              href={`${window.origin}/members/${winner.handle}`}
+              href={`${windowOrigin}/members/${winner.handle}`}
               styleName="handle"
-              target={`${_.includes(window.origin, 'www') ? '_self' : '_blank'}`}
+              target={`${_.includes(windowOrigin, 'www') ? '_self' : '_blank'}`}
             >
               {winner.handle}
             </a>