diff --git a/app/models.py b/app/models.py
index 01906f10..266c094f 100644
--- a/app/models.py
+++ b/app/models.py
@@ -96,7 +96,7 @@ def reset_url(self):
             _external=True,
         ).lower()
 
-        frontend_base_url = "https://app-frontend-test-001.azurewebsites.net"
+        frontend_base_url = "https://app.climatemind.org"
         route_component = "/password-reset/"
         hard_coded_url = frontend_base_url + route_component + str(self.uuid).lower()
         return hard_coded_url
diff --git a/app/sendgrid/templates/user_b_shared_email.py b/app/sendgrid/templates/user_b_shared_email.py
index 27dfa3de..60752c85 100644
--- a/app/sendgrid/templates/user_b_shared_email.py
+++ b/app/sendgrid/templates/user_b_shared_email.py
@@ -184,7 +184,7 @@
                     <tbody>
                         <tr>
                             <td align="center" valign="middle" class="mcnButtonContent" style="font-family: Arial;font-size: 16px;padding: 16px;mso-line-height-rule: exactly;-ms-text-size-adjust: 100%;-webkit-text-size-adjust: 100%;">
-                                <a class="mcnButton " title="Conversation" href="https://app-frontend-test-001.azurewebsites.net/sharelink?conversation=-conversation_uuid-" target="_blank" style="font-weight: bold;letter-spacing: normal;line-height: 100%;text-align: center;text-decoration: none;color: #07373B;mso-line-height-rule: exactly;-ms-text-size-adjust: 100%;-webkit-text-size-adjust: 100%;display: block;">Login</a>
+                                <a class="mcnButton " title="Conversation" href="https://app.climatemind.org/sharelink?conversation=-conversation_uuid-" target="_blank" style="font-weight: bold;letter-spacing: normal;line-height: 100%;text-align: center;text-decoration: none;color: #07373B;mso-line-height-rule: exactly;-ms-text-size-adjust: 100%;-webkit-text-size-adjust: 100%;display: block;">Login</a>
                             </td>
                         </tr>
                     </tbody>
diff --git a/app/sendgrid/templates/welcome_email.py b/app/sendgrid/templates/welcome_email.py
index 4791bffb..41d6bdd8 100644
--- a/app/sendgrid/templates/welcome_email.py
+++ b/app/sendgrid/templates/welcome_email.py
@@ -183,7 +183,7 @@
                     <tbody>
                         <tr>
                             <td align="center" valign="middle" class="mcnButtonContent" style="font-family: Arial;font-size: 16px;padding: 16px;mso-line-height-rule: exactly;-ms-text-size-adjust: 100%;-webkit-text-size-adjust: 100%;">
-                                <a class="mcnButton " title="Login" href="https://app-frontend-test-001.azurewebsites.net/login" target="_blank" style="font-weight: bold;letter-spacing: normal;line-height: 100%;text-align: center;text-decoration: none;color: #07373B;mso-line-height-rule: exactly;-ms-text-size-adjust: 100%;-webkit-text-size-adjust: 100%;display: block;">Login</a>
+                                <a class="mcnButton " title="Login" href="https://app.climatemind.org/login" target="_blank" style="font-weight: bold;letter-spacing: normal;line-height: 100%;text-align: center;text-decoration: none;color: #07373B;mso-line-height-rule: exactly;-ms-text-size-adjust: 100%;-webkit-text-size-adjust: 100%;display: block;">Login</a>
                             </td>
                         </tr>
                     </tbody>