diff --git a/client/html/index.html b/client/html/index.html
index ef054f359..5de3933a4 100644
--- a/client/html/index.html
+++ b/client/html/index.html
@@ -27,7 +27,7 @@
             topMargin: 130,
             urlPrefix: 'https://charts-dev.advancedalgos.net/' ,  /* 'http://localhost:1337/'   */   /*  'https://charts-dev.advancedalgos.net/'  */
             graphQL: {
-            masterAppApiUrl: 'https://app-api.advancedalgos.net/graphql'
+            masterAppApiUrl: 'https://platform-api-dev.advancedalgos.net/graphql'
         },
         context: {}
         };
diff --git a/server/src/resolvers/mutation/sendgrid.js b/server/src/resolvers/mutation/sendgrid.js
index 8e199d7a1..40b9c1275 100644
--- a/server/src/resolvers/mutation/sendgrid.js
+++ b/server/src/resolvers/mutation/sendgrid.js
@@ -6,12 +6,7 @@ import logger from '../../logger'
 
 const API_KEY = process.env.SG_APIKEY
 const API_KEY_CONTACTS = process.env.SG_APIKEY_CONTACTS
-
-const dev = process.env.NODE_ENV === 'development' ? true : false
-let origin = 'https://app.advancedalgos.net'
-if (dev){
-  origin = 'http://localhost:3100'
-}
+let origin = process.env.SANDGRID_ORIGN
 
 export default {
   async master_NewsletterSignup(parent, { email }, ctx, info) {
@@ -78,10 +73,7 @@ export default {
     return sendVerify
   },
   async master_NewsletterSignupVerify(parent, { token }, ctx, info){
-    let origin = 'https://app.advancedalgos.net'
-    if (dev){
-      origin = 'http://localhost:3100'
-    }
+    let origin = process.env.SANDGRID_ORIGN
     const headers = {
       'Content-Type': 'application/json',
       'Access-Control-Allow-Origin' : origin,