diff --git a/front/src/config/index.ts b/front/src/config/index.ts
index 48d0908f2..3e86884ac 100644
--- a/front/src/config/index.ts
+++ b/front/src/config/index.ts
@@ -8,3 +8,13 @@ export const REACT_APP_SERVER_BASE_URL =
   window._env_?.REACT_APP_SERVER_BASE_URL ||
   process.env.REACT_APP_SERVER_BASE_URL ||
   'http://localhost:3000';
+
+export const REACT_APP_SERVER_AUTH_URL =
+  window._env_?.REACT_APP_SERVER_AUTH_URL ||
+  process.env.REACT_APP_SERVER_AUTH_URL ||
+  REACT_APP_SERVER_BASE_URL + '/auth';
+
+export const REACT_APP_SERVER_FILES_URL =
+  window._env_?.REACT_APP_SERVER_FILES_URL ||
+  process.env.REACT_APP_SERVER_FILES_URL ||
+  REACT_APP_SERVER_BASE_URL + '/files';
diff --git a/front/src/modules/auth/hooks/useAuth.ts b/front/src/modules/auth/hooks/useAuth.ts
index 071bdd0c2..1912dc9a9 100644
--- a/front/src/modules/auth/hooks/useAuth.ts
+++ b/front/src/modules/auth/hooks/useAuth.ts
@@ -6,7 +6,7 @@ import {
   useRecoilState,
 } from 'recoil';
 
-import { REACT_APP_SERVER_BASE_URL } from '~/config';
+import { REACT_APP_SERVER_AUTH_URL } from '~/config';
 import {
   useChallengeMutation,
   useCheckUserExistsLazyQuery,
@@ -136,8 +136,7 @@ export const useAuth = () => {
   );
 
   const handleGoogleLogin = useCallback((workspaceInviteHash?: string) => {
-    const authServerUrl =
-      REACT_APP_SERVER_BASE_URL ?? REACT_APP_SERVER_BASE_URL + '/auth';
+    const authServerUrl = REACT_APP_SERVER_AUTH_URL;
     window.location.href =
       `${authServerUrl}/google/${
         workspaceInviteHash ? '?inviteHash=' + workspaceInviteHash : ''
diff --git a/front/src/modules/users/utils/getProfilePictureAbsoluteURI.ts b/front/src/modules/users/utils/getProfilePictureAbsoluteURI.ts
index ccd502d18..86f97c1df 100644
--- a/front/src/modules/users/utils/getProfilePictureAbsoluteURI.ts
+++ b/front/src/modules/users/utils/getProfilePictureAbsoluteURI.ts
@@ -1,4 +1,4 @@
-import { REACT_APP_SERVER_BASE_URL } from '~/config';
+import { REACT_APP_SERVER_FILES_URL } from '~/config';
 
 export const getImageAbsoluteURIOrBase64 = (imageUrl?: string | null) => {
   if (!imageUrl) {
@@ -13,8 +13,7 @@ export const getImageAbsoluteURIOrBase64 = (imageUrl?: string | null) => {
     return imageUrl;
   }
 
-  const serverFilesUrl =
-    REACT_APP_SERVER_BASE_URL ?? REACT_APP_SERVER_BASE_URL + '/files';
+  const serverFilesUrl = REACT_APP_SERVER_FILES_URL;
 
   return `${serverFilesUrl}/${imageUrl}`;
 };