diff --git a/managed/node-agent/app/task/shell_task.go b/managed/node-agent/app/task/shell_task.go
index 3e1a25b48734..d8ba597e8081 100644
--- a/managed/node-agent/app/task/shell_task.go
+++ b/managed/node-agent/app/task/shell_task.go
@@ -264,6 +264,10 @@ func (s *ShellTask) Process(ctx context.Context) (*TaskStatus, error) {
 		if exitErr, ok := err.(*exec.ExitError); ok {
 			taskStatus.ExitStatus.Code = exitErr.ExitCode()
 		}
+		if util.FileLogger().IsDebugEnabled() && s.stdout.Len() > 0 {
+			util.FileLogger().
+				Debugf(ctx, "Output for failed command %s - %s", s.name, s.stdout.String())
+		}
 		errMsg := fmt.Sprintf("%s: %s", err.Error(), s.stderr.String())
 		util.FileLogger().Errorf(ctx, "Command %s execution failed - %s", s.name, errMsg)
 	}
diff --git a/managed/src/main/java/com/yugabyte/yw/common/supportbundle/NodeAgentComponent.java b/managed/src/main/java/com/yugabyte/yw/common/supportbundle/NodeAgentComponent.java
index 4873c347d327..80cbebdd8e8a 100644
--- a/managed/src/main/java/com/yugabyte/yw/common/supportbundle/NodeAgentComponent.java
+++ b/managed/src/main/java/com/yugabyte/yw/common/supportbundle/NodeAgentComponent.java
@@ -113,29 +113,22 @@ public Map<String, Long> getFilesListWithSizes(
       throws Exception {
     Map<String, Long> res = new HashMap<>();
     if (node.cloudInfo == null || StringUtils.isBlank(node.cloudInfo.private_ip)) {
-      log.info("Skipping node-agent log download as node IP is not available");
+      log.info("Skipping node-agent support-bundle download as node IP is not available");
       return res;
     }
     Optional<NodeAgent> optional = NodeAgent.maybeGetByIp(node.cloudInfo.private_ip);
     if (!optional.isPresent()) {
-      log.info("Skipping node-agent log download as node-agent is not installed");
+      log.info("Skipping node-agent support-bundle download as node-agent is not installed");
       return res;
     }
-
     Path nodeAgentHome = Paths.get(optional.get().getHome());
-    Path nodeAgentLogDirPath = nodeAgentHome.resolve("logs");
-    if (!nodeUniverseManager.checkNodeIfFileExists(
-        node, universe, nodeAgentLogDirPath.toString())) {
-      log.info("Skipping node-agent log download as {} does not exists", nodeAgentLogDirPath);
-      return res;
-    }
     for (String dir : SOURCE_NODE_FILES) {
       Path dirPath = nodeAgentHome.resolve(dir);
-      if (!nodeUniverseManager.checkNodeIfFileExists(
-          node, universe, nodeAgentLogDirPath.toString())) {
+      if (!nodeUniverseManager.checkNodeIfFileExists(node, universe, dirPath.toString())) {
         log.info("Skipping non-existing node-agent path {}", dirPath);
         continue;
       }
+      log.info("Collecting files from node-agent path {}", dirPath);
       res.putAll(
           nodeUniverseManager.getNodeFilePathAndSizes(
               node, universe, dirPath.toString(), /* maxDepth */ 1, /* fileType */ "f"));