diff --git a/internal/db/models/server_dao.go b/internal/db/models/server_dao.go
index ac040d3c..fa03b9d1 100644
--- a/internal/db/models/server_dao.go
+++ b/internal/db/models/server_dao.go
@@ -1086,13 +1086,16 @@ func (this *ServerDAO) ComposeServerConfig(tx *dbs.Tx, server *Server, cacheMap
 			if err != nil {
 				return nil, err
 			}
-			if clusterDNSConfig.CNameAsDomain {
-				domain, err := dns.SharedDNSDomainDAO.FindEnabledDNSDomain(tx, int64(clusterDNS.DnsDomainId), cacheMap)
-				if err != nil {
-					return nil, err
-				}
-				if domain != nil {
-					var cname = server.DnsName + "." + domain.Name
+
+			domain, err := dns.SharedDNSDomainDAO.FindEnabledDNSDomain(tx, int64(clusterDNS.DnsDomainId), cacheMap)
+			if err != nil {
+				return nil, err
+			}
+			if domain != nil {
+				var cname = server.DnsName + "." + domain.Name
+				config.CNameDomain = cname
+				if clusterDNSConfig.CNameAsDomain {
+					config.CNameAsDomain = true
 					config.AliasServerNames = append(config.AliasServerNames, cname)
 				}
 			}
diff --git a/internal/rpc/services/service_node_task.go b/internal/rpc/services/service_node_task.go
index e4a49102..078990dd 100644
--- a/internal/rpc/services/service_node_task.go
+++ b/internal/rpc/services/service_node_task.go
@@ -50,7 +50,7 @@ func (this *NodeTaskService) FindNodeTasks(ctx context.Context, req *pb.FindNode
 			return nil, err
 		}
 		if status != nil && len(status.OS) > 0 && len(status.Arch) > 0 && len(status.BuildVersion) > 0 {
-			deployFile := installers.SharedDeployManager.FindNodeFile(status.OS, status.Arch)
+			var deployFile = installers.SharedDeployManager.FindNodeFile(status.OS, status.Arch)
 			if deployFile != nil {
 				if stringutil.VersionCompare(deployFile.Version, status.BuildVersion) > 0 {
 					pbTasks = append(pbTasks, &pb.NodeTask{