diff --git a/tasks/1-create-deployment.yml b/tasks/1-create-deployment.yml
index 9a27840f366ec70a7b027dac4e2ead1aa069e539..703189a36a56464b827dcca5a5443de37f926b6e 100644
--- a/tasks/1-create-deployment.yml
+++ b/tasks/1-create-deployment.yml
@@ -35,7 +35,7 @@
   command: orchent depshow --ojson "{{ deployment.uuid }}"
   register: depshow_output
   until: "'PROGRESS' not in depshow_output.stdout"
-  retries: 18
+  retries: "{{ paas_ci_test.n_timeout_ticks }}"
   delay: 300
   failed_when: "'error' in depshow_output.stdout"
 
diff --git a/tasks/2-scan.yml b/tasks/2-scan.yml
index 0842bcdde3ed8d6483835e773fff609fdb040394..cf5ba04612e236306a30b9ec5ec5fd1c3cda73ff 100644
--- a/tasks/2-scan.yml
+++ b/tasks/2-scan.yml
@@ -1,6 +1,6 @@
 
 ---
-- name: Set SSH tunnel
+- name: Set SSH tunel
   command: ssh -o StrictHostKeyChecking=no -f -N -L localhost:9390:192.168.235.234:9390 jenkins@scans.cloud.infn.it 
 
 - debug: 
@@ -11,11 +11,6 @@
     src: files/script.py
     dest: "{{ paas_ci_scan_script_path }}"
 
-- name: Remove existing reports
-  command: "rm -f *report.txt"
-  args:
-    chdir: "{{ paas_ci_workdir }}"
-
 - name:  Run scan
   command: "python3 {{ paas_ci_scan_script_path }} {{ paas_ci_test.endpoints_to_scan }} {{ paas_ci_workdir + '/dep.json'}} {{ paas_ci_workdir }}" 
   register: scan_output
@@ -31,15 +26,6 @@
 #     msg: "{{lookup('file', item.path)}}"
 #   with_items: "{{report_files.files}}"
 
-- name: Chech reports
-  command: "cat *report.txt |  grep Port | sort | uniq "
-  args:
-    chdir: "{{ paas_ci_workdir }}"
-  register: report_ports_output
-
-- debug:
-    var: report_ports_output
-
 - name: get Severity file content
   shell: cat "{{ paas_ci_workdir + '/severity.json'}}"
   register: severity 
diff --git a/tests/test-jupyter-vm.yml b/tests/test-jupyter-vm.yml
index f4874af57ba5ee4fced4eb222c3c157d96996cfe..c84a17ba1c178aeb797cbadff5fc7511ccfacf4e 100644
--- a/tests/test-jupyter-vm.yml
+++ b/tests/test-jupyter-vm.yml
@@ -11,7 +11,8 @@
       name: paas-ci
     vars:
       paas_ci_test:
-        template_url: https://baltig.infn.it/infn-cloud/tosca-templates/-/raw/master/jupyter/jupyter_vm.yaml
+        template_url: https://baltig.infn.it/infn-cloud/tosca-templates/-/raw/master/j  upyter/jupyter_vm.yaml
+        n_timeout_ticks: 18
         inputs: |
           '{ "enable_monitoring": "true", "users": [{"os_user_add_to_sudoers": true, "os_user_name": "scans", "os_user_ssh_public_key": "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQCmQvE3sXtg4D/KYzhCdP6cICvy5foeSkHenKTisxdGJK8L0cDmV+4k7fIah1GIXrldjQBGWHSTbIj1qRTXG2OPWFxeDoXIN1FyKxwdOgwIfzIRtVq18VZEqt9eOiNUXN8jGoEAgcU7obqXuPqKAndk4tyOnSDuVnfnZWAiesVvWK16GEq0PAxBhJoX3eq501ilsNnJZDMEnvQEgtFuIbADEanrhRV3yaEca+9vFyOQRkyxDF8Gn6P/wZ4oe35bdgXxi/hg8JVKYbDCLlT+Fdi+OC3trRhwCcBSvDFD0ZQ8oLemzUk+732TqR+I8gVjPE9fiNF+/mrj5OX55SDr8Qgf scans"}]}'
         endpoints_to_scan: |