diff --git a/api/src/email/sendgrid.js b/api/src/email/sendgrid.js
index e5243a357..22133d892 100644
--- a/api/src/email/sendgrid.js
+++ b/api/src/email/sendgrid.js
@@ -4,15 +4,11 @@ var axios = require('axios')
 import { logger } from '../logger'
 
 const sendTeamMemberInvite = function(email, team) {
-    const dev = process.env.NODE_ENV === 'development' ? true : false
     logger.info(`sendTeamMemberInvite email|team: ${email} | ${team}`)
     const API_KEY = process.env.SG_APIKEY
     const token = jwt.sign({ email: email, team: team.slug }, API_KEY, { expiresIn: '7d' })
-    let origin = 'https://teams.advancedalgos.net'
+    let origin = process.env.SG_ORIGIN
     const params = '/activate-team-membership/'
-    if (dev){
-      origin = 'http://localhost:3001'
-    }
 
     const headers = {
       'Content-Type': 'application/json',
@@ -70,13 +66,9 @@ const sendTeamMemberInvite = function(email, team) {
 }
 
 const sendTeamCreateConfirmation = function(email, teamName, botName) {
-    const dev = process.env.NODE_ENV === 'development' ? true : false
     logger.info(`sendTeamCreateConfirmation email|teamName|botName: ${email} | ${teamName} | ${botName}`)
     const API_KEY = process.env.SG_APIKEY
-    let origin = 'https://teams.advancedalgos.net'
-    if (dev){
-      origin = 'http://localhost:3001'
-    }
+    let origin = process.env.SG_ORIGIN
 
     const headers = {
       'Content-Type': 'application/json',
@@ -93,7 +85,7 @@ const sendTeamCreateConfirmation = function(email, teamName, botName) {
               }
             ],
             dynamic_template_data: {
-              "aadeveloplink": "https://develop.advancedalgos.net/index.html",
+              "aadeveloplink": process.env.SG_PLATFORM_URL,
               "aateamname": teamName,
               "aabotname": botName,
               "subject": "Team " + teamName + " has been created!"
diff --git a/api/src/graphql/resolvers/Mutation/index.js b/api/src/graphql/resolvers/Mutation/index.js
index 7d94f1a61..e24e9653d 100644
--- a/api/src/graphql/resolvers/Mutation/index.js
+++ b/api/src/graphql/resolvers/Mutation/index.js
@@ -53,18 +53,17 @@ export const resolvers = {
       logger.info(JSON.stringify(await userData))
       const alias = await userData.data.users_User.alias
       const email = await userData.data.users_User.email
-      const avatar = 'https://aadevelop.blob.core.windows.net/module-teams/module-default/aa-avatar-default.png'
-      const banner = 'https://aadevelop.blob.core.windows.net/module-teams/module-default/aa-banner-default.png'
+      const avatar = process.env.STORAGE_URL + '/module-teams/module-default/aa-avatar-default.png'
+      const banner = process.env.STORAGE_URL + '/module-teams/module-default/aa-banner-default.png'
 
       const createTeamUrl = encodeURI(`${slug}/${name}/${alias}/${botSlug}/${botName}`)
       logger.info('createTeamUrl:')
       logger.info(JSON.stringify(await createTeamUrl))
 
-      const platformUrl = 'https://charts-dev.advancedalgos.net/AABrowserAPI/newTeam/'
-      // const platformUrl = 'http://localhost:1337/AABrowserAPI/teamSetup/'
+      const chartsUrl = process.env.CHARTS_URL + '/AABrowserAPI/newTeam/'
 
-      logger.info(`${platformUrl}${createTeamUrl}/${authId}`)
-      const createPlatformTeam = await axios.get(`${platformUrl}${createTeamUrl}/${authId}/${process.env.AAWEB_TEAM_SHARED_SECRET}`)
+      logger.info(`${chartsUrl}${createTeamUrl}/${authId}`)
+      const createPlatformTeam = await axios.get(`${chartsUrl}${createTeamUrl}/${authId}/${process.env.AAWEB_TEAM_SHARED_SECRET}`)
         .then((result) => {
           console.log('createPlatformTeam result:', result.data)
           if(result.data.message === 'Team Name already taken'){
@@ -152,11 +151,10 @@ export const resolvers = {
           logger.info('deleteTeamUrl:')
           logger.info(JSON.stringify(await deleteTeamUrl))
 
-          const platformUrl = 'https://charts-dev.advancedalgos.net/AABrowserAPI/deleteTeam/'
-          // const platformUrl = 'http://localhost:1337/AABrowserAPI/teamSetup/'
+          const chartsUrl = process.env.CHARTS_URL + '/AABrowserAPI/deleteTeam/'
 
-          logger.info(`${platformUrl}${deleteTeamUrl}/${authId}`)
-          const deletePlatformTeam = await axios.get(`${platformUrl}${deleteTeamUrl}/${authId}/${process.env.AAWEB_DELETE_TEAM_SHARED_SECRET}`)
+          logger.info(`${chartsUrl}${deleteTeamUrl}/${authId}`)
+          const deletePlatformTeam = await axios.get(`${chartsUrl}${deleteTeamUrl}/${authId}/${process.env.AAWEB_DELETE_TEAM_SHARED_SECRET}`)
             .then((result) => {
               console.log('deletePlatformTeam result:', result.data)
               if(result.data.result === 'Fail'){
diff --git a/api/src/middleware/getMember.js b/api/src/middleware/getMember.js
index 182933968..d4b0457c6 100644
--- a/api/src/middleware/getMember.js
+++ b/api/src/middleware/getMember.js
@@ -21,7 +21,7 @@ export const getUser = authId => {
   logger.info(authId)
   return new Promise((resolve, reject) => {
     try {
-      return axios.post(process.env.PLATFORM_URL, {
+      return axios.post(process.env.PLATFORM_API_URL, {
         query: `query users_User($userId: ID!) {
           users_User(id: $userId){
             id
diff --git a/client/src/views/dashboard/components/ManageFBEdit.js b/client/src/views/dashboard/components/ManageFBEdit.js
index 840161604..39434562b 100644
--- a/client/src/views/dashboard/components/ManageFBEdit.js
+++ b/client/src/views/dashboard/components/ManageFBEdit.js
@@ -120,7 +120,7 @@ export class ManageFBEdit extends Component {
                         let avatar = null
                         if (fb.avatar !== undefined && fb.avatar !== null) avatar = fb.avatar
                         if (this.state.avatar !== null) avatar = this.state.avatar
-                        if (this.state.avatar === null && fb.avatar === undefined) avatar = 'https://aadevelop.blob.core.windows.net/module-teams/module-default/aa-avatar-default.png'
+                        if (this.state.avatar === null && fb.avatar === undefined) avatar = process.env.STORAGE_URL + '/module-teams/module-default/aa-avatar-default.png'
 
                         if (loading || data === undefined) {
                           return (<MessageCard message='Loading...' />)
diff --git a/client/src/views/dashboard/components/ManageFBItem.js b/client/src/views/dashboard/components/ManageFBItem.js
index 0b3b038f2..ea881a173 100644
--- a/client/src/views/dashboard/components/ManageFBItem.js
+++ b/client/src/views/dashboard/components/ManageFBItem.js
@@ -18,7 +18,7 @@ export const ManageFBItem = ({ classes, team, authId }) => {
   if (team.fb[0].avatar !== undefined && team.fb[0].avatar !== 'a') {
     avatar = team.fb[0].avatar
   } else {
-    avatar = 'https://aadevelop.blob.core.windows.net/module-teams/module-default/aa-avatar-default.png'
+    avatar = process.env.STORAGE_URL+'/module-teams/module-default/aa-avatar-default.png'
   }
   return (
     <Grid item xs={12}>
diff --git a/client/src/views/dashboard/components/ManageMembersTeamItem.js b/client/src/views/dashboard/components/ManageMembersTeamItem.js
index e2b439727..a7a88c384 100644
--- a/client/src/views/dashboard/components/ManageMembersTeamItem.js
+++ b/client/src/views/dashboard/components/ManageMembersTeamItem.js
@@ -63,7 +63,7 @@ export const ManageMembersTeamItem = ({ classes, team, authId }) => {
   if (team.profile.avatar !== undefined && team.profile.avatar !== 'a') {
     avatar = team.profile.avatar
   } else {
-    avatar = 'https://aadevelop.blob.core.windows.net/module-teams/module-default/aa-avatar-default.png'
+    avatar = process.env.STORAGE_URL + '/module-teams/module-default/aa-avatar-default.png'
   }
   if (team.members.length > 0) {
     return (
diff --git a/client/src/views/dashboard/components/ManageTeamDetails.js b/client/src/views/dashboard/components/ManageTeamDetails.js
index cc5aa8367..b37e68d52 100644
--- a/client/src/views/dashboard/components/ManageTeamDetails.js
+++ b/client/src/views/dashboard/components/ManageTeamDetails.js
@@ -72,12 +72,12 @@ export class ManageTeamDetails extends Component {
     if (profile.avatar !== undefined && profile.avatar !== null) {
       avatar = profile.avatar
     } else {
-      avatar = 'https://aadevelop.blob.core.windows.net/module-teams/module-default/aa-avatar-default.png'
+      avatar = process.env.STORAGE_URL + '/module-teams/module-default/aa-avatar-default.png'
     }
     if (profile.banner !== undefined && profile.banner !== null) {
       banner = profile.banner
     } else {
-      banner = 'https://aadevelop.blob.core.windows.net/module-teams/module-default/aa-banner-default.png'
+      banner = process.env.STORAGE_URL + '/module-teams/module-default/aa-banner-default.png'
     }
     return (
       <div>
diff --git a/client/src/views/dashboard/components/ManageTeamEdit.js b/client/src/views/dashboard/components/ManageTeamEdit.js
index d51e31b3c..9574b700f 100644
--- a/client/src/views/dashboard/components/ManageTeamEdit.js
+++ b/client/src/views/dashboard/components/ManageTeamEdit.js
@@ -129,11 +129,11 @@ export class ManageTeamEdit extends Component {
                         let avatar = null
                         if (team.profile !== null && team.profile.avatar !== undefined && team.profile.avatar !== null) avatar = team.profile.avatar
                         if (this.state.avatar !== null) avatar = this.state.avatar
-                        if (this.state.avatar === null && team.profile !== null && team.profile.avatar === undefined) avatar = 'https://aadevelop.blob.core.windows.net/module-teams/module-default/aa-avatar-default.png'
+                        if (this.state.avatar === null && team.profile !== null && team.profile.avatar === undefined) avatar = process.env.STORAGE_URL + '/module-teams/module-default/aa-avatar-default.png'
                         let banner = null
                         if (team.profile !== null && team.profile.banner !== undefined && team.profile.banner !== null) banner = team.profile.banner
                         if (this.state.banner !== null) banner = this.state.banner
-                        if (this.state.banner === null && team.profile !== null && team.profile.banner === undefined) banner = 'https://aadevelop.blob.core.windows.net/module-teams/module-default/aa-banner-default.png'
+                        if (this.state.banner === null && team.profile !== null && team.profile.banner === undefined) banner = process.env.STORAGE_URL + '/module-teams/module-default/aa-banner-default.png'
                         log.debug('team images: ', avatar, banner)
 
                         if (loading || data === undefined) {
diff --git a/client/src/views/dashboard/components/ManageTeamsItem.js b/client/src/views/dashboard/components/ManageTeamsItem.js
index cedb75aa9..759132275 100644
--- a/client/src/views/dashboard/components/ManageTeamsItem.js
+++ b/client/src/views/dashboard/components/ManageTeamsItem.js
@@ -20,7 +20,7 @@ export const ManageTeamsItem = ({ classes, team, authId }) => {
   if (team.profile.avatar !== undefined && team.profile.avatar !== 'a') {
     avatar = team.profile.avatar
   } else {
-    avatar = 'https://aadevelop.blob.core.windows.net/module-teams/module-default/aa-avatar-default.png'
+    avatar = process.env.STORAGE_URL + '/module-teams/module-default/aa-avatar-default.png'
   }
   return (
     <Grid item xs={12}>
diff --git a/client/src/views/financial-beings/components/ManageFBEdit.js b/client/src/views/financial-beings/components/ManageFBEdit.js
index ef4b2915a..e8f69bd65 100644
--- a/client/src/views/financial-beings/components/ManageFBEdit.js
+++ b/client/src/views/financial-beings/components/ManageFBEdit.js
@@ -68,7 +68,7 @@ export class ManageFBEdit extends Component {
           const containerName = slug
 
           let avatar = null
-          if (this.state.avatar === null && fb.avatar === undefined) avatar = 'https://aadevelop.blob.core.windows.net/module-teams/module-default/aa-avatar-default.png'
+          if (this.state.avatar === null && fb.avatar === undefined) avatar = process.env.STORAGE_URL + '/module-teams/module-default/aa-avatar-default.png'
           if (fb.avatar !== undefined && fb.avatar !== null) avatar = fb.avatar
           if (this.state.avatar !== null) avatar = this.state.avatar
 
diff --git a/client/src/views/financial-beings/components/ManageFBItem.js b/client/src/views/financial-beings/components/ManageFBItem.js
index 743d253ea..bd1fb2cc3 100644
--- a/client/src/views/financial-beings/components/ManageFBItem.js
+++ b/client/src/views/financial-beings/components/ManageFBItem.js
@@ -18,7 +18,7 @@ export const ManageFBItem = ({ classes, team }) => {
   if (team.fb[0].avatar !== undefined && team.fb[0].avatar !== 'a') {
     avatar = team.fb[0].avatar
   } else {
-    avatar = 'https://aadevelop.blob.core.windows.net/module-teams/module-default/aa-avatar-default.png'
+    avatar = process.env.STORAGE_URL + '/module-teams/module-default/aa-avatar-default.png'
   }
   return (
     <Grid item xs={12}>
diff --git a/client/src/views/manage-teams/components/ManageTeamDetails.js b/client/src/views/manage-teams/components/ManageTeamDetails.js
index cc5aa8367..b37e68d52 100644
--- a/client/src/views/manage-teams/components/ManageTeamDetails.js
+++ b/client/src/views/manage-teams/components/ManageTeamDetails.js
@@ -72,12 +72,12 @@ export class ManageTeamDetails extends Component {
     if (profile.avatar !== undefined && profile.avatar !== null) {
       avatar = profile.avatar
     } else {
-      avatar = 'https://aadevelop.blob.core.windows.net/module-teams/module-default/aa-avatar-default.png'
+      avatar = process.env.STORAGE_URL + '/module-teams/module-default/aa-avatar-default.png'
     }
     if (profile.banner !== undefined && profile.banner !== null) {
       banner = profile.banner
     } else {
-      banner = 'https://aadevelop.blob.core.windows.net/module-teams/module-default/aa-banner-default.png'
+      banner = process.env.STORAGE_URL + '/module-teams/module-default/aa-banner-default.png'
     }
     return (
       <div>
diff --git a/client/src/views/manage-teams/components/ManageTeamEdit.js b/client/src/views/manage-teams/components/ManageTeamEdit.js
index 0c1692e07..7e575eab0 100644
--- a/client/src/views/manage-teams/components/ManageTeamEdit.js
+++ b/client/src/views/manage-teams/components/ManageTeamEdit.js
@@ -75,12 +75,12 @@ export class ManageTeamEdit extends Component {
           const AzureStorageSAS = process.env.AZURE_STORAGE_SAS_TEAMS
           const containerName = team.slug
           let avatar = null
-          if (this.state.avatar === null && team.profile !== null && (team.profile.avatar === undefined || team.profile.avatar === null)) avatar = 'https://aadevelop.blob.core.windows.net/module-teams/module-default/aa-avatar-default.png'
+          if (this.state.avatar === null && team.profile !== null && (team.profile.avatar === undefined || team.profile.avatar === null)) avatar = process.env.STORAGE_URL + '/module-teams/module-default/aa-avatar-default.png'
           if (team.profile !== null && team.profile.avatar !== undefined && team.profile.avatar !== null) avatar = team.profile.avatar
           if (this.state.avatar !== null) avatar = this.state.avatar
 
           let banner = null
-          if (this.state.banner === null && team.profile !== null && (team.profile.banner === undefined || team.profile.banner === null)) banner = 'https://aadevelop.blob.core.windows.net/module-teams/module-default/aa-banner-default.png'
+          if (this.state.banner === null && team.profile !== null && (team.profile.banner === undefined || team.profile.banner === null)) banner = process.env.STORAGE_URL + '/module-teams/module-default/aa-banner-default.png'
           if (team.profile !== null && team.profile.banner !== undefined && team.profile.banner !== null) banner = team.profile.banner
           if (this.state.banner !== null) banner = this.state.banner
           log.debug('team images: ', avatar, banner)
diff --git a/client/src/views/manage-teams/components/ManageTeamProfileEdit.js b/client/src/views/manage-teams/components/ManageTeamProfileEdit.js
index 50aa815a1..027017a76 100644
--- a/client/src/views/manage-teams/components/ManageTeamProfileEdit.js
+++ b/client/src/views/manage-teams/components/ManageTeamProfileEdit.js
@@ -142,12 +142,12 @@ export class ManageTeamProfileEdit extends Component {
           const AzureStorageSAS = process.env.AZURE_STORAGE_SAS_TEAMS
           const containerName = team.slug
           let avatar = null
-          if (this.state.avatar === null && team.profile !== null && (team.profile.avatar === undefined || team.profile.avatar === null)) avatar = 'https://aadevelop.blob.core.windows.net/module-teams/module-default/aa-avatar-default.png'
+          if (this.state.avatar === null && team.profile !== null && (team.profile.avatar === undefined || team.profile.avatar === null)) avatar = process.env.STORAGE_URL + '/module-teams/module-default/aa-avatar-default.png'
           if (team.profile !== null && team.profile.avatar !== undefined && team.profile.avatar !== null) avatar = team.profile.avatar
           if (this.state.avatar !== null) avatar = this.state.avatar
 
           let banner = null
-          if (this.state.banner === null && team.profile !== null && (team.profile.banner === undefined || team.profile.banner === null)) banner = 'https://aadevelop.blob.core.windows.net/module-teams/module-default/aa-banner-default.png'
+          if (this.state.banner === null && team.profile !== null && (team.profile.banner === undefined || team.profile.banner === null)) banner = process.env.STORAGE_URL + '/module-teams/module-default/aa-banner-default.png'
           if (team.profile !== null && team.profile.banner !== undefined && team.profile.banner !== null) banner = team.profile.banner
           if (this.state.banner !== null) banner = this.state.banner
           log.debug('team images: ', avatar, banner)
diff --git a/client/src/views/manage-teams/components/ManageTeamProfileFBEdit.js b/client/src/views/manage-teams/components/ManageTeamProfileFBEdit.js
index 41a266e1d..9362784d2 100644
--- a/client/src/views/manage-teams/components/ManageTeamProfileFBEdit.js
+++ b/client/src/views/manage-teams/components/ManageTeamProfileFBEdit.js
@@ -64,7 +64,7 @@ export class ManageTeamProfileFBEdit extends Component {
           const containerName = slug
 
           let avatar = null
-          if (this.state.avatar === null && fb.avatar === undefined) avatar = 'https://aadevelop.blob.core.windows.net/module-teams/module-default/aa-avatar-default.png'
+          if (this.state.avatar === null && fb.avatar === undefined) avatar = process.env.STORAGE_URL + '/module-teams/module-default/aa-avatar-default.png'
           if (fb.avatar !== undefined && fb.avatar !== null) avatar = fb.avatar
           if (this.state.avatar !== null) avatar = this.state.avatar
 
diff --git a/client/src/views/manage-teams/components/ManageTeamProfileFBView.js b/client/src/views/manage-teams/components/ManageTeamProfileFBView.js
index 0ec02f9f2..31d4b7570 100644
--- a/client/src/views/manage-teams/components/ManageTeamProfileFBView.js
+++ b/client/src/views/manage-teams/components/ManageTeamProfileFBView.js
@@ -40,7 +40,7 @@ const styles = theme => ({
 export const ManageTeamProvileFBView = ({ classes, team }) => {
   log.debug('ManageTeamProvileFBView', team, team.fb[0], team.fb[0].avatar)
 
-  let avatar = (team.fb[0].avatar !== undefined && team.fb[0].avatar !== null) ? team.fb[0].avatar : 'https://aadevelop.blob.core.windows.net/module-teams/module-default/aa-avatar-default.png'
+  let avatar = (team.fb[0].avatar !== undefined && team.fb[0].avatar !== null) ? team.fb[0].avatar : process.env.STORAGE_URL + '/module-teams/module-default/aa-avatar-default.png'
 
   return (
     <Grid item xs={12} className={classes.fbContainer}>
diff --git a/client/src/views/manage-teams/components/ManageTeamProfileView.js b/client/src/views/manage-teams/components/ManageTeamProfileView.js
index 68aa3f189..370c197d5 100644
--- a/client/src/views/manage-teams/components/ManageTeamProfileView.js
+++ b/client/src/views/manage-teams/components/ManageTeamProfileView.js
@@ -88,8 +88,8 @@ const styles = theme => ({
 })
 
 const ManageTeamProfileView = ({ classes, team }) => {
-  let avatar = team.profile.avatar || 'https://aadevelop.blob.core.windows.net/module-teams/module-default/aa-avatar-default.png'
-  let banner = team.profile.banner || 'https://aadevelop.blob.core.windows.net/module-teams/module-default/aa-banner-default.png'
+  let avatar = team.profile.avatar || process.env.STORAGE_URL + '/module-teams/module-default/aa-avatar-default.png'
+  let banner = team.profile.banner || process.env.STORAGE_URL + '/module-teams/module-default/aa-banner-default.png'
 
   const created = new Date(team.createdAt)
 
diff --git a/client/src/views/manage-teams/components/ManageTeamsItem.js b/client/src/views/manage-teams/components/ManageTeamsItem.js
index 7ec8dc9f7..db7c75648 100644
--- a/client/src/views/manage-teams/components/ManageTeamsItem.js
+++ b/client/src/views/manage-teams/components/ManageTeamsItem.js
@@ -22,7 +22,7 @@ export const ManageTeamsItem = ({ classes, team, match, ...props }) => {
   if (team.profile.avatar !== undefined && team.profile.avatar !== 'a') {
     avatar = team.profile.avatar
   } else {
-    avatar = 'https://aadevelop.blob.core.windows.net/module-teams/module-default/aa-avatar-default.png'
+    avatar = process.env.STORAGE_URL + '/module-teams/module-default/aa-avatar-default.png'
   }
   return (
     <Grid item xs={12}>
diff --git a/client/src/views/team-members/components/ManageMembersTeamItem.js b/client/src/views/team-members/components/ManageMembersTeamItem.js
index e2b439727..a7a88c384 100644
--- a/client/src/views/team-members/components/ManageMembersTeamItem.js
+++ b/client/src/views/team-members/components/ManageMembersTeamItem.js
@@ -63,7 +63,7 @@ export const ManageMembersTeamItem = ({ classes, team, authId }) => {
   if (team.profile.avatar !== undefined && team.profile.avatar !== 'a') {
     avatar = team.profile.avatar
   } else {
-    avatar = 'https://aadevelop.blob.core.windows.net/module-teams/module-default/aa-avatar-default.png'
+    avatar = process.env.STORAGE_URL + '/module-teams/module-default/aa-avatar-default.png'
   }
   if (team.members.length > 0) {
     return (
diff --git a/client/src/views/teams/components/TeamsDetails.js b/client/src/views/teams/components/TeamsDetails.js
index b1b1dc6cf..4d3e84705 100644
--- a/client/src/views/teams/components/TeamsDetails.js
+++ b/client/src/views/teams/components/TeamsDetails.js
@@ -95,13 +95,13 @@ const TeamsDetails = ({ classes, team }) => {
   if (team.profile.avatar !== undefined && team.profile.avatar !== null) {
     avatar = team.profile.avatar
   } else {
-    avatar = 'https://aadevelop.blob.core.windows.net/module-teams/module-default/aa-avatar-default.png'
+    avatar = process.env.STORAGE_URL + '/module-teams/module-default/aa-avatar-default.png'
   }
   let banner
   if (team.profile.banner !== undefined && team.profile.banner !== null) {
     banner = team.profile.banner
   } else {
-    banner = 'https://aadevelop.blob.core.windows.net/module-teams/module-default/aa-banner-default.png'
+    banner = process.env.STORAGE_URL + '/module-teams/module-default/aa-banner-default.png'
   }
 
   const created = new Date(team.createdAt)
diff --git a/client/src/views/teams/components/TeamsFBView.js b/client/src/views/teams/components/TeamsFBView.js
index 504d55aa4..326db6105 100644
--- a/client/src/views/teams/components/TeamsFBView.js
+++ b/client/src/views/teams/components/TeamsFBView.js
@@ -36,7 +36,7 @@ const styles = theme => ({
 
 export const TeamsFBView = ({ classes, team }) => {
   log.debug('ManageTeamProvileFBView', team, team.fb[0])
-  let avatar = 'https://aadevelop.blob.core.windows.net/module-teams/module-default/aa-avatar-default.png'
+  let avatar = process.env.STORAGE_URL + '/module-teams/module-default/aa-avatar-default.png'
   if (team.fb.length > 0) {
     avatar = team.fb[0].avatar
 
diff --git a/client/src/views/teams/components/TeamsItem.js b/client/src/views/teams/components/TeamsItem.js
index c0460e29a..666a4fcf7 100644
--- a/client/src/views/teams/components/TeamsItem.js
+++ b/client/src/views/teams/components/TeamsItem.js
@@ -43,13 +43,13 @@ export const TeamsItem = ({ classes, team }) => {
   if (team.profile.avatar !== undefined && team.profile.avatar !== 'a') {
     avatar = team.profile.avatar
   } else {
-    avatar = 'https://aadevelop.blob.core.windows.net/module-teams/module-default/aa-avatar-default.png'
+    avatar = process.env.STORAGE_URL + '/module-teams/module-default/aa-avatar-default.png'
   }
   let banner
   if (team.profile.banner !== undefined && team.profile.banner !== null) {
     banner = team.profile.banner
   } else {
-    banner = 'https://aadevelop.blob.core.windows.net/module-teams/module-default/aa-banner-default.png'
+    banner = process.env.STORAGE_URL + '/module-teams/module-default/aa-banner-default.png'
   }
   return (
     <Grid item xs={12} sm={6} md={4}>