diff --git a/jenkins/ci-pipelines/ci_stage_3.groovy b/jenkins/ci-pipelines/ci_stage_3.groovy
index ecf25e5..41fd9d6 100644
--- a/jenkins/ci-pipelines/ci_stage_3.groovy
+++ b/jenkins/ci-pipelines/ci_stage_3.groovy
@@ -157,18 +157,18 @@
             for deployment in `kubectl -n osm get deployments | grep -v operator | grep -v NAME| awk '{print $1}'`; do
                 echo "Extracting log for $deployment"
                 kubectl -n osm logs deployments/$deployment --timestamps=true --all-containers 2>&1 \
-                > logs/$deployment.log
+                > logs/$deployment.log || true
             done
         '''
         sshCommand remote: remote, command: '''
             for statefulset in `kubectl -n osm get statefulsets | grep -v operator | grep -v NAME| awk '{print $1}'`; do
                 echo "Extracting log for $statefulset"
                 kubectl -n osm logs statefulsets/$statefulset --timestamps=true --all-containers 2>&1 \
-                > logs/$statefulset.log
+                > logs/$statefulset.log || true
             done
         '''
         sshCommand remote: remote, command: '''
-            schedulerPod="$(kubectl get pods -n osm | grep airflow-scheduler| awk '{print $1; exit}')"; \
+            schedulerPod="$(kubectl get pods -n osm | grep osm-scheduler| awk '{print $1; exit}')"; \
             echo "Extracting logs from Airflow DAGs from pod ${schedulerPod}"; \
             kubectl cp -n osm ${schedulerPod}:/opt/airflow/logs/scheduler/latest/dags logs/dags -c scheduler
         '''