diff --git a/src/auth-service/bin/index.js b/src/auth-service/bin/index.js
index ca532eff3c..685a60b114 100644
--- a/src/auth-service/bin/index.js
+++ b/src/auth-service/bin/index.js
@@ -2,7 +2,7 @@ require("module-alias/register");
 const dotenv = require("dotenv");
 dotenv.config();
 require("app-module-path").addPath(__dirname);
-const kafkaConsumer = require("./kafka-consumer");
+const kafkaConsumer = require("@bin/jobs/kafka-consumer");
 const createServer = require("./server");
 const log4js = require("log4js");
 const constants = require("@config/constants");
diff --git a/src/auth-service/bin/active-status-job.js b/src/auth-service/bin/jobs/active-status-job.js
similarity index 95%
rename from src/auth-service/bin/active-status-job.js
rename to src/auth-service/bin/jobs/active-status-job.js
index 050638cc83..f024cbf7d7 100644
--- a/src/auth-service/bin/active-status-job.js
+++ b/src/auth-service/bin/jobs/active-status-job.js
@@ -4,7 +4,7 @@ const constants = require("@config/constants");
 const inactiveThreshold = constants.INACTIVE_THRESHOLD || 2592000000; // 30 days
 const log4js = require("log4js");
 const logger = log4js.getLogger(
-  `${constants.ENVIRONMENT} -- bin/active-status-job script`
+  `${constants.ENVIRONMENT} -- bin/jobs/active-status-job script`
 );
 const stringify = require("@utils/stringify");
 
diff --git a/src/auth-service/bin/incomplete-profile-job.js b/src/auth-service/bin/jobs/incomplete-profile-job.js
similarity index 95%
rename from src/auth-service/bin/incomplete-profile-job.js
rename to src/auth-service/bin/jobs/incomplete-profile-job.js
index fafbb9a97e..623d3b98c4 100644
--- a/src/auth-service/bin/incomplete-profile-job.js
+++ b/src/auth-service/bin/jobs/incomplete-profile-job.js
@@ -3,7 +3,7 @@ const UserModel = require("@models/User");
 const constants = require("@config/constants");
 const log4js = require("log4js");
 const logger = log4js.getLogger(
-  `${constants.ENVIRONMENT} -- bin/incomplete-profile-job`
+  `${constants.ENVIRONMENT} -- bin/jobs/incomplete-profile-job`
 );
 const stringify = require("@utils/stringify");
 const mailer = require("@utils/mailer");
diff --git a/src/auth-service/bin/kafka-consumer.js b/src/auth-service/bin/jobs/kafka-consumer.js
similarity index 99%
rename from src/auth-service/bin/kafka-consumer.js
rename to src/auth-service/bin/jobs/kafka-consumer.js
index f9dc0dd4d7..8a8ed661c3 100644
--- a/src/auth-service/bin/kafka-consumer.js
+++ b/src/auth-service/bin/jobs/kafka-consumer.js
@@ -2,7 +2,7 @@ const { Kafka } = require("kafkajs");
 const constants = require("@config/constants");
 const log4js = require("log4js");
 const logger = log4js.getLogger(
-  `${constants.ENVIRONMENT} -- bin/kafka-consumer script`
+  `${constants.ENVIRONMENT} -- bin/jobs/kafka-consumer script`
 );
 const { logObject } = require("@utils/log");
 const mailer = require("@utils/mailer");
diff --git a/src/auth-service/bin/test/ut_kafka-consumer.js b/src/auth-service/bin/jobs/test/ut_kafka-consumer.js
similarity index 99%
rename from src/auth-service/bin/test/ut_kafka-consumer.js
rename to src/auth-service/bin/jobs/test/ut_kafka-consumer.js
index 3a500339a2..0bdc9c424b 100644
--- a/src/auth-service/bin/test/ut_kafka-consumer.js
+++ b/src/auth-service/bin/jobs/test/ut_kafka-consumer.js
@@ -1,7 +1,7 @@
 require("module-alias/register");
 const { expect } = require("chai");
 const sinon = require("sinon");
-const kafkaConsumer = require("@bin/kafka-consumer");
+const kafkaConsumer = require("@bin/jobs/kafka-consumer");
 
 // Mock the required modules/functions
 const constants = require("@config/constants");
diff --git a/src/auth-service/bin/token-expiration-job.js b/src/auth-service/bin/jobs/token-expiration-job.js
similarity index 96%
rename from src/auth-service/bin/token-expiration-job.js
rename to src/auth-service/bin/jobs/token-expiration-job.js
index c6d6d6bae4..a691837f11 100644
--- a/src/auth-service/bin/token-expiration-job.js
+++ b/src/auth-service/bin/jobs/token-expiration-job.js
@@ -5,7 +5,7 @@ const mailer = require("@utils/mailer");
 const stringify = require("@utils/stringify");
 const log4js = require("log4js");
 const logger = log4js.getLogger(
-  `${constants.ENVIRONMENT} -- bin/token-expiration-job`
+  `${constants.ENVIRONMENT} -- bin/jobs/token-expiration-job`
 );
 const moment = require("moment-timezone");
 
diff --git a/src/auth-service/bin/server.js b/src/auth-service/bin/server.js
index 11f7e06eb0..9dad2ae778 100644
--- a/src/auth-service/bin/server.js
+++ b/src/auth-service/bin/server.js
@@ -19,9 +19,9 @@ const { HttpError } = require("@utils/errors");
 const isDev = process.env.NODE_ENV === "development";
 const isProd = process.env.NODE_ENV === "production";
 const options = { mongooseConnection: mongoose.connection };
-require("@bin/active-status-job");
-require("@bin/token-expiration-job");
-require("@bin/incomplete-profile-job");
+require("@bin/jobs/active-status-job");
+require("@bin/jobs/token-expiration-job");
+require("@bin/jobs/incomplete-profile-job");
 const log4js = require("log4js");
 const debug = require("debug")("auth-service:server");
 const isEmpty = require("is-empty");
diff --git a/src/auth-service/middleware/passport.js b/src/auth-service/middleware/passport.js
index 49742136f5..02c332ee29 100644
--- a/src/auth-service/middleware/passport.js
+++ b/src/auth-service/middleware/passport.js
@@ -374,7 +374,8 @@ const useJWTStrategy = (tenant, req, res, next) =>
       const endpoint = req.headers["x-original-uri"];
       const clientOriginalIp = req.headers["x-client-original-ip"];
       const requestBody = req.body;
-      logObject("Request Body:", requestBody);
+      logObject("Request Body", requestBody);
+      logObject("logging the entire req", req);
 
       let service = req.headers["service"] || "unknown";
       let userAction = "unknown";