diff --git a/roles/bitbucket_dataset_restore/tasks/main.yml b/roles/bitbucket_dataset_restore/tasks/main.yml
index 3d69e20..7d187db 100644
--- a/roles/bitbucket_dataset_restore/tasks/main.yml
+++ b/roles/bitbucket_dataset_restore/tasks/main.yml
@@ -1,11 +1,22 @@
 ---
 
-- name: wait for bitbucket service to start
-  wait_for:
-    port: 7990
-    delay: 10
+- name: Check if import directory exists
+  stat:
+      path: /tmp/import
+      register: import_dir
+
+- name: create directory structure if it note exists
+  file:
+    path: /tmp/import
+    state: directory
+    mode: 0644
+    group: root
+    owner: root
+    when: import_dir.stat.exists == false
 
 - name: Copy Bitbucket dataset from s3
   get_url:
     url: "{{ atl_bitbucket_dataset_url }}"
-    dest: /media/atl/bitbucket/shared/data/migration/import/
+    dest: /tmp/import
+
+