diff --git a/.circleci/config.yml b/.circleci/config.yml
index c244259b8..f9c409c60 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -89,6 +89,12 @@ workflows:
           region: $AWS_REGION
           repo: $AWS_ECR_REPO
           tag: latest
+          extra-build-args: >
+            --build-arg REACT_APP_AUTH0_DOMAIN=$REACT_APP_AUTH0_DOMAIN
+            --build-arg REACT_APP_AUTH0_CLIENT_ID=$REACT_APP_AUTH0_CLIENT_ID
+            --build-arg REACT_APP_AUTH0_CALLBACK_URL=$REACT_APP_AUTH0_CALLBACK_URL
+            --build-arg REACT_APP_AUTH0_AUDIENCE=$REACT_APP_AUTH0_AUDIENCE
+            --build-arg REACT_APP_API_URL=$REACT_APP_API_URL
 
   build-and-deploy-api:
     when: << pipeline.parameters.build-api >>
@@ -133,3 +139,5 @@ workflows:
           region: $AWS_REGION
           repo: $AWS_ECR_REPO_API
           tag: latest
+          extra-build-args: >
+            --build-arg HASURA_GRAPHQL_JWT_SECRET=$HASURA_GRAPHQL_JWT_SECRET
diff --git a/front/src/index.tsx b/front/src/index.tsx
index 7727b1c5b..070a78d40 100644
--- a/front/src/index.tsx
+++ b/front/src/index.tsx
@@ -37,7 +37,11 @@ root.render(
     domain={process.env.REACT_APP_AUTH0_DOMAIN || ''}
     clientId={process.env.REACT_APP_AUTH0_CLIENT_ID || ''}
     authorizationParams={{
-      redirect_uri: process.env.REACT_APP_AUTH0_CALLBACK_URL || '',
+      redirect_uri:
+        window.location.protocol +
+          '//' +
+          window.location.host +
+          process.env.REACT_APP_AUTH0_CALLBACK_URL || '',
       audience: process.env.REACT_APP_AUTH0_AUDIENCE || '',
     }}
   >
diff --git a/infra/dev/.env.example b/infra/dev/.env.example
index 62151ad1c..954477e88 100644
--- a/infra/dev/.env.example
+++ b/infra/dev/.env.example
@@ -3,6 +3,6 @@ HASURA_GRAPHQL_ADMIN_SECRET=hasura_secret
 
 REACT_APP_AUTH0_DOMAIN=twenty-dev.eu.auth0.com
 REACT_APP_AUTH0_CLIENT_ID=REPLACE_ME
-REACT_APP_AUTH0_CALLBACK_URL=http://localhost:3001/auth/callback
+REACT_APP_AUTH0_CALLBACK_URL=/auth/callback
 REACT_APP_AUTH0_AUDIENCE=hasura-dev
 REACT_APP_API_URL=http://localhost:8080/v1/graphql
\ No newline at end of file