diff --git a/test/e2e/collect-logs.sh b/test/e2e/collect-logs.sh
index 3fb39dadb..9c533c7cc 100755
--- a/test/e2e/collect-logs.sh
+++ b/test/e2e/collect-logs.sh
@@ -34,41 +34,124 @@ echo -e "${GREEN}Starting log collection at ${TIMESTAMP}${NC}"
 echo "Logs will be saved to: ${LOG_DIR}"
 echo ""
 
-# Function to collect logs from a pod
-collect_pod_logs() {
-    local pod_name=$1
-    local cluster_name=$2
-    local log_file_prefix=$3
-    
-    echo -e "${YELLOW}Collecting logs from pod ${pod_name} in cluster ${cluster_name}${NC}"
-    
-    # Get all containers in the pod
-    containers=$(kubectl get pod "${pod_name}" -n "${NAMESPACE}" -o jsonpath='{.spec.containers[*].name}' 2>/dev/null || echo "")
-    
-    if [ -z "$containers" ]; then
-        echo -e "${RED}No containers found in pod ${pod_name}${NC}"
+
+
+# Function to collect fleet agent logs directly from node filesystem using docker exec
+# This approach bypasses kubectl logs limitations and accesses the full log history
+# including rotated and compressed log files stored in /var/log/pods.
+collect_node_agent_logs() {
+    local cluster_name=$1
+    local node_log_dir=$2
+    local agent_type=$3  # "hub-agent" or "member-agent"
+
+    echo -e "${YELLOW}Collecting ${agent_type} logs from cluster ${cluster_name} nodes${NC}"
+
+    # Get all nodes in the cluster
+    local nodes
+    nodes=$(kubectl get nodes -o jsonpath='{.items[*].metadata.name}' 2>/dev/null || echo "")
+
+    if [ -z "$nodes" ]; then
+        echo -e "${RED}No nodes found in cluster ${cluster_name}${NC}"
         return
     fi
-    
-    # Collect logs for each container
-    for container in $containers; do
-        log_file="${log_file_prefix}-${container}.log"
-        echo "  - Container ${container} -> ${log_file}"
-        
-        # Get current logs
-        kubectl logs "${pod_name}" -n "${NAMESPACE}" -c "${container}" > "${log_file}" 2>&1 || \
-            echo "Failed to get logs for container ${container}" > "${log_file}"
-        
-        # Try to get previous logs if pod was restarted
-        previous_log_file="${log_file_prefix}-${container}-previous.log"
-        if kubectl logs "${pod_name}" -n "${NAMESPACE}" -c "${container}" --previous > "${previous_log_file}" 2>&1; then
-            echo "  - Previous logs for ${container} -> ${previous_log_file}"
-        else
-            rm -f "${previous_log_file}"
-        fi
+
+    # Create node logs directory
+    mkdir -p "${node_log_dir}"
+
+    for node in $nodes; do
+        echo "  - Collecting ${agent_type} logs from node ${node}"
+        local node_specific_dir="${node_log_dir}/${node}"
+        mkdir -p "${node_specific_dir}"
+
+        # Collect specific agent logs from node filesystem
+        collect_agent_logs_from_node "${node}" "${cluster_name}" "${node_specific_dir}" "${agent_type}"
     done
 }
 
+# Function to collect specific agent logs from node filesystem
+# Collects all log files including rotated (*.log.*) and compressed (*.gz) files
+# Args:
+#   node: The node name to collect logs from
+#   cluster_name: The cluster name for logging context
+#   node_log_dir: The directory to save the collected logs
+#   agent_type: The type of agent ("hub-agent" or "member-agent")
+collect_agent_logs_from_node() {
+    local node=$1
+    local cluster_name=$2
+    local node_log_dir=$3
+    local agent_type=$4  # "hub-agent" or "member-agent"
+
+    echo "    -> Collecting ${agent_type} logs from node filesystem"
+    echo "    -> Found log paths: $(docker exec "${node}" find /var/log/pods -path "*/${NAMESPACE}_*${agent_type}*")"
+
+    # First check if any agent logs exist on this node (including .log, .log.*, and .gz files)
+    local log_files
+    log_files=$(docker exec "${node}" find /var/log/pods -path "*/${NAMESPACE}_*${agent_type}*" -type f \( -name "*.log" -o -name "*.log.*" -o -name "*.gz" \) 2>/dev/null || echo "")
+
+    if [ -n "$log_files" ]; then
+
+        # Process each log file separately using process substitution to avoid subshell
+        while read -r logfile; do
+            if [ -n "$logfile" ]; then
+
+                # Extract a meaningful filename from the log path
+                local base_path=$(basename "$(dirname "$logfile")")
+                local original_filename="$(basename "$logfile")"
+                local sanitized_filename="${base_path}_${original_filename}"
+
+                # Remove .gz extension for the output filename if present
+                local output_filename="${sanitized_filename%.gz}"
+                # Ensure output filename ends with .log
+                if [[ ! "$output_filename" =~ \.log$ ]]; then
+                    output_filename="${output_filename}.log"
+                fi
+
+                # Create individual log file for this specific log
+                local individual_log_file="${node_log_dir}/${agent_type}-${output_filename}"
+
+                {
+                    echo "# ${agent_type} logs from node filesystem"
+                    echo "# Timestamp: $(date -u '+%Y-%m-%d %H:%M:%S UTC')"
+                    echo "# Node: ${node}"
+                    echo "# Cluster: ${cluster_name}"
+                    echo "# Source log file: ${logfile}"
+                    echo "# Method: Direct access to /var/log/pods via docker exec"
+                    echo "# =================================="
+                    echo ""
+
+                    # Handle different file types
+                    if [[ "$logfile" == *.gz ]]; then
+                        echo "# Note: This is a compressed log file that has been decompressed"
+                        echo ""
+                        # Decompress and read the file
+                        docker exec "${node}" zcat "$logfile" 2>/dev/null || echo "Failed to decompress and read $logfile"
+                    else
+                        # Regular log file (including rotated .log.* files)
+                        docker exec "${node}" cat "$logfile" 2>/dev/null || echo "Failed to read $logfile"
+                    fi
+                } > "${individual_log_file}"
+
+                echo "    -> ${agent_type}-${output_filename}"
+            fi
+        done < <(echo "$log_files")
+
+        # Check if any files were created in the directory
+        local created_files
+        created_files=$(find "${node_log_dir}" -name "${agent_type}-*.log" 2>/dev/null | wc -l)
+
+        # If no log files were actually created, clean up empty directory
+        if [ "$created_files" -eq 0 ]; then
+            echo "    -> No valid ${agent_type} logs processed on node ${node}"
+            rmdir "${node_log_dir}" 2>/dev/null || true
+        fi
+    else
+        # No agent logs found, don't create the file and remove directory if empty
+        echo "    -> No ${agent_type} logs found on node ${node}"
+        rmdir "${node_log_dir}" 2>/dev/null || true
+    fi
+}
+
+
 # Collect hub cluster logs
 echo -e "${GREEN}=== Collecting Hub Cluster Logs ===${NC}"
 kind export kubeconfig --name "${HUB_CLUSTER}" 2>/dev/null || {
@@ -80,42 +163,26 @@ kind export kubeconfig --name "${HUB_CLUSTER}" 2>/dev/null || {
 HUB_LOG_DIR="${LOG_DIR}/hub"
 mkdir -p "${HUB_LOG_DIR}"
 
-# Get all hub-agent pods
-hub_pods=$(kubectl get pods -n "${NAMESPACE}" -l app.kubernetes.io/name=hub-agent -o jsonpath='{.items[*].metadata.name}' 2>/dev/null || echo "")
-
-if [ -z "$hub_pods" ]; then
-    echo -e "${RED}No hub-agent pods found${NC}"
-else
-    for pod in $hub_pods; do
-        collect_pod_logs "${pod}" "${HUB_CLUSTER}" "${HUB_LOG_DIR}/${pod}"
-    done
-fi
+# Collect hub-agent logs from hub cluster nodes
+collect_node_agent_logs "${HUB_CLUSTER}" "${HUB_LOG_DIR}/nodes" "hub-agent"
 
 # Collect member cluster logs
 for cluster in "${MEMBER_CLUSTERS[@]}"; do
     echo -e "${GREEN}=== Collecting Member Cluster Logs: ${cluster} ===${NC}"
-    
+
     # Export kubeconfig for the member cluster
     if ! kind export kubeconfig --name "${cluster}" 2>/dev/null; then
         echo -e "${RED}Failed to export kubeconfig for cluster ${cluster}, skipping...${NC}"
         continue
     fi
-    
+
     # Create member logs directory
     MEMBER_LOG_DIR="${LOG_DIR}/${cluster}"
     mkdir -p "${MEMBER_LOG_DIR}"
-    
-    # Get all member-agent pods
-    member_pods=$(kubectl get pods -n "${NAMESPACE}" -l app.kubernetes.io/name=member-agent -o jsonpath='{.items[*].metadata.name}' 2>/dev/null || echo "")
-    
-    if [ -z "$member_pods" ]; then
-        echo -e "${RED}No member-agent pods found in cluster ${cluster}${NC}"
-    else
-        for pod in $member_pods; do
-            collect_pod_logs "${pod}" "${cluster}" "${MEMBER_LOG_DIR}/${pod}"
-        done
-    fi
-    
+
+    # Collect member-agent logs from member cluster nodes
+    collect_node_agent_logs "${cluster}" "${MEMBER_LOG_DIR}/nodes" "member-agent"
+
     echo ""
 done