diff --git a/.circleci/config.yml b/.circleci/config.yml
index 1c81ef8782..dacf9ab7bc 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -289,7 +289,7 @@ workflows:
           filters:
             branches:
               only:
-                - nav-vanilla-forum
+                - free
       # This is beta env for production soft releases
       - "build-prod-beta":
           context : org-global
@@ -304,6 +304,7 @@ workflows:
             branches:
               only:
                 - develop
+                - nav-vanilla-forum
       - "approve-smoke-test-on-staging":
           type: approval
           requires:
diff --git a/config/default.js b/config/default.js
index 2458c6cf84..7ff6b30755 100644
--- a/config/default.js
+++ b/config/default.js
@@ -110,7 +110,8 @@ module.exports = {
     BLOG: 'https://www.topcoder-dev.com/blog',
     BLOG_FEED: 'https://www.topcoder.com/blog/feed/',
     COMMUNITY: 'https://community.topcoder-dev.com',
-    FORUMS: 'https://vanilla.topcoder-dev.com',
+    FORUMS: 'https://apps.topcoder-dev.com/forums',
+    FORUMS_VANILLA: 'https://vanilla.topcoder-dev.com',
     HELP: 'https://www.topcoder.com/thrive/tracks?track=Topcoder&tax=Help%20Articles',
     SUBMISSION_REVIEW: 'https://submission-review.topcoder-dev.com',
 
diff --git a/config/production.js b/config/production.js
index 7e5c240740..d1951cb747 100644
--- a/config/production.js
+++ b/config/production.js
@@ -30,7 +30,8 @@ module.exports = {
     BASE: 'https://www.topcoder.com',
     HOME: '/my-dashboard',
     COMMUNITY: 'https://community.topcoder.com',
-    FORUMS: 'https://discussions.topcoder.com',
+    FORUMS: 'https://apps.topcoder.com/forums',
+    FORUMS_VANILLA: 'https://discussions.topcoder.com',
     HELP: 'https://www.topcoder.com/thrive/tracks?track=Topcoder&tax=Help%20Articles',
     SUBMISSION_REVIEW: 'https://submission-review.topcoder.com',
     MEMBER: 'https://member.topcoder.com',
diff --git a/src/shared/components/TopcoderFooter/index.jsx b/src/shared/components/TopcoderFooter/index.jsx
index dd2899be79..1fe6d66251 100644
--- a/src/shared/components/TopcoderFooter/index.jsx
+++ b/src/shared/components/TopcoderFooter/index.jsx
@@ -71,7 +71,7 @@ export default function TopcoderFooter() {
               <Link to={`${base}/blog`}>Blog</Link>
               <Link to={`${base}/community/pipeline`}>Challenge Pipeline</Link>
               <Link to={`${base}/community/events`}>Events Calendar</Link>
-              <Link to={`${config.URL.FORUMS}`}>Forums</Link>
+              <Link to={`${config.URL.FORUMS_VANILLA}`}>Forums</Link>
               <Link to={`${base}/community/member-programs`}>Programs</Link>
               <Link to={`${base}/community/statistics`}>Statistics</Link>
               <Link to={`${base}/community/member-programs/topcoder-open`}>TCO</Link>