diff --git a/tasks/main.yml b/tasks/main.yml
index bdd3544ee3eebe08b77d7f8488649be6270f859e..365f12eada3f5d535883600a37be9c0f3c52b4ca 100644
--- a/tasks/main.yml
+++ b/tasks/main.yml
@@ -5,17 +5,17 @@
     url: "{{ paas_ci_orchestrator_url }}"
 
 - debug:
-    var: paas_ci_workdir
+    var: paas_ci_workdir  
 
 - block:
   - name: Get template
     get_url:
       url: "{{ paas_ci_test.template_url }}"
-      dest: "{{ paas_ci_workdir }}"
+      dest: "{{ paas_ci_workdir + '/template.yaml' }}"  
 
   - name: Deployment command
     set_fact:
-      depcreate_cmd: "orchent depcreate --ojson single_vm.yaml -g admins/beta-testers {{ paas_ci_test.inputs }}"
+      depcreate_cmd: "orchent depcreate --ojson template.yaml -g admins/beta-testers {{ paas_ci_test.inputs }}"
 
   - name:  Create the deployment
     command: "{{depcreate_cmd}}"
@@ -60,6 +60,33 @@
 
   when: paas_ci_test_step == 'create_deployment'
 
+- block:
+  - name: Concatenate endpoints_to_scan items
+    set_fact:
+      endpoints_to_scan_list: "{{ {{ paas_ci_test.endpoints_to_scan }} | join(',')  }}"
+
+  - name:  Run scan
+    command: python3 /home/gmp/script.py "{{ paas_ci_workdir }} '/dep.json'" "{{ paas_ci_workdir }} + '/report.txt'" "{{ paas_ci_workdir }} + '/severity'" 
+    register: scan_output
+    
+  - name: cat report
+    command: cat "{{ paas_ci_workdir }} + '/report.txt'"
+    register: report_output
+    
+  - name: show report
+    debug:
+      var: report_output
+    
+  - name: Get scan outputs (if successful)
+    assert:
+      that:
+        - deployment.status == 'CREATE_COMPLETE'
+      fail_msg: "TEST FAILED -  deployment uuid: {{ deployment.uuid }}, status: {{ deployment.status }}"
+      success_msg: "TEST PASSED - deployment uuid: {{ deployment.uuid }}, status: {{ deployment.status }}, outputs: {{ deployment.outputs }}"
+  
+    
+  when: paas_ci_test_step == 'scan'
+
 - block:
   - set_fact:
       deployment: "{{ lookup('file', paas_ci_workdir + '/dep.json') }}"
diff --git a/vars/main.yml b/vars/main.yml
index 435f8b1ab3779258229267d80a539c7363b99cdc..e311292eee946c43fd83a0df9627f98019414234 100644
--- a/vars/main.yml
+++ b/vars/main.yml
@@ -5,3 +5,4 @@ paas_ci_test:
   template_url: https://baltig.infn.it/infn-cloud/tosca-templates/-/raw/master/single-vm/single_vm.yaml
   inputs: |
     '{ "users": [{"os_user_add_to_sudoers": true, "os_user_name": "antonacci", "os_user_ssh_public_key": "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDE887DQ8WcX5f8d9/MakzMhG/QovKzjrgDzJ0CwjxKm3kUYildhPcUtj7k73WdcP06st6cWpxQ+7HmFseuX+1GASorENAqMHbOvoT0K6pkNlgwgyDOYdR5JSnXIEfR7gTE391SuYN8lbLEvFCscNHYP6814tYochO+sSlpa3XJ2nHvvVp4Ikt/X2Q+zidkKzuMUwFeGf4MZz93Nlwcbg3UM+ENEjjksb7Rqxx2WtYAv8Gn6Jr1X3PmvMoaO9HBgZaosp7NXh20LRHJW+aiEKcr+vzFlgUjTcd/h2CrkgS6+AhjKqpMNS1sS/QuOvPVMUNr1dSOkmAR5EwfHcXpY9RL marica@MacBook-Air-di-marica.local"}]}'
+  endpoints: ["jupyter_notebook", "grafana_endpoint"]