diff --git a/xCAT-server/lib/xcat/plugins/AAsn.pm b/xCAT-server/lib/xcat/plugins/AAsn.pm
index b08ff60e4..1780f8e2f 100644
--- a/xCAT-server/lib/xcat/plugins/AAsn.pm
+++ b/xCAT-server/lib/xcat/plugins/AAsn.pm
@@ -115,17 +115,6 @@ sub handled_commands
 
                 }
 
-                $service = "dhcpserver";
-                if (grep(/$service/, @servicelist))
-                {
-
-                    $rc = &setup_DHCP($nodename);    # setup DHCP
-                    if ($rc == 0)
-                    {
-                        xCAT::Utils->update_xCATSN($service);
-                    }
-
-                }
 
                 $service = "ftpserver";
                 if (grep(/$service/, @servicelist))
@@ -174,6 +163,8 @@ sub handled_commands
                     }
 
                 }
+
+
             }    # end Linux only
 
             #
@@ -201,6 +192,23 @@ sub handled_commands
                 }
 
             }
+            #
+            # setup dhcp only on Linux and last 
+            #
+            if (xCAT::Utils->isLinux())  {
+                my $service = "dhcpserver";
+                if (grep(/$service/, @servicelist))
+                {
+
+                    $rc = &setup_DHCP($nodename);    # setup DHCP
+                    if ($rc == 0)
+                    {
+                        xCAT::Utils->update_xCATSN($service);
+                    }
+
+                }
+            }
+
 
             # done now in setupntp postinstall script, but may change
             #$service = "ntpserver";