diff --git a/packages/federated-identity-service/server.mjs b/packages/federated-identity-service/server.mjs
index 170be0a7..8895e0d9 100644
--- a/packages/federated-identity-service/server.mjs
+++ b/packages/federated-identity-service/server.mjs
@@ -88,7 +88,7 @@ Promise.all(promises)
     app.use(federatedIdentityService.routes)
     const port = process.argv[2] != null ? parseInt(process.argv[2]) : 3000
     console.log(`Listening on port ${port}`)
-    app.listen(port)
+    app.listen(port, '0.0.0.0')
   })
   .catch((e) => {
     console.error(e)
diff --git a/packages/federated-identity-service/src/middlewares/auth.ts b/packages/federated-identity-service/src/middlewares/auth.ts
index a957dfcd..b9fa5820 100644
--- a/packages/federated-identity-service/src/middlewares/auth.ts
+++ b/packages/federated-identity-service/src/middlewares/auth.ts
@@ -19,11 +19,16 @@ export const Authenticate = (
   const tokenRe = /^Bearer (\S+)$/
   return (req, res, callbackMethod) => {
     const request = req as AuthRequest
-    const originalRequesterIPAddress = trustXForwardedForHeader
+    const remoteAddress = trustXForwardedForHeader
       ? // eslint-disable-next-line @typescript-eslint/strict-boolean-expressions
         (request.headers['x-forwarded-for'] as string) ||
         (request.socket.remoteAddress as string)
       : (request.socket.remoteAddress as string)
+
+    const parsedAdressArray = remoteAddress.split(':')
+    const originalRequesterIPAddress =
+      parsedAdressArray[parsedAdressArray.length - 1]
+
     logger.info('', {
       ip: originalRequesterIPAddress,
       httpMethod: request.method,
diff --git a/server.mjs b/server.mjs
index ab019c2c..82a9149e 100644
--- a/server.mjs
+++ b/server.mjs
@@ -159,7 +159,7 @@ if (process.argv[2] === 'generate') {
 
       const port = process.argv[2] != null ? parseInt(process.argv[2]) : 3000
       console.log(`Listening on port ${port}`)
-      app.listen(port)
+      app.listen(port, '0.0.0.0')
     })
     .catch((e) => {
       console.error(e)