diff --git a/roles/educontainer/tasks/main.yml b/roles/educontainer/tasks/main.yml
index 0bd2fb4..5280173 100644
--- a/roles/educontainer/tasks/main.yml
+++ b/roles/educontainer/tasks/main.yml
@@ -54,12 +54,15 @@
 
 ###########
 
-- name: import setup.yml tasks
-  import_tasks: setup.yml
-  tags: 
-    - never
-    - setup
+- name: check if container template exists
+  ansible.builtin.stat:
+    path: "/var/lib/machines/{{ contname }}00"
+  register: cont
+  tags:
+    - always
 
 - name: import setup.yml tasks
   import_tasks: setup.yml
-
+  when: cont.stat.isdir is not defined
+  tags:
+    - always