diff --git a/BMA.EHR.Leave/Controllers/LeaveController.cs b/BMA.EHR.Leave/Controllers/LeaveController.cs
index 08091074..a4154325 100644
--- a/BMA.EHR.Leave/Controllers/LeaveController.cs
+++ b/BMA.EHR.Leave/Controllers/LeaveController.cs
@@ -507,12 +507,13 @@ namespace BMA.EHR.Leave.Service.Controllers
             var channel = _objectPool.Get();
             try
             {
-                channel.QueueDeclare(queue: _realCheckInQueue, durable: true, exclusive: false, autoDelete: false, arguments: null);
+                var queue = _configuration["Rabbit:Queue"] ?? "basic-queue";
+                channel.QueueDeclare(queue: queue, durable: true, exclusive: false, autoDelete: false, arguments: null);
                 var serializedObject = JsonConvert.SerializeObject(checkData);
                 var body = Encoding.UTF8.GetBytes(serializedObject);
 
                 channel.BasicPublish(exchange: "",
-                                     routingKey: _realCheckInQueue,
+                                     routingKey: queue,
                                      basicProperties: null,
                                      body: body);
 
diff --git a/BMA.EHR.Leave/appsettings.json b/BMA.EHR.Leave/appsettings.json
index 1a91c0ed..7d2c53d1 100644
--- a/BMA.EHR.Leave/appsettings.json
+++ b/BMA.EHR.Leave/appsettings.json
@@ -44,7 +44,8 @@
     "Rabbit": {
         "Host": "192.168.1.40",
         "User": "admin",
-        "Password": "Test123456"
+        "Password": "Test123456",
+        "Queue": "bma-checkin-queue"
     },
     "Mail": {
         "Server": "mail.bangkok.go.th",