diff --git a/tasks/main.yml b/tasks/main.yml
index 02c8177..9004bcf 100644
--- a/tasks/main.yml
+++ b/tasks/main.yml
@@ -18,11 +18,15 @@
   loop:
     - "Dockerfile"
     - "entrypoint.sh"
+  register: cpfiles
 
 - name: "Build openldap image"
   docker_image:
     path: "/tmp/build.openldap-image"
     name: "{{ openldap_image_name }}"
+    # force_source on Ansible 2.8
+    force: "{{ cpfiles is changed }}"
+  register: imgbuild
 
 - name: "Start openldap container"
   docker_container:
@@ -41,6 +45,7 @@
       - name: "{{ docker_network_name }}"
     ports:
       - "{{ openldap_bind_host }}:{{ openldap_bind_port }}:389"
+    recreate: "{{ imgbuild is changed }}"
 
 - include_tasks: "provider.yml"
   when: "openldap_provider == True"