diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 0404ab0b4dbdf8f1f585a854f081c453b048811b..01b3ec2320e2794ca78426b78baa1c07ecd3459a 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -166,15 +166,25 @@ delete-example:
   variables:
     GIT_STRATEGY: none # don't need to checkout sources
     LAST_ROWS_COUNT: "200" # you can override it when triggering the job
+    CHART_LOCATION: "chart"
   script:
     - kubectl -n ${NAMESPACE} get quota
+    - mkdir logs
     - |
-      for POD in $(kubectl -n ${NAMESPACE} get po --output=jsonpath='{.items[*].metadata.name}'); do
-        echo $POD;
-        kubectl -n ${NAMESPACE} logs $POD --tail ${LAST_ROWS_COUNT}
+      for POD in $(kubectl -n ${NAMESPACE} get po -l="app.kubernetes.io/instance=${CI_COMMIT_REF_SLUG}-${CHART_LOCATION}" --output=jsonpath='{.items[*].metadata.name}'); do
+        echo "************************************************************"
+        echo "************************************************************"
+        echo "* ${POD}";
+        echo "************************************************************"
+        kubectl -n ${NAMESPACE} logs $POD --tail ${LAST_ROWS_COUNT} > logs/${POD}.log
+        cat logs/${POD}.log
       done
-  before_script:
-    - kubectl delete jobs -l app=kubeclarity-scanner
+    - echo "Check Job artifacts to download or Browse log files... See on right panel"
+  artifacts:
+    when: always
+    paths:
+    - logs
+    expire_in: 1 month