diff --git a/roles/juju-setup/handlers/main.yml b/roles/juju-setup/handlers/main.yml
new file mode 100644
index 0000000..695b2cb
--- /dev/null
+++ b/roles/juju-setup/handlers/main.yml
@@ -0,0 +1,9 @@
+- name: update-ca-certificates
+  become: yes
+  command: update-ca-certificates
+
+- name: Move cert to all service VMs
+  command: ansible services -b -u ubuntu -m copy -a "src={{ ansible_user_dir }}/keystone_juju_ca_cert.crt dest=/usr/local/share/ca-certificates/keystone_juju_ca_cert.crt owner=root group=root mode=0644"
+
+- name: update-ca-certificates in service VMs
+  command: ansible services -b -u ubuntu -m command -a "update-ca-certificates"
diff --git a/roles/juju-setup/tasks/main.yml b/roles/juju-setup/tasks/main.yml
index 2646ec0..e0ea5a0 100644
--- a/roles/juju-setup/tasks/main.yml
+++ b/roles/juju-setup/tasks/main.yml
@@ -110,18 +110,7 @@
     src: "{{ ansible_user_dir }}/keystone_juju_ca_cert.crt"
     dest: "/usr/local/share/ca-certificates/keystone_juju_ca_cert.crt"
     remote_src: true
-  register: copied_cert
-
-- name: update-ca-certificates
-  when: copied_cert.changed
-  become: yes
-  command: update-ca-certificates
-
-- name: Move cert to all service VM's
-  when: copied_cert.changed
-  command: ansible services -b -u ubuntu -m copy -a "src={{ ansible_user_dir }}/keystone_juju_ca_cert.crt dest=/usr/local/share/ca-certificates/keystone_juju_ca_cert.crt owner=root group=root mode=0644"
-
-- name: update-ca-certificates in service VM's
-  when: copied_cert.changed
-  command: ansible services -b -u ubuntu -m command -a "update-ca-certificates"
-
+  notify:
+    - update-ca-certificates
+    - Move cert to all service VMs
+    - update-ca-certificates in service VMs