diff --git a/cli/packages/cmd/login.go b/cli/packages/cmd/login.go
index 66d251dc9..5cff7770f 100644
--- a/cli/packages/cmd/login.go
+++ b/cli/packages/cmd/login.go
@@ -518,7 +518,7 @@ func browserCliLogin() (models.UserCredentials, error) {
 	SERVER_TIMEOUT := 60 * 10
 
 	//create listener
-	listener, err := net.Listen("tcp", "localhost:0")
+	listener, err := net.Listen("tcp", "127.0.0.1:0")
 	if err != nil {
 		return models.UserCredentials{}, err
 	}
diff --git a/frontend/next.config.js b/frontend/next.config.js
index 3e9336f15..51cf8f308 100644
--- a/frontend/next.config.js
+++ b/frontend/next.config.js
@@ -11,7 +11,7 @@ const ContentSecurityPolicy = `
 	style-src 'self' https://rsms.me 'unsafe-inline';
 	child-src https://api.stripe.com;
 	frame-src https://js.stripe.com/ https://api.stripe.com https://www.youtube.com/;
-	connect-src 'self' wss://nexus-websocket-a.intercom.io https://api-iam.intercom.io https://api.heroku.com/ https://id.heroku.com/oauth/authorize https://id.heroku.com/oauth/token https://checkout.stripe.com https://app.posthog.com https://api.stripe.com https://api.pwnedpasswords.com http://localhost:*;
+	connect-src 'self' wss://nexus-websocket-a.intercom.io https://api-iam.intercom.io https://api.heroku.com/ https://id.heroku.com/oauth/authorize https://id.heroku.com/oauth/token https://checkout.stripe.com https://app.posthog.com https://api.stripe.com https://api.pwnedpasswords.com http://127.0.0.1:*;
 	img-src 'self' https://static.intercomassets.com https://js.intercomcdn.com https://downloads.intercomcdn.com https://*.stripe.com https://i.ytimg.com/ data:;
 	media-src https://js.intercomcdn.com;
 	font-src 'self' https://fonts.intercomcdn.com/ https://maxcdn.bootstrapcdn.com https://rsms.me https://fonts.gstatic.com;  
diff --git a/frontend/src/views/Login/Login.tsx b/frontend/src/views/Login/Login.tsx
index fb10c7844..2d8b12b28 100644
--- a/frontend/src/views/Login/Login.tsx
+++ b/frontend/src/views/Login/Login.tsx
@@ -36,7 +36,7 @@ export const Login = () => {
           const callbackPort = queryParams.get("callback_port")
 
           // send post request to cli with details
-          const cliUrl = `http://localhost:${callbackPort}`
+          const cliUrl = `http://127.0.0.1:${callbackPort}`
           const instance = axios.create()
           await instance.post(cliUrl, { email: userDetails.email, privateKey: localStorage.getItem("PRIVATE_KEY"), JTWToken: getAuthToken() })
         }
diff --git a/frontend/src/views/Login/components/InitialStep/InitialStep.tsx b/frontend/src/views/Login/components/InitialStep/InitialStep.tsx
index 50eaf5cb7..d82efb1e4 100644
--- a/frontend/src/views/Login/components/InitialStep/InitialStep.tsx
+++ b/frontend/src/views/Login/components/InitialStep/InitialStep.tsx
@@ -57,7 +57,7 @@ export const InitialStep = ({ setStep, email, setEmail, password, setPassword }:
             return;
           }
           // case: login was successful
-          const cliUrl = `http://localhost:${callbackPort}`;
+          const cliUrl = `http://127.0.0.1:${callbackPort}`;
 
           // send request to server endpoint
           const instance = axios.create();
diff --git a/frontend/src/views/Login/components/MFAStep/MFAStep.tsx b/frontend/src/views/Login/components/MFAStep/MFAStep.tsx
index 571d7ee56..ebcbf135f 100644
--- a/frontend/src/views/Login/components/MFAStep/MFAStep.tsx
+++ b/frontend/src/views/Login/components/MFAStep/MFAStep.tsx
@@ -108,7 +108,7 @@ export const MFAStep = ({
 
         if (isCliLoginSuccessful && isCliLoginSuccessful.success){
           // case: login was successful
-          const cliUrl = `http://localhost:${callbackPort}`
+          const cliUrl = `http://127.0.0.1:${callbackPort}`
 
           // send request to server endpoint 
           const instance = axios.create()
diff --git a/frontend/src/views/Login/components/PasswordStep/PasswordStep.tsx b/frontend/src/views/Login/components/PasswordStep/PasswordStep.tsx
index f07e2b89e..2caeab5a2 100644
--- a/frontend/src/views/Login/components/PasswordStep/PasswordStep.tsx
+++ b/frontend/src/views/Login/components/PasswordStep/PasswordStep.tsx
@@ -62,7 +62,7 @@ export const PasswordStep = ({
                         return;
                     }
                     // case: login was successful
-                    const cliUrl = `http://localhost:${callbackPort}`
+                    const cliUrl = `http://127.0.0.1:${callbackPort}`
 
                     // send request to server endpoint
                     const instance = axios.create()