diff --git a/xCAT-server/lib/perl/xCAT/OPENBMC.pm b/xCAT-server/lib/perl/xCAT/OPENBMC.pm
index 832618247..2061a191a 100644
--- a/xCAT-server/lib/perl/xCAT/OPENBMC.pm
+++ b/xCAT-server/lib/perl/xCAT/OPENBMC.pm
@@ -25,8 +25,8 @@ use xCAT_monitoring::monitorctrl;
 use xCAT::TableUtils;
 
 my $LOCK_DIR = "/var/lock/xcat/";
-my $LOCK_PATH = "/var/lock/xcat/agent-$$.lock";
-my $AGENT_SOCK_PATH = "/var/run/xcat/agent-$$.sock";
+my $LOCK_PATH = "/var/lock/xcat/agent.lock";
+my $AGENT_SOCK_PATH = "/var/run/xcat/agent.sock";
 my $PYTHON_LOG_PATH = "/var/log/xcat/agent.log";
 my $PYTHON_AGENT_FILE = "/opt/xcat/lib/python/agent/agent.py";
 my $MSG_TYPE = "message";
@@ -62,8 +62,15 @@ sub send_request {
 # if lock is released unexpectedly, python side would aware of the error after
 # getting this lock
 sub acquire_lock {
+    my $ppid = shift;
+    $ppid = shift if (($ppid) && ($ppid =~ /OPENBMC/));
+
     mkpath($LOCK_DIR);
     # always create a new lock file
+    if ($ppid) {
+        $LOCK_PATH = "$LOCK_PATH.$ppid";
+        $AGENT_SOCK_PATH = "$AGENT_SOCK_PATH.$ppid";
+    }
     unlink($LOCK_PATH);
     open($lock_fd, ">>", $LOCK_PATH) or return undef;
     flock($lock_fd, LOCK_EX) or return undef;
@@ -82,7 +89,10 @@ sub python_agent_reaper {
 }
 sub start_python_agent {
 
-    if (!defined(acquire_lock())) {
+    my $ppid = shift;
+    $ppid = shift if (($ppid) && ($ppid =~ /OPENBMC/));
+
+    if (!defined(acquire_lock($ppid))) {
         xCAT::MsgUtils->message("S", "start_python_agent() Error: Failed to acquire lock");
         return undef;
     }
diff --git a/xCAT-server/lib/xcat/plugins/openbmc2.pm b/xCAT-server/lib/xcat/plugins/openbmc2.pm
index 524c0b634..3f1e22886 100644
--- a/xCAT-server/lib/xcat/plugins/openbmc2.pm
+++ b/xCAT-server/lib/xcat/plugins/openbmc2.pm
@@ -149,7 +149,7 @@ sub process_request {
     return unless(%node_info);
 
     # If we can't start the python agent, exit immediately
-    my $pid = xCAT::OPENBMC::start_python_agent();
+    my $pid = xCAT::OPENBMC::start_python_agent($$);
     if (!defined($pid)) {
         xCAT::MsgUtils->message("E", { data => ["Failed to start the xCAT Python agent. Check /var/log/xcat/cluster.log for more information."] }, $callback);
         return;