diff --git a/.circleci/config.yml b/.circleci/config.yml
index 379740beb9be..496e5c988c09 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -13,10 +13,10 @@ executors:
 aliases:
   - &restore_cache
     restore_cache:
-      key: dependencies-{{ .Branch }}-{{ checksum "package-lock.json" }}-4
+      key: dependencies-{{ .Branch }}-{{ checksum "package-lock.json" }}-5
   - &save_cache
     save_cache:
-      key: dependencies-{{ .Branch }}-{{ checksum "package-lock.json" }}-4
+      key: dependencies-{{ .Branch }}-{{ checksum "package-lock.json" }}-5
       paths:
         - ~/mattermost/mattermost-webapp/node_modules
 
diff --git a/components/admin_console/billing/billing_history.tsx b/components/admin_console/billing/billing_history.tsx
index 179633ddbe10..624db239e23a 100644
--- a/components/admin_console/billing/billing_history.tsx
+++ b/components/admin_console/billing/billing_history.tsx
@@ -8,6 +8,8 @@ import FormattedAdminHeader from 'components/widgets/admin_console/formatted_adm
 import FormattedMarkdownMessage from 'components/formatted_markdown_message';
 import noBillingHistoryGraphic from 'images/no_billing_history_graphic.svg';
 
+import {CloudLinks} from 'utils/constants';
+
 import './billing_history.scss';
 
 type Props = {
@@ -27,9 +29,9 @@ const noBillingHistorySection = (
             />
         </div>
         <a
-            target='_blank'
+            target='_new'
             rel='noopener noreferrer'
-            href='http://www.google.com'
+            href={CloudLinks.BILLING_DOCS}
             className='BillingHistory__noHistory-link'
         >
             <FormattedMessage
diff --git a/components/admin_console/billing/billing_subscriptions.tsx b/components/admin_console/billing/billing_subscriptions.tsx
index ee9f8bb271bb..cf9d0b0ccc09 100644
--- a/components/admin_console/billing/billing_subscriptions.tsx
+++ b/components/admin_console/billing/billing_subscriptions.tsx
@@ -2,8 +2,8 @@
 // See LICENSE.txt for license information.
 
 import React, {useState, useEffect} from 'react';
-import {FormattedMessage, useIntl} from 'react-intl';
 import {useDispatch, useStore, useSelector} from 'react-redux';
+import {FormattedMessage, useIntl} from 'react-intl';
 
 import {getCloudSubscription, getCloudProducts} from 'mattermost-redux/actions/cloud';
 import {DispatchFunc} from 'mattermost-redux/types/actions';
@@ -17,6 +17,8 @@ import {getCurrentUser} from 'mattermost-redux/selectors/entities/users';
 import {makeGetCategory} from 'mattermost-redux/selectors/entities/preferences';
 
 import {GlobalState} from 'types/store';
+import {getCloudContactUsLink, InquiryType} from 'selectors/cloud';
+
 import AlertBanner from 'components/alert_banner';
 import FormattedMarkdownMessage from 'components/formatted_markdown_message';
 import FormattedAdminHeader from 'components/widgets/admin_console/formatted_admin_header';
@@ -27,63 +29,9 @@ import privateCloudImage from 'images/private-cloud-image.svg';
 import upgradeMattermostCloudImage from 'images/upgrade-mattermost-cloud-image.svg';
 
 import PlanDetails from './plan_details';
-
-import './billing_subscriptions.scss';
 import BillingSummary from './billing_summary';
 
-const upgradeMattermostCloud = () => (
-    <div className='UpgradeMattermostCloud'>
-        <div className='UpgradeMattermostCloud__image'>
-            <img src={upgradeMattermostCloudImage}/>
-        </div>
-        <div className='UpgradeMattermostCloud__title'>
-            <FormattedMessage
-                id='admin.billing.subscription.upgradeMattermostCloud.title'
-                defaultMessage='Need more users?'
-            />
-        </div>
-        <div className='UpgradeMattermostCloud__description'>
-            <FormattedMarkdownMessage
-                id='admin.billing.subscription.upgradeMattermostCloud.description'
-                defaultMessage='The free tier is **limited to 10 users.** Get access to more users, teams and other great features'
-            />
-        </div>
-        <button className='UpgradeMattermostCloud__upgradeButton'>
-            <FormattedMessage
-                id='admin.billing.subscription.upgradeMattermostCloud.upgradeButton'
-                defaultMessage='Upgrade Mattermost Cloud'
-            />
-        </button>
-    </div>
-);
-
-const privateCloudCard = () => (
-    <div className='PrivateCloudCard'>
-        <div className='PrivateCloudCard__text'>
-            <div className='PrivateCloudCard__text-title'>
-                <FormattedMessage
-                    id='admin.billing.subscription.privateCloudCard.title'
-                    defaultMessage='Looking for a high-trust private cloud?'
-                />
-            </div>
-            <div className='PrivateCloudCard__text-description'>
-                <FormattedMessage
-                    id='admin.billing.subscription.privateCloudCard.description'
-                    defaultMessage='If you need software with dedicated, single-tenant architecture, Mattermost Private Cloud (Beta) is the solution for high-trust collaboration.'
-                />
-            </div>
-            <button className='PrivateCloudCard__contactSales'>
-                <FormattedMessage
-                    id='admin.billing.subscription.privateCloudCard.contactSales'
-                    defaultMessage='Contact Sales'
-                />
-            </button>
-        </div>
-        <div className='PrivateCloudCard__image'>
-            <img src={privateCloudImage}/>
-        </div>
-    </div>
-);
+import './billing_subscriptions.scss';
 
 const WARNING_THRESHOLD = 3;
 
@@ -105,6 +53,8 @@ const BillingSubscriptions: React.FC<Props> = () => {
     const getCategory = makeGetCategory();
     const preferences = useSelector<GlobalState, PreferenceType[]>((state) => getCategory(state, Preferences.ADMIN_CLOUD_UPGRADE_PANEL));
 
+    const contactSalesLink = useSelector((state: GlobalState) => getCloudContactUsLink(state, InquiryType.Sales));
+
     useEffect(() => {
         getCloudSubscription()(dispatch, store.getState());
         getCloudProducts()(dispatch, store.getState());
@@ -144,6 +94,66 @@ const BillingSubscriptions: React.FC<Props> = () => {
         ]));
     };
 
+    const upgradeMattermostCloud = () => (
+        <div className='UpgradeMattermostCloud'>
+            <div className='UpgradeMattermostCloud__image'>
+                <img src={upgradeMattermostCloudImage}/>
+            </div>
+            <div className='UpgradeMattermostCloud__title'>
+                <FormattedMessage
+                    id='admin.billing.subscription.upgradeMattermostCloud.title'
+                    defaultMessage='Need more users?'
+                />
+            </div>
+            <div className='UpgradeMattermostCloud__description'>
+                <FormattedMarkdownMessage
+                    id='admin.billing.subscription.upgradeMattermostCloud.description'
+                    defaultMessage='The free tier is **limited to 10 users.** Get access to more users, teams and other great features'
+                />
+            </div>
+            <button className='UpgradeMattermostCloud__upgradeButton'>
+                <FormattedMessage
+                    id='admin.billing.subscription.upgradeMattermostCloud.upgradeButton'
+                    defaultMessage='Upgrade Mattermost Cloud'
+                />
+            </button>
+        </div>
+    );
+
+    const privateCloudCard = () => (
+        <div className='PrivateCloudCard'>
+            <div className='PrivateCloudCard__text'>
+                <div className='PrivateCloudCard__text-title'>
+                    <FormattedMessage
+                        id='admin.billing.subscription.privateCloudCard.title'
+                        defaultMessage='Looking for a high-trust private cloud?'
+                    />
+                </div>
+                <div className='PrivateCloudCard__text-description'>
+                    <FormattedMessage
+                        id='admin.billing.subscription.privateCloudCard.description'
+                        defaultMessage='If you need software with dedicated, single-tenant architecture, Mattermost Private Cloud (Beta) is the solution for high-trust collaboration.'
+                    />
+                </div>
+                <button className='PrivateCloudCard__contactSales'>
+                    <a
+                        href={contactSalesLink}
+                        rel='noopener noreferrer'
+                        target='_new'
+                    >
+                        <FormattedMessage
+                            id='admin.billing.subscription.privateCloudCard.contactSales'
+                            defaultMessage='Contact Sales'
+                        />
+                    </a>
+                </button>
+            </div>
+            <div className='PrivateCloudCard__image'>
+                <img src={privateCloudImage}/>
+            </div>
+        </div>
+    );
+
     return (
         <div className='wrapper--fixed BillingSubscriptions'>
             <FormattedAdminHeader
diff --git a/components/admin_console/billing/billing_summary.tsx b/components/admin_console/billing/billing_summary.tsx
index df40213533dd..6c987c7bf7a2 100644
--- a/components/admin_console/billing/billing_summary.tsx
+++ b/components/admin_console/billing/billing_summary.tsx
@@ -4,6 +4,8 @@
 import React from 'react';
 import {FormattedMessage} from 'react-intl';
 
+import {CloudLinks} from 'utils/constants';
+
 import noBillingHistoryGraphic from 'images/no_billing_history_graphic.svg';
 
 import './billing_summary.scss';
@@ -27,9 +29,9 @@ const noBillingHistory = (
             />
         </div>
         <a
-            target='_blank'
+            target='_new'
             rel='noopener noreferrer'
-            href='http://www.google.com'
+            href={CloudLinks.BILLING_DOCS}
             className='BillingSummary__noBillingHistory-link'
         >
             <FormattedMessage
diff --git a/components/admin_console/billing/plan_details.tsx b/components/admin_console/billing/plan_details.tsx
index 629a675451a0..0289f283d905 100644
--- a/components/admin_console/billing/plan_details.tsx
+++ b/components/admin_console/billing/plan_details.tsx
@@ -14,6 +14,7 @@ import OverlayTrigger from 'components/overlay_trigger';
 import {getCurrentLocale} from 'selectors/i18n';
 import {GlobalState} from 'types/store';
 import {getMonthLong} from 'utils/i18n';
+import {CloudLinks} from 'utils/constants';
 import {localizeMessage} from 'utils/utils';
 
 import './plan_details.scss';
@@ -67,8 +68,18 @@ const seatsAndSubscriptionDates = (locale: string, userCount: number, numberOfSe
                                     <div className='BillingSubscriptions__tooltipMessage'>
                                         <FormattedMarkdownMessage
                                             id='admin.billing.subscription.planDetails.prolongedOverages'
-                                            defaultMessage='Prolonged overages may result in additional charges. [See how billing works](!https://google.com)'
+                                            defaultMessage='Prolonged overages may result in additional charges.'
                                         />
+                                        <a
+                                            target='_new'
+                                            rel='noopener noreferrer'
+                                            href={CloudLinks.BILLING_DOCS}
+                                        >
+                                            <FormattedMarkdownMessage
+                                                id='admin.billing.subscription.planDetails.howBillingWorks'
+                                                defaultMessage='See how billing works'
+                                            />
+                                        </a>
                                     </div>
                                 </Tooltip>
                             )}
diff --git a/components/purchase_modal/index.ts b/components/purchase_modal/index.ts
index 5a5ab8b86851..4537a4e9e69b 100644
--- a/components/purchase_modal/index.ts
+++ b/components/purchase_modal/index.ts
@@ -3,27 +3,24 @@
 
 import {connect} from 'react-redux';
 import {bindActionCreators, Dispatch, ActionCreatorsMapObject} from 'redux';
+import {Stripe} from '@stripe/stripe-js';
 
 import {getConfig} from 'mattermost-redux/selectors/entities/general';
 import {GenericAction, ActionFunc} from 'mattermost-redux/types/actions';
-import {Stripe} from '@stripe/stripe-js';
-
 import {getCloudProducts} from 'mattermost-redux/actions/cloud';
+import {getClientConfig} from 'mattermost-redux/actions/general';
 
-import {
-    getClientConfig,
-} from 'mattermost-redux/actions/general';
-
+import {GlobalState} from 'types/store';
 import {BillingDetails} from 'types/cloud/sku';
 
 import {isModalOpen} from 'selectors/views/modals';
+import {getCloudContactUsLink, InquiryType} from 'selectors/cloud';
+
 import {ModalIdentifiers} from 'utils/constants';
 
 import {closeModal} from 'actions/views/modals';
 import {completeStripeAddPaymentMethod} from 'actions/cloud';
 
-import {GlobalState} from 'types/store';
-
 import PurchaseModal from './purchase_modal';
 
 function mapStateToProps(state: GlobalState) {
@@ -31,6 +28,8 @@ function mapStateToProps(state: GlobalState) {
         show: isModalOpen(state, ModalIdentifiers.CLOUD_PURCHASE),
         products: state.entities.cloud!.products,
         isDevMode: getConfig(state).EnableDeveloper === 'true',
+        contactSupportLink: getCloudContactUsLink(state, InquiryType.Technical),
+        contactSalesLink: getCloudContactUsLink(state, InquiryType.Sales),
     };
 }
 type Actions = {
diff --git a/components/purchase_modal/purchase_modal.tsx b/components/purchase_modal/purchase_modal.tsx
index 3255c3f564b5..2434e1b61886 100644
--- a/components/purchase_modal/purchase_modal.tsx
+++ b/components/purchase_modal/purchase_modal.tsx
@@ -20,12 +20,14 @@ import RootPortal from 'components/root_portal';
 import FullScreenModal from 'components/widgets/modals/full_screen_modal';
 import {areBillingDetailsValid, BillingDetails} from 'types/cloud/sku';
 import {getNextBillingDate} from 'utils/utils';
+import {CloudLinks} from 'utils/constants';
 
 import PaymentForm from '../payment_form/payment_form';
 
+import ProcessPaymentSetup from './process_payment_setup';
+
 import './purchase.scss';
 import 'components/payment_form/payment_form.scss';
-import ProcessPaymentSetup from './process_payment_setup';
 
 const stripePromise = loadStripe(STRIPE_PUBLIC_KEY);
 
@@ -33,6 +35,8 @@ type Props = {
     show: boolean;
     isDevMode: boolean;
     products?: Dictionary<Product>;
+    contactSupportLink: string;
+    contactSalesLink: string;
     actions: {
         closeModal: () => void;
         getCloudProducts: () => void;
@@ -113,7 +117,9 @@ export default class PurchaseModal extends React.PureComponent<Props, State> {
                     </div>
                     <a
                         className='footer-text'
-                        href='https://support.mattermost.com/hc/en-us/requests/new?ticket_form_id=360000640492'
+                        href={this.props.contactSupportLink}
+                        rel='noopener noreferrer'
+                        target='_new'
                     >
                         <FormattedMessage
                             defaultMessage={'Contact Support'}
@@ -166,7 +172,11 @@ export default class PurchaseModal extends React.PureComponent<Props, State> {
                                 />
                             </span>
                             {'\u00A0'}
-                            <a href='https://support.mattermost.com/hc/en-us/requests/new?ticket_form_id=360000640492'>
+                            <a
+                                href={CloudLinks.BILLING_DOCS}
+                                target='_new'
+                                rel='noopener noreferrer'
+                            >
                                 <FormattedMessage
                                     defaultMessage={'See how billing works.'}
                                     id={'admin.billing.subscription.howItWorks'}
@@ -177,7 +187,9 @@ export default class PurchaseModal extends React.PureComponent<Props, State> {
                     <div className='footer-text'>{'Need other billing options?'}</div>
                     <a
                         className='footer-text'
-                        href='https://support.mattermost.com/hc/en-us/requests/new?ticket_form_id=360000640492'
+                        href={this.props.contactSalesLink}
+                        target='_new'
+                        rel='noopener noreferrer'
                     >
                         <FormattedMessage
                             defaultMessage={'Contact Sales'}
diff --git a/i18n/en.json b/i18n/en.json
index 68e563bad9b3..d28ca9b83ac9 100644
--- a/i18n/en.json
+++ b/i18n/en.json
@@ -257,10 +257,11 @@
   "admin.billing.subscription.planDetails.features.selfServiceDocumentation": "Self-Service documentation and forum support",
   "admin.billing.subscription.planDetails.features.unlimitedIntegrations": "Unlimited Integrations",
   "admin.billing.subscription.planDetails.features.unlimitedTeamsAndChannels": "Unlimited teams, channels, and search history",
+  "admin.billing.subscription.planDetails.howBillingWorks": "See how billing works",
   "admin.billing.subscription.planDetails.numberOfSeats": "{numberOfSeats} seats",
   "admin.billing.subscription.planDetails.numberOfSeatsRegistered": "({userCount} currently registered)",
   "admin.billing.subscription.planDetails.perUserPerMonth": "/user/month",
-  "admin.billing.subscription.planDetails.prolongedOverages": "Prolonged overages may result in additional charges. [See how billing works](!https://google.com)",
+  "admin.billing.subscription.planDetails.prolongedOverages": "Prolonged overages may result in additional charges.",
   "admin.billing.subscription.planDetails.seatCountOverages": "Seat count overages",
   "admin.billing.subscription.planDetails.startDate": "Start Date: ",
   "admin.billing.subscription.planDetails.tiers.free": "Free",
diff --git a/package-lock.json b/package-lock.json
index 2295f208fec8..a340046f7c64 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -17678,8 +17678,8 @@
       "integrity": "sha512-6qE4B9deFBIa9YSpOc9O0Sgc43zTeVYbgDT5veRKSlB2+ZuHNoVVxA1L/ckMUayV9Ay9y7Z/SZCLcGteW9i7bg=="
     },
     "mattermost-redux": {
-      "version": "github:mattermost/mattermost-redux#5f2f131e4660a9f58851835085fbe62d2f3419d5",
-      "from": "github:mattermost/mattermost-redux#5f2f131e4660a9f58851835085fbe62d2f3419d5",
+      "version": "github:mattermost/mattermost-redux#15811ca565f1c72e666308c89babbc97d8da1dc0",
+      "from": "github:mattermost/mattermost-redux#15811ca565f1c72e666308c89babbc97d8da1dc0",
       "requires": {
         "core-js": "3.6.5",
         "form-data": "3.0.0",
diff --git a/package.json b/package.json
index db7d701ad473..207a759ffec2 100644
--- a/package.json
+++ b/package.json
@@ -37,7 +37,7 @@
     "localforage-observable": "2.0.1",
     "mark.js": "8.11.1",
     "marked": "github:mattermost/marked#87769262aa02e1784570f61f4f962050e07cc335",
-    "mattermost-redux": "github:mattermost/mattermost-redux#5f2f131e4660a9f58851835085fbe62d2f3419d5",
+    "mattermost-redux": "github:mattermost/mattermost-redux#15811ca565f1c72e666308c89babbc97d8da1dc0",
     "moment-timezone": "0.5.31",
     "p-queue": "6.6.1",
     "pdfjs-dist": "2.1.266",
diff --git a/selectors/cloud.ts b/selectors/cloud.ts
new file mode 100644
index 000000000000..58fc7386ecc8
--- /dev/null
+++ b/selectors/cloud.ts
@@ -0,0 +1,23 @@
+
+// Copyright (c) 2015-present Mattermost, Inc. All Rights Reserved.
+// See LICENSE.txt for license information.
+
+import {getConfig} from 'mattermost-redux/selectors/entities/general';
+import {getCurrentUser} from 'mattermost-redux/selectors/entities/users';
+
+import {GlobalState} from 'types/store';
+
+export enum InquiryType {
+    Technical = 'technical',
+    Sales = 'sales',
+    Billing = 'billing'
+}
+
+export function getCloudContactUsLink(state: GlobalState, inquiry: InquiryType): string {
+    // cloud/contact-us with query params for name, email and inquiry
+    const cwsUrl = getConfig(state).CWSUrl;
+    const user = getCurrentUser(state);
+    const fullName = `${user.first_name} ${user.last_name}`;
+
+    return `${cwsUrl}/cloud/contact-us?email=${encodeURIComponent(user.email)}&name=${encodeURIComponent(fullName)}&inquiry=${inquiry}`;
+}
diff --git a/utils/constants.jsx b/utils/constants.jsx
index a287a0201252..e08e51461a80 100644
--- a/utils/constants.jsx
+++ b/utils/constants.jsx
@@ -671,6 +671,10 @@ export const AboutLinks = {
     PRIVACY_POLICY: 'https://about.mattermost.com/default-privacy-policy/',
 };
 
+export const CloudLinks = {
+    BILLING_DOCS: 'https://docs.mattermost.com/overview/mattermost-cloud-overview.html#how-billing-works',
+};
+
 export const PermissionsScope = {
     [Permissions.INVITE_USER]: 'team_scope',
     [Permissions.INVITE_GUEST]: 'team_scope',