diff --git a/roles/container/tasks/image.yml b/roles/container/tasks/image.yml
index 07a8a74..4218676 100644
--- a/roles/container/tasks/image.yml
+++ b/roles/container/tasks/image.yml
@@ -43,9 +43,10 @@
         name: "{{ ('local_' + docker_service) if dockerfile is defined and dockerfile | length > 0 else docker_image }}"
       register: existing_image
 
-    - name: Set check nmode container_image variable
+    - name: Set check mode container_image variable
       set_fact:
         container_image: "{{ existing_image.images[0] }}"
+      when: existing_image.images | length > 0
 
 - name: Set image user variable
   set_fact:
diff --git a/roles/container/tasks/init.yml b/roles/container/tasks/init.yml
index 1a34642..1c0760a 100644
--- a/roles/container/tasks/init.yml
+++ b/roles/container/tasks/init.yml
@@ -6,6 +6,7 @@
     container_published_ports: []
     docker_volumes_new: []
     final_docker_volumes: "{{ docker_volumes }}"
+    container_image: ''
 
 - name: Set docker service full name
   set_fact:
diff --git a/roles/container/tasks/main.yml b/roles/container/tasks/main.yml
index 942b4c8..07710a5 100644
--- a/roles/container/tasks/main.yml
+++ b/roles/container/tasks/main.yml
@@ -61,7 +61,7 @@
 - name: "Container for {{ docker_service_name }}"
   docker_container:
     name: "{{ docker_service_name }}"
-    image: "{{ container_image.Id }}"
+    image: "{{ container_image.Id if container_image != '' else docker_image }}"
     user: "{{ docker_user if docker_host_user else omit }}"
     mounts: "{{ docker_volume_definition }}"
     published_ports: "{{ container_published_ports + docker_published_ports }}"