diff --git a/roles/health-csp/tasks/main.yml b/roles/health-csp/tasks/main.yml
index 2f088dc9..b35dc4f6 100644
--- a/roles/health-csp/tasks/main.yml
+++ b/roles/health-csp/tasks/main.yml
@@ -3,42 +3,46 @@
     name: pkgmgr-install
   vars:
     package_name: checkcsp
-  when: run_once_backup_docker_to_local is not defined
+  when: run_once_health_csp is not defined
+
+- name: rebuild checkcsp docker image
+  shell: checkcsp build
+  # Todo this could be optimized in the future
 
 - name: "create {{ health_csp_crawler_folder }}"
   file:
     path: "{{ health_csp_crawler_folder }}"
     state: directory
     mode: 0755
-  when: run_once_backup_docker_to_local is not defined
+  when: run_once_health_csp is not defined
 
 - name: copy health-csp.py
   copy:
     src: health-csp.py
     dest: "{{ health_csp_crawler_script }}"
     mode: 0755
-  when: run_once_backup_docker_to_local is not defined
+  when: run_once_health_csp is not defined
 
 - name: create health-csp.cymais.service
   template:
     src: health-csp.service.j2
     dest: /etc/systemd/system/health-csp.cymais.service
   notify: reload health-csp.cymais.service
-  when: run_once_backup_docker_to_local is not defined
+  when: run_once_health_csp is not defined
 
 - name: set service_name to role_name
   set_fact:
     service_name: "{{ role_name }}"
-  when: run_once_backup_docker_to_local is not defined
+  when: run_once_health_csp is not defined
 
 - name: include systemd timer role
   include_role:
     name: systemd-timer
   vars:
     on_calendar: "{{ on_calendar_health_csp_crawler }}"
-  when: run_once_backup_docker_to_local is not defined
+  when: run_once_health_csp is not defined
 
-- name: run the backup_docker_to_local tasks once
+- name: run the health_csp tasks once
   set_fact:
-    run_once_backup_docker_to_local: true
-  when: run_once_backup_docker_to_local is not defined
+    run_once_health_csp: true
+  when: run_once_health_csp is not defined