diff --git a/BMA.EHR.Discipline.Service/Controllers/DisciplineInvestigateController.cs b/BMA.EHR.Discipline.Service/Controllers/DisciplineInvestigateController.cs
index 2bdbc8ea..21be29f0 100644
--- a/BMA.EHR.Discipline.Service/Controllers/DisciplineInvestigateController.cs
+++ b/BMA.EHR.Discipline.Service/Controllers/DisciplineInvestigateController.cs
@@ -889,10 +889,6 @@ namespace BMA.EHR.DisciplineInvestigate.Service.Controllers
                 RespondentType = data.RespondentType.Trim().ToUpper(),
                 Organization = data.Organization,
                 RootDnaId = data.RootDnaId,
-                Child1DnaId = data.Child1DnaId,
-                Child2DnaId = data.Child2DnaId,
-                Child3DnaId = data.Child3DnaId,
-                Child4DnaId = data.Child4DnaId,
                 ConsideredAgency = data.ConsideredAgency,
                 OrganizationId = data.OrganizationId,
                 ConsideredAgencyId = data.ConsideredAgencyId,
diff --git a/BMA.EHR.Discipline.Service/Program.cs b/BMA.EHR.Discipline.Service/Program.cs
index b1f821ed..5a1f99c4 100644
--- a/BMA.EHR.Discipline.Service/Program.cs
+++ b/BMA.EHR.Discipline.Service/Program.cs
@@ -121,7 +121,7 @@ var builder = WebApplication.CreateBuilder(args);
                     DashboardJobListLimit = 50000,
                     TransactionTimeout = TimeSpan.FromMinutes(1),
                     InvisibilityTimeout = TimeSpan.FromHours(3),
-                    TablesPrefix = "Hangfire_Discipline"
+                    TablesPrefix = "Hangfire"
                 })));
     builder.Services.AddHangfireServer();
 }
diff --git a/BMA.EHR.Leave/Services/NotificationService.cs b/BMA.EHR.Leave/Services/NotificationService.cs
index 7ea4837c..3ada008e 100644
--- a/BMA.EHR.Leave/Services/NotificationService.cs
+++ b/BMA.EHR.Leave/Services/NotificationService.cs
@@ -11,22 +11,15 @@ public class NotificationService
     private readonly ILogger<NotificationService> _logger;
     private readonly IConfiguration _configuration;
 
-    private string _notifyEndpoint;
+    private const string NotifyEndpoint = "https://hrmsbkk.case-collection.com/api/v1/org/through-socket/notify-from-token";
 
     public NotificationService(IHttpClientFactory httpClientFactory, ILogger<NotificationService> logger, IConfiguration configuration)
     {
         _httpClientFactory = httpClientFactory;
         _logger = logger;
         _configuration = configuration;
-        _notifyEndpoint = $"{_configuration["API"]}/org/through-socket/notify-from-token";
     }
 
-    /// <summary>
-    /// SendNotificationAsync
-    /// </summary>
-    /// <param name="token"></param>
-    /// <param name="error"></param>
-    /// <param name="message"></param>
     public async Task SendNotificationAsync(string? token, bool error, string message)
     {
         if (string.IsNullOrEmpty(token))
@@ -49,7 +42,7 @@ public class NotificationService
             var json = JsonConvert.SerializeObject(payload);
             var content = new StringContent(json, Encoding.UTF8, "application/json");
 
-            var response = await client.PostAsync(_notifyEndpoint, content);
+            var response = await client.PostAsync(NotifyEndpoint, content);
 
             if (!response.IsSuccessStatusCode)
             {
diff --git a/BMA.EHR.Placement.Service/Program.cs b/BMA.EHR.Placement.Service/Program.cs
index 5db2aa84..897d16ca 100644
--- a/BMA.EHR.Placement.Service/Program.cs
+++ b/BMA.EHR.Placement.Service/Program.cs
@@ -121,7 +121,7 @@ var builder = WebApplication.CreateBuilder(args);
                     PrepareSchemaIfNecessary = true,
                     DashboardJobListLimit = 50000,
                     TransactionTimeout = TimeSpan.FromMinutes(1),
-                    TablesPrefix = "Hangfire_Placement"
+                    TablesPrefix = "Hangfire"
                 })));
     builder.Services.AddHangfireServer();
 }
diff --git a/BMA.EHR.Retirement.Service/Program.cs b/BMA.EHR.Retirement.Service/Program.cs
index 6f7a6352..a55f9674 100644
--- a/BMA.EHR.Retirement.Service/Program.cs
+++ b/BMA.EHR.Retirement.Service/Program.cs
@@ -130,7 +130,7 @@ var builder = WebApplication.CreateBuilder(args);
                     DashboardJobListLimit = 50000,
                     TransactionTimeout = TimeSpan.FromMinutes(1),
                     InvisibilityTimeout = TimeSpan.FromHours(3),
-                    TablesPrefix = "Hangfire_Retirement"
+                    TablesPrefix = "Hangfire"
                 })));
     builder.Services.AddHealthChecks();
 }