diff --git a/.github/workflows/e2e-ci.yaml b/.github/workflows/e2e-ci.yaml
index fb80c231..9eb860dc 100644
--- a/.github/workflows/e2e-ci.yaml
+++ b/.github/workflows/e2e-ci.yaml
@@ -110,7 +110,6 @@ jobs:
       -
         name: Check if Project Registration Namespace is auto-created on namespace detection
         run: ./.github/workflows/e2e/scripts/create-project-namespace.sh;
-
       -
         name: Create Project Monitoring Stack via ProjectHelmChart CR
         run: ./.github/workflows/e2e/scripts/create-projecthelmchart.sh;
diff --git a/.github/workflows/e2e/scripts/generate-artifacts.sh b/.github/workflows/e2e/scripts/generate-artifacts.sh
index 8a9f2363..823ea661 100755
--- a/.github/workflows/e2e/scripts/generate-artifacts.sh
+++ b/.github/workflows/e2e/scripts/generate-artifacts.sh
@@ -49,9 +49,20 @@ kubectl get helmreleases -n cattle-monitoring-system -o yaml > ${MANIFEST_DIRECT
 
 # Logs
 
-mkdir -p ${LOG_DIRECTORY}/rancher-monitoring
+
+## Rancher logs
+
+mkdir -p ${LOG_DIRECTORY}/rancher
+
+
+kubectl logs deployment/rancher-webhook -n cattle-system > ${LOG_DIRECTORY}/rancher/rancher_webhook.log || true
+kubectl logs deployment/cattle-cluster-agent -n cattle-system > ${LOG_DIRECTORY}/rancher/cluster_agent.log || true
+kubectl logs deployment/system-upgrade-controller -n cattle-system > ${LOG_DIRECTORY}/rancher/upgrade_controller.log || true
 
 ## Rancher Monitoring
+
+mkdir -p ${LOG_DIRECTORY}/rancher-monitoring
+
 kubectl logs deployment/rancher-monitoring-operator -n cattle-monitoring-system > ${LOG_DIRECTORY}/rancher-monitoring/prometheus_operator.log || true
 kubectl logs statefulset/alertmanager-rancher-monitoring-alertmanager -n cattle-monitoring-system > ${LOG_DIRECTORY}/rancher-monitoring/alertmanager.log || true
 kubectl logs statefulset/prometheus-rancher-monitoring-prometheus -n cattle-monitoring-system > ${LOG_DIRECTORY}/rancher-monitoring/prometheus.log || true